Development

Changeset 24163

You must first sign up to be able to contribute.

Changeset 24163

Show
Ignore:
Timestamp:
11/19/09 00:14:46 (3 months ago)
Author:
ornicar2
Message:

[Diem] desactivated the dmSeoValidation admin module
- added validate option to automatic functional tests
- fxed dmConfigForm boolean widget defaults
- improved dmScriptNameResolver
- made dmAuth->signin redirect to front if user is not allowed to acces administration

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/diemPlugin/trunk/dmAdminPlugin/config/dm/modules.yml

    r23962 r24163  
    5151      name:         Automatic Page 
    5252      credentials:  automatic_metas 
    53     dmSeoValidation: 
    54       name:         Seo Validation 
    55       credentials:  metas_validation 
     53#    dmSeoValidation: 
     54#      name:         Seo Validation 
     55#      credentials:  metas_validation 
    5656  Redirections: 
    5757    dmRedirect: 

  • plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/test/functional/admin/dmTest.php

    r23451 r24163  
    88  'login'     => true, 
    99  'username'  => 'admin', 
    10   'password'  => ##DIEM_PROJECT_PASSWORD## 
     10  'password'  => ##DIEM_PROJECT_PASSWORD##, 
     11  'validate'  => true 
    1112); 
    1213 

  • plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/test/functional/front/dmTest.php

    r23451 r24163  
    88  'login'     => false, 
    99  'username'  => 'admin', 
    10   'password'  => ##DIEM_PROJECT_PASSWORD## 
     10  'password'  => ##DIEM_PROJECT_PASSWORD##, 
     11  'validate'  => true 
    1112); 
    1213 

  • plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmConfigForm.php

    r23171 r24163  
    3030    $this->widgetSchema[$settingName] = $this->getSettingWidget($setting); 
    3131     
    32     $this->widgetSchema[$settingName]->setDefault($setting->get('value')); 
     32//    $this->widgetSchema[$settingName]->setDefault($setting->get('value')); 
    3333     
    3434    $this->widgetSchema->setHelp($settingName, htmlentities($setting->get('description'), ENT_QUOTES, 'UTF-8')); 
    3535     
    36     $this->validatorSchema[$settingName] = $this->getSettingValidator($setting); 
    37     $this->validatorSchema[$settingName]->setOption('required', false); 
     36    $this->validatorSchema[$settingName] = $this->getSettingValidator($setting)->setOption('required', false); 
    3837  } 
    3938   
    …… 
    6059  protected function getTextSettingWidget(DmSetting $setting) 
    6160  { 
    62     return new sfWidgetFormInputText(array(), $setting->getParamsArray()); 
     61    $widget = new sfWidgetFormInputText(array(), $setting->getParamsArray()); 
     62     
     63    return $widget->setDefault($setting->get('value')); 
    6364  } 
     65   
    6466  protected function getTextSettingValidator(DmSetting $setting) 
    6567  { 
    …… 
    7072  protected function getTextareaSettingWidget(DmSetting $setting) 
    7173  { 
    72     return new sfWidgetFormTextarea(array(), $setting->getParamsArray()); 
     74    $widget = new sfWidgetFormTextarea(array(), $setting->getParamsArray()); 
     75     
     76    return $widget->setDefault($setting->get('value')); 
    7377  } 
     78   
    7479  protected function getTextareaSettingValidator(DmSetting $setting) 
    7580  { 
    …… 
    8085  protected function getNumberSettingWidget(DmSetting $setting) 
    8186  { 
    82     return new sfWidgetFormInputText(array(), $setting->getParamsArray()); 
     87    $widget = new sfWidgetFormInputText(array(), $setting->getParamsArray()); 
     88     
     89    return $widget->setDefault($setting->get('value')); 
    8390  } 
     91   
    8492  protected function getNumberSettingValidator(DmSetting $setting) 
    8593  { 
    …… 
    9098  protected function getBooleanSettingWidget(DmSetting $setting) 
    9199  { 
    92     return new sfWidgetFormInputCheckbox(array(), $setting->getParamsArray()); 
     100    $widget = new sfWidgetFormInputCheckbox(array(), $setting->getParamsArray()); 
     101     
     102    return $widget->setDefault(1 == $setting->get('value') ? true : false); 
    93103  } 
     104   
    94105  protected function getBooleanSettingValidator(DmSetting $setting) 
    95106  { 
    …… 
    100111  protected function getSelectSettingWidget(DmSetting $setting) 
    101112  { 
    102     return new sfWidgetFormSelect(array('choices' => $setting->getParamsArray())); 
     113    $widget = new sfWidgetFormSelect(array('choices' => $setting->getParamsArray())); 
     114     
     115    return $widget->setDefault($setting->get('value')); 
    103116  } 
     117   
    104118  protected function getSelectSettingValidator(DmSetting $setting) 
    105119  { 

  • plugins/diemPlugin/trunk/dmCorePlugin/lib/routing/dmScriptNameResolver.php

    r22213 r24163  
    3636  protected function guessBootScriptFromWebDir($app, $env) 
    3737  { 
    38     if(file_exists(dmOs::join(sfConfig::get('sf_web_dir'), $app.'_'.$env.'.php'))) 
     38    $script = false; 
     39    $webDir = sfConfig::get('sf_web_dir'); 
     40     
     41    if(file_exists(dmOs::join($webDir, $app.'_'.$env.'.php'))) 
    3942    { 
    4043      $script = $app.'_'.$env.'.php'; 
    4144    } 
    42     elseif(file_exists(dmOs::join(sfConfig::get('sf_web_dir'), $app.'.php'))) 
     45    elseif('front' === $app) 
     46    { 
     47      if (file_exists(dmOs::join($webDir, 'index.php'))) 
     48      { 
     49        $script = 'index.php'; 
     50      } 
     51      if ('prod' !== $env && file_exists(dmOs::join($webDir, $env.'.php'))) 
     52      { 
     53        $script = $env.'.php'; 
     54      } 
     55    } 
     56    elseif(file_exists(dmOs::join($webDir, $app.'.php'))) 
    4357    { 
    4458      $script = $app.'.php'; 
    4559    } 
    46     elseif($app == 'front') 
    47     { 
    48       $script = $env == 'prod' ? 'index.php' : $env.'.php'; 
    49     } 
    50     else 
    51     { 
    52       $script = false; 
    53     } 
    54      
     60 
    5561    return $script; 
    5662  } 

  • plugins/diemPlugin/trunk/dmCorePlugin/lib/test/dmCoreFunctionalCoverageTest.php

    r23962 r24163  
    1414    'debug'  => false, 
    1515    'login'  => false, 
    16     'maxRedirections' => 5 
     16    'maxRedirections' => 5, 
     17    'validate' => true 
    1718  ); 
    1819 
    …… 
    8788  protected function login() 
    8889  { 
     90//    $this->browser->with('user')->begin() 
     91//    ->signin(dmDb::table('DmUser')->findOneByUsername($this->options['username'])) 
     92//    ->end(); 
     93//    return; 
    8994    if (empty($this->options['username']) || empty($this->options['password'])) 
    9095    { 
    …… 
    109114    ->setField('signin[username]', $this->options['username']) 
    110115    ->setField('signin[password]', $this->options['password']) 
    111     ->click(dm::getI18n()->__('Login')) 
     116    ->click('input[type="submit"]') 
    112117    ->with('response')->begin()->isRedirected()->end() 
    113118    ->followRedirect(); 
    …… 
    150155    ->isStatusCode($expectedStatusCode) 
    151156    ->end(); 
     157     
     158    if ($this->options['validate']) 
     159    { 
     160      $this->browser->with('response')->begin()->isValid()->end(); 
     161    } 
    152162  } 
    153163 

  • plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php

    r24158 r24163  
    9393    foreach( $metas as $key => $value) 
    9494    { 
     95      $value = htmlentities($value); 
    9596      if ('title' === $key) 
    9697      { 

  • plugins/diemPlugin/trunk/dmUserPlugin/modules/dmAuth/lib/BasedmAuthActions.class.php

    r23633 r24163  
    4242        // or to the referer 
    4343        // or to the homepage 
    44         $signinUrl = sfConfig::get('dm_security_success_signin_url', $user->getReferer($request->getReferer())); 
     44        if ($this->getUser()->can('admin')) 
     45        { 
     46          $signinUrl = sfConfig::get('dm_security_success_signin_url', $user->getReferer($request->getReferer())); 
     47        } 
     48        else 
     49        { 
     50          try 
     51          { 
     52            $signinUrl = $this->context->get('script_name_resolver')->get('front'); 
     53          } 
     54          catch(dmException $e) 
     55          { 
     56            // user can't go in admin, and front script_name can't be found. 
     57          } 
     58        } 
    4559 
    4660        return $this->redirect('' != $signinUrl ? $signinUrl : '@homepage'); 

The Sensio Labs Network

Since 1998, Sensio Labs has been promoting the Open-Source software movement by providing quality web application development, training, consulting.
Sensio Labs also supports several large Open-Source projects.

Open-Source Products

Services

> More