Changeset 1265


Ignore:
Timestamp:
Aug 22, 2010, 5:10:20 PM (10 years ago)
Author:
popeye
Message:

changements dûs à la 1.4

Location:
cpc/trunk/project
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • cpc/trunk/project/apps/frontend/config/cache.yml

    r2 r1265  
    11default:
    2   enabled:     off
     2  enabled:     false
    33  with_layout: false
    44  lifetime:    86400

  • cpc/trunk/project/apps/frontend/config/factories.yml

    r811 r1265  
    55      level:   err
    66      loggers: ~
     7
     8  mailer:
     9    param:
     10      delivery_strategy: realtime
    711
    812cli:
    … …  
    2529      send_http_headers: false
    2630
     31  mailer:
     32    param:
     33      delivery_strategy: none
     34
     35dev:
     36  mailer:
     37    param:
     38      delivery_strategy: realtime
     39
    2740all:
    2841  routing:
    … …  
    3144      generate_shortest_url:            true
    3245      extra_parameters_as_query_string: true
    33       cache:
    34         class: sfNoCache
     46      cache: null
    3547
     48  mailer:
     49    class: sfMailer
     50    param:
     51      logging:           %SF_LOGGING_DISABLED%
     52      charset:           %SF_CHARSET%
     53    transport:
     54      class: Swift_SmtpTransport
     55      param:
     56        host:       localhost
     57        port:       25
     58        encryption: ~
     59        username:   ~
     60        password:   ~
    3661#all:
    3762#  controller:
    … …  
    86111#    param:
    87112#      source:               XLIFF
    88 #      debug:                off
     113#      debug:                false
    89114#      untranslated_prefix:  "[T]"
    90115#      untranslated_suffix:  "[/T]"

  • cpc/trunk/project/apps/frontend/config/filters.yml

    r514 r1265  
    77
    88cache:     ~
    9 common:    ~
     9common:
     10  class: sfCommonFilter
    1011execution: ~

  • cpc/trunk/project/apps/frontend/config/security.yml

    r2 r1265  
    11default:
    2   is_secure: off
     2  is_secure: false

  • cpc/trunk/project/apps/frontend/config/settings.yml

    r730 r1265  
    11prod:
    22  .settings:
    3     no_script_name:         on
    4     logging_enabled:        off
    5     compressed:             on
    6     check_lock:             on
     3    no_script_name:         true
     4    logging_enabled:        false
     5    compressed:             true
     6    check_lock:             true
    77    cache:                  on
    88dev:
    99  .settings:
    1010    error_reporting:        <?php echo (E_ALL | E_STRICT)."\n" ?>
    11     web_debug:              on
    12     cache:                  on
    13     no_script_name:         off
    14     etag:                   off
     11    web_debug:              true
     12    cache:                  true
     13    no_script_name:         false
     14    etag:                   false
    1515
    1616test:
    1717  .settings:
    1818    error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
    19     cache:                  off
    20     web_debug:              off
    21     no_script_name:         off
    22     etag:                   off
     19    cache:                  false
     20    web_debug:              false
     21    no_script_name:         false
     22    etag:                   false
    2323
    2424all:
    … …  
    3333    # Cache settings
    3434    cache:                  on
    35     lazy_cache_key:         on        # Delays creation of a cache key until after checking whether an action or partial is
     35    lazy_cache_key:         true        # Delays creation of a cache key until after checking whether an action or partial is
    3636    enabled_modules:  [default, xsPChartPlugin, sfDoctrineActAsTaggablePlugin, sfFeed2Plugin]
    3737#all:
    … …  
    5151#  .settings:
    5252#    # Optional features. Deactivating unused features boots performance a bit.
    53 #    use_database:           on        # Enable database manager. Set to off if you don't use a database.
    54 #    i18n:                   off       # Enable interface translation. Set to off if your application should not be translated.
    55 #    check_symfony_version:  off       # Enable check of symfony version for every request. Set to on to have symfony clear the cache automatically when the framework is upgraded. Set to off if you always clear the cache after an upgrade.
    56 #    compressed:             off       # Enable PHP response compression. Set to on to compress the outgoing HTML via the PHP handler.
    57 #    check_lock:             off       # Enable the application lock system triggered by the clear-cache and disable tasks. Set to on to have all requests to disabled applications redirected to the $sf_symfony_lib_dir/exception/data/unavailable.php page.
     53#    use_database:           true        # Enable database manager. Set to off if you don't use a database.
     54#    i18n:                   false       # Enable interface translation. Set to off if your application should not be translated.
     55#    check_symfony_version:  false       # Enable check of symfony version for every request. Set to on to have symfony clear the cache automatically when the framework is upgraded. Set to off if you always clear the cache after an upgrade.
     56#    compressed:             false       # Enable PHP response compression. Set to on to compress the outgoing HTML via the PHP handler.
     57#    check_lock:             false       # Enable the application lock system triggered by the clear-cache and disable tasks. Set to on to have all requests to disabled applications redirected to the $sf_symfony_lib_dir/exception/data/unavailable.php page.
    5858#
    5959#    # Routing settings
    60 #    no_script_name:         off       # Enable the front controller name in generated URLs
     60#    no_script_name:         false       # Enable the front controller name in generated URLs
    6161#
    6262#    # Validation settings, used for error generation by the Validation helper
    … …  
    6767#
    6868#    # Cache settings
    69 #    cache:                  off       # Enable the template cache
    70 #    etag:                   on        # Enable etag handling
    71 #    lazy_cache_key:         off       # Delays creation of a cache key until after checking whether an action or partial is cacheable (defaults to false for backward compatibility)
     69#    cache:                  false       # Enable the template cache
     70#    etag:                   true        # Enable etag handling
     71#    lazy_cache_key:         false       # Delays creation of a cache key until after checking whether an action or partial is cacheable (defaults to false for backward compatibility)
    7272#
    7373#    # Logging and debugging settings
    74 #    web_debug:              off       # Enable the web debug toolbar
     74#    web_debug:              false       # Enable the web debug toolbar
    7575#    error_reporting:        <?php echo (E_PARSE | E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR | E_USER_ERROR)."\n" ?> # Determines which events are logged.
    7676#
    … …  
    9191#
    9292#    # Miscellaneous
    93 #    strip_comments:         on         # Remove comments in core framework classes as defined in the core_compile.yml
     93#    strip_comments:         true         # Remove comments in core framework classes as defined in the core_compile.yml
    9494#    max_forwards:           5
    9595#
    9696#    # Logging
    97 #    logging_enabled:        on
     97#    logging_enabled:        true
    9898#
    9999#    # i18n

  • cpc/trunk/project/apps/frontend/config/view.yml

    r828 r1265  
    1414  javascripts:    [jquery-1.3.2.min.js]
    1515
    16   has_layout:     on
     16  has_layout:     true
    1717  layout:         layout

  • cpc/trunk/project/apps/frontend/lib/myUser.class.php

    r842 r1265  
    3939  public static function SignIn($login, $password, $remember, $action)
    4040  {
    41     sfLoader::loadHelpers(array('Url'));
     41    sfProjectConfiguration::getActive()->loadHelpers(array('Url'));
     42       
    4243    $reset_mdp = '<a href="'.url_for('@reset_mdp').'">Mot de passe oublié ?</a>';
    4344   

  • cpc/trunk/project/apps/frontend/modules/amendement/config/cache.yml

    r743 r1265  
    11all:
    2    enabled: on
     2   enabled: true
    33   lifetime: 86400
    44_pagerAmendements:
    5    enabled: off
     5   enabled: false

  • cpc/trunk/project/apps/frontend/modules/commentaire/actions/actions.class.php

    r1213 r1265  
    1616    $redirect_url = array('Intervention' => '@intervention?id=', 'Amendement' => '@amendement_id?id=', 'QuestionEcrite' => '@question_id?id=', 'ArticleLoi' => '@loi_article_id?id=', 'Alinea'=> '@loi_alinea?id=');
    1717    $about = array('Intervention' => "Suite aux propos d", 'Amendement' => "Au sujet d'un amendement déposé", 'QuestionEcrite' => "A propos d'une question écrite d");
    18 
     18       
    1919    $this->type = $request->getParameter('type');
    2020    $this->id = $request->getParameter('id');
    21 
    22     $this->commentaire = myTools::clearHtml($request->getParameter('commentaire[commentaire]'));
     21   
     22        $values = $request->getParameter('commentaire');
     23        $this->commentaire = myTools::clearHtml($values['commentaire']);
    2324    $this->unique_form = $request->getParameter('unique_form');
    2425
    … …  
    3233      return $this->redirect($redirect_url[$this->type].$this->id);
    3334    }
    34                
    35     $values = $request->getParameter('commentaire');
    3635
    3736    /** On logue l'utilisateur si il a donné un login et mot de passe correct sinon creation du form et template**/
    … …  
    3938    /** Pas loggué on s'assure que quelqu'un n'a pas trouvé notre hack */
    4039    $_GET['isAuthenticated'] = $isAuthenticated;
    41     if ($request->getParameter('commentaire[login]') && $request->getParameter('commentaire[password]')) {
     40    if (isset($values['login']) && isset($values['password'])) {
    4241      if (!($citoyen_id = myUser::SignIn($values['login'],
    4342$values['password'], false, $this))) {

  • cpc/trunk/project/apps/frontend/modules/intervention/config/cache.yml

    r740 r1265  
    11all:
    2   enabled: on
     2  enabled: true
    33  lifetime: 86400
    44show:
    5   enabled: off
     5  enabled: false
    66_pagerInterventions:
    7   enabled: off
     7  enabled: false

  • cpc/trunk/project/apps/frontend/modules/loi/config/cache.yml

    r985 r1265  
    11all:
    2   enabled: on
     2  enabled: true
    33  lifetime: 86400
    44loi:
    5   enabled: off
     5  enabled: false
    66section:
    7   enabled: off
     7  enabled: false

  • cpc/trunk/project/apps/frontend/modules/parlementaire/config/cache.yml

    r725 r1265  
    11all:
    22  lifetime: 86400
    3   enabled: on
     3  enabled: false
    44rss:
    55  lifetime: 3600

  • cpc/trunk/project/apps/frontend/modules/parlementaire/templates/topSuccess.php

    r1195 r1265  
    5454<div height="500px" style="height: 500px;overflow: scroll; overflow: auto;">
    5555<table><?php $cpt = 0; foreach($tops as $t) { $cpt++;?><tr<?php if ($cpt %2) echo ' class="tr_odd"'?>><td class="<?php echo $class['parl']; ?>"><a name="<?php echo $t[0]['slug']; ?>" href="<?php echo url_for('@parlementaire?slug='.$t[0]['slug']); ?>"></a>
    56 <? echo link_to($t[0]['nom'], '@parlementaire?slug='.$t[0]['slug']); ?></td><?php for($i = 1 ; $i < count($t) ; $i++) { ?><td<?php echo $t[$i]['style']; ?> class="<?php echo $class[$ktop[$i]]; ?>"><?php
     56<?php echo link_to($t[0]['nom'], '@parlementaire?slug='.$t[0]['slug']); ?></td><?php for($i = 1 ; $i < count($t) ; $i++) { ?><td<?php echo $t[$i]['style']; ?> class="<?php echo $class[$ktop[$i]]; ?>"><?php
    5757     if (preg_match('/\./', $t[$i]['value'])) {
    5858       printf('%02d', $t[$i]['value']);

  • cpc/trunk/project/apps/frontend/modules/plot/config/cache.yml

    r729 r1265  
    11all:
    2   enabled: on
     2  enabled: true
    33  lifetime: 86400

  • cpc/trunk/project/apps/frontend/modules/presence/config/cache.yml

    r1022 r1265  
    11all:
    22  lifetime: 86400
    3   enabled: on
     3  enabled: true

  • cpc/trunk/project/apps/frontend/modules/questions/config/cache.yml

    r742 r1265  
    11all:
    2    enabled: on
     2   enabled: true
    33   lifetime: 86400
    44_pagerQuestions:
    5    enabled: off
     5   enabled: false

  • cpc/trunk/project/apps/frontend/modules/tag/config/cache.yml

    r729 r1265  
    11all:
    2    enable: on
     2   enable: true
    33   lifetime: 86400

  • cpc/trunk/project/lib/form/doctrine/ChangeMotdepasseForm.class.php

    r960 r1265  
    11<?php
    2 class ChangeMotdepasseForm extends sfForm
     2class ChangeMotdepasseForm extends BaseForm
    33{
    44  public function configure()

  • cpc/trunk/project/lib/form/doctrine/CommentaireForm.class.php

    r804 r1265  
    3030    if (!sfContext::getInstance()->getUser()->isAuthenticated() || !$_GET['isAuthenticated'])
    3131    {
    32       $this->widgetSchema['nom'] = new sfWidgetFormInput();
    33       $this->widgetSchema['email'] = new sfWidgetFormInput();
    34       $this->widgetSchema['login'] = new sfWidgetFormInput();
     32      $this->widgetSchema['nom'] = new sfWidgetFormInputText();
     33      $this->widgetSchema['email'] = new sfWidgetFormInputText();
     34      $this->widgetSchema['login'] = new sfWidgetFormInputText();
    3535      $this->widgetSchema['password'] = new sfWidgetFormInputPassword();
    3636     

  • cpc/trunk/project/lib/form/doctrine/DateForm.class.php

    r460 r1265  
    11<?php
    22
    3 class DateForm extends sfForm
     3class DateForm extends BaseForm
    44{
    55  public function configure()

  • cpc/trunk/project/lib/form/doctrine/EditUserForm.class.php

    r878 r1265  
    2929    $this->widgetSchema['naissance'] = new sfWidgetFormDate(array('format' => '%day%/%month%/%year%', 'years' => $liste_annees));
    3030   
    31     $this->widgetSchema['url_site'] = new sfWidgetFormInput();
     31    $this->widgetSchema['url_site'] = new sfWidgetFormInputText();
    3232    $this->validatorSchema['url_site'] = new sfValidatorUrl(array('required' => false), array('invalid' => 'l\'url doit être de la forme "http://www.monsite.fr"'));
    3333   

  • cpc/trunk/project/lib/form/doctrine/InscriptionForm.class.php

    r893 r1265  
    11<?php
    2 class InscriptionForm extends sfForm
     2class InscriptionForm extends BaseForm
    33{
    44  public function configure()
    … …  
    88    #$this->widgetSchema->setOption('form_formatter', 'list');  'unique_error' => '"%value%" existe déjà',
    99   
    10     $this->widgetSchema['login'] = new sfWidgetFormInput();
     10    $this->widgetSchema['login'] = new sfWidgetFormInputText();
    1111    $this->validatorSchema['login'] = new sfValidatorString(array('required' => true, 'min_length' => 4, 'max_length' => 40), array('invalid' => 'Ce nom d\'utilisateur existe déjà.',
    1212    'required' => 'Indiquez le nom d\'utilisateur souhaité',
    … …  
    1414    'max_length' => '"%value%" est trop long (%max_length% caractères maximum).'));
    1515   
    16     $this->widgetSchema['email'] = new sfWidgetFormInput();
     16    $this->widgetSchema['email'] = new sfWidgetFormInputText();
    1717    $this->validatorSchema['email'] = new sfValidatorEmail(array('required' => true), array('invalid' => 'Adresse email invalide.', 'required' => 'Indiquez votre adresse email', ));
    1818   

  • cpc/trunk/project/lib/form/doctrine/MotdepasseForm.class.php

    r960 r1265  
    11<?php
    2 class MotdepasseForm extends sfForm
     2class MotdepasseForm extends BaseForm
    33{
    44  public function configure()

  • cpc/trunk/project/lib/form/doctrine/ResetMotdepasseForm.class.php

    r960 r1265  
    11<?php
    2 class ResetMotdepasseForm extends sfForm
     2class ResetMotdepasseForm extends BaseForm
    33{
    44  public function configure()
    … …  
    66    $this->widgetSchema->setNameFormat('reset[%s]');
    77   
    8     $this->widgetSchema['login'] = new sfWidgetFormInput();
     8    $this->widgetSchema['login'] = new sfWidgetFormInputText();
    99    $this->validatorSchema['login'] = new sfValidatorString(array('required' => true), array('required' => 'Champ obligatoire'));
    1010 
    11     $this->widgetSchema['code'] = new sfWidgetFormInput();
     11    $this->widgetSchema['code'] = new sfWidgetFormInputText();
    1212    $this->validatorSchema['code'] = new sfValidatorString(array('required' => true), array('required' => 'Vous devez recopier le code de sécurité'));
    1313   

  • cpc/trunk/project/lib/form/doctrine/SigninForm.class.php

    r797 r1265  
    11<?php
    2 class SigninForm extends sfForm
     2class SigninForm extends BaseForm
    33{
    44  public function configure()
    55  {
    66    $this->setWidgets(array(
    7       'login' => new sfWidgetFormInput(),
     7      'login' => new sfWidgetFormInputText(),
    88      'password' => new sfWidgetFormInputPassword(),
    99      'remember' => new sfWidgetFormInputCheckbox()

  • cpc/trunk/project/lib/form/doctrine/UploadAvatarForm.class.php

    r638 r1265  
    11<?php
    2 class UploadAvatarForm extends sfForm
     2class UploadAvatarForm extends BaseForm
    33{
    44  public function configure()

  • cpc/trunk/project/lib/model/doctrine/myTools.class.php

    r1257 r1265  
    8787
    8888  public static function clearHtml($s, $authorized_tags = '<strong><i><b><a><em>') {
    89   sfLoader::loadHelpers(array('Url'));
     89    sfProjectConfiguration::getActive()->loadHelpers(array('Url'));
     90       
    9091    if ($authorized_tags)
    9192      $s = strip_tags($s, $authorized_tags.'<depute>');

  • cpc/trunk/project/test/bootstrap/unit.php

    r2 r1265  
    33/*
    44 * This file is part of the symfony package.
    5  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
     5 * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
    66 *
    77 * For the full copyright and license information, please view the LICENSE
    … …  
    1111$_test_dir = realpath(dirname(__FILE__).'/..');
    1212
    13 require_once(dirname(__FILE__).'/../../config/ProjectConfiguration.class.php');
    14 $configuration = new ProjectConfiguration(realpath($_test_dir.'/..'));
    15 include($configuration->getSymfonyLibDir().'/vendor/lime/lime.php');
     13// configuration
     14require_once dirname(__FILE__).'/../../config/ProjectConfiguration.class.php';
     15$configuration = ProjectConfiguration::hasActive() ? ProjectConfiguration::getActive() : new ProjectConfiguration(realpath($_test_dir.'/..'));
     16
     17// autoloader
     18$autoload = sfSimpleAutoload::getInstance(sfConfig::get('sf_cache_dir').'/project_autoload.cache');
     19$autoload->loadConfiguration(sfFinder::type('file')->name('autoload.yml')->in(array(
     20  sfConfig::get('sf_symfony_lib_dir').'/config/config',
     21  sfConfig::get('sf_config_dir'),
     22)));
     23$autoload->register();
     24
     25// lime
     26include $configuration->getSymfonyLibDir().'/vendor/lime/lime.php';

  • cpc/trunk/project/web/css/xneth/style.css

    r1257 r1265  
    66  background: #e4e4e1 url('images/mosaique.gif') repeat;
    77}
     8/* Bulle ajax commentaires */
    89.coms_loi_txt {
    910  color: #158EAF;
Note: See TracChangeset for help on using the changeset viewer.