Changeset 314

Show
Ignore:
Timestamp:
11/27/06 14:16:55 (2 years ago)
Author:
laurentj
Message:

ticket #54, uniformisation des nomages des classes utilisateurs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildjelix.php

    r303 r314  
    2424)); 
    2525 
     26if(!isset($GLOBALS['ENABLE_OLD_CLASS_NAMING'])) //TODO �nlever pour la 1.0 finale 
     27    $GLOBALS['ENABLE_OLD_CLASS_NAMING']= '1'; 
     28 
    2629Env::initBool(array( 
    2730'ENABLE_OPTIMIZE', // indique que l'on veut une version optimis�pour un serveur de production 
    …… 
    3841'STRIP_COMMENT', 
    3942'NIGHTLY_NAME', 
     43 
     44'ENABLE_OLD_CLASS_NAMING', // indique si on veut activer l'ancien nommage de certaines classes dans  
     45                     // jelix < 1.0beta1 
    4046)); 
    4147 

  • trunk/build/config/jelix-dist-dev.ini

    r292 r314  
    99ENABLE_PHP_JSON = 
    1010ENABLE_PHP_XMLRPC = 
     11ENABLE_OLD_CLASS_NAMING = 1 

  • trunk/build/config/jelix-dist-opt.ini

    r292 r314  
    99STRIP_COMMENT = 1 
    1010ENABLE_OPTIMIZE = 1 
     11ENABLE_OLD_CLASS_NAMING = 1 

  • trunk/build/config/jelix-test.ini

    r292 r314  
    99STRIP_COMMENT = 
    1010ENABLE_OPTIMIZE = 
     11ENABLE_OLD_CLASS_NAMING = 1 

  • trunk/build/manifests/jelix-lib.mn

    r300 r314  
    6161cd lib/jelix/core/url 
    6262  jUrlCompiler.significant.class.php 
    63  jUrlEngine.significant.class.php 
     63* jUrlEngine.significant.class.php 
    6464  jUrlEngine.simple.class.php 
    6565 
    …… 
    9999  jEventCompiler.class.php 
    100100  jEventListener.class.php 
    101  jEventListenerFactory.class.php 
     101* jEventListenerFactory.class.php 
    102102 
    103103cd lib/jelix/forms 
    …… 
    169169  jXmlRpc.class.php 
    170170  jZipCreator.class.php 
    171  jZone.class.php 
     171* jZone.class.php 
    172172  jAppManager.class.php 
    173173  jRss20Item.class.php 

  • trunk/build/manifests/jelix-no-opt.mn

    r297 r314  
    1111  jRequest.class.php 
    1212  jResponse.class.php 
    13  jSelector.class.php 
     13* jSelector.class.php 
    1414 
    1515cd lib/jelix/core/url 

  • trunk/lib/jelix/core/defaultconfig.ini.php

    r300 r314  
    2222use_error_handler = on 
    2323shared_session = off 
     24 
     25enableOldClassNaming = on 
    2426 
    2527[plugins] 

  • trunk/lib/jelix/core/jCoordinator.class.php

    r263 r314  
    228228 
    229229        $ctrlpath = $selector->getPath(); 
    230         $class = $selector->getClass(); 
    231230 
    232231        if(!file_exists($ctrlpath)){ 
    …… 
    234233        } 
    235234        require_once($ctrlpath); 
     235        $class = $selector->getClass(); 
    236236        if(!class_exists($class,false)){ 
    237237            throw new jException('jelix~errors.ad.controller.class.unknow',array($this->actionName,$class, $ctrlpath)); 

  • trunk/lib/jelix/core/jSelector.class.php

    r311 r314  
    244244 
    245245    public function getClass(){ 
    246         return 'CT'.$this->controller; 
     246#ifdef ENABLE_OLD_CLASS_NAMING 
     247        $className = $this->controller.'Ctrl'; 
     248        if($GLOBALS['gJConfig']->enableOldClassNaming && !class_exists($className,false)){ 
     249            $className = 'CT'.$this->controller; 
     250        } 
     251#else 
     252        $className = $this->controller.'Ctrl'; 
     253#endif 
     254        return $className; 
    247255    } 
    248256 

  • trunk/lib/jelix/core/url/jUrlEngine.significant.class.php

    r267 r314  
    157157                // array( 0=> 'module', 1=>'action', 2=>'handler', 3=>array('actions','secondaires')) 
    158158                $s = new jSelectorUrlHandler($infoparsing[2]); 
    159                 $c ='URLS'.$s->resource; 
     159#ifdef ENABLE_OLD_CLASS_NAMING 
     160                $c =$s->resource.'UrlsHandler'; 
     161                if($gJConfig->enableOldClassNaming && !class_exists($c,false)){ 
     162                    $c ='URLS'.$s->resource; 
     163                } 
     164#else 
     165                $c =$s->resource.'UrlsHandler'; 
     166#endif 
    160167                $handler =new $c(); 
    161168 

  • trunk/lib/jelix/events/jEventListenerFactory.class.php

    r248 r314  
    8888            global $gJConfig; 
    8989            require_once ($gJConfig->_modulesPathList[$module].'classes/'.strtolower ($listenerName).'.listener.php'); 
    90             $className = 'Listener'.$listenerName; 
     90#ifdef ENABLE_OLD_CLASS_NAMING 
     91            $className = $listenerName.'Listener'; 
     92            if($gJConfig->enableOldClassNaming && !class_exists($className,false)){ 
     93                $className = 'Listener'.$listenerName; 
     94            } 
     95#else 
     96            $className = $listenerName.'Listener'; 
     97#endif 
    9198            self::$_listenersSingleton[$module][$listenerName] =  new $className (); 
    9299        } 

  • trunk/lib/jelix/utils/jZone.class.php

    r312 r314  
    243243        $fileName = $sel->getPath(); 
    244244        require_once($fileName); 
    245  
    246         $objName = 'Zone'.$sel->resource; 
    247         $zone = new $objName ($params); 
     245#ifdef ENABLE_OLD_CLASS_NAMING 
     246        $className = $sel->resource.'Zone'; 
     247        if($GLOBALS['gJConfig']->enableOldClassNaming && !class_exists($className,false)){ 
     248            $className = 'Zone'.$sel->resource; 
     249        } 
     250#else 
     251        $className = $sel->resource.'Zone'; 
     252#endif 
     253        $zone = new $className ($params); 
    248254        $toReturn = $zone->$method (); 
    249255 

  • trunk/testapp/modules/testapp/controllers/forms.classic.php

    r310 r314  
    1111*/ 
    1212 
    13 class CTForms extends jController { 
     13class formsCtrl extends jController { 
    1414 
    1515    function listform(){ 
    …… 
    2020        $tpl = new jTpl(); 
    2121        // on triche ici, il n'y a pas d'api car inutile en temps normal 
    22         $tpl->assign('liste', $_SESSION['JFORMS']['sample']);  
     22        if(isset($_SESSION['JFORMS']['sample'])) 
     23            $tpl->assign('liste', $_SESSION['JFORMS']['sample']);  
     24        else 
     25            $tpl->assign('liste', array());  
    2326        $rep->body->assign('MAIN',$tpl->fetch('forms_liste')); 
    2427        return $rep; 

  • trunk/testapp/modules/testapp/controllers/main.classic.php

    r192 r314  
    1111*/ 
    1212 
    13 class CTMain extends jController { 
     13class mainCtrl extends jController { 
    1414 
    1515  function index(){ 

  • trunk/testapp/modules/testapp/controllers/sampleform.classic.php

    r310 r314  
    1111*/ 
    1212 
    13 class CTSampleForm extends jController { 
     13class sampleFormCtrl extends jController { 
    1414 
    1515  function newform(){ 

  • trunk/testapp/modules/testapp/controllers/syndication.classic.php

    r300 r314  
    1010*/ 
    1111 
    12 class CTSyndication extends jController { 
     12class syndicationCtrl extends jController { 
    1313 
    1414    function rss(){ 

  • trunk/testapp/modules/testapp/zones/sommaire.zone.php

    r126 r314  
    1111*/ 
    1212 
    13 class ZoneSommaire extends jZone { 
     13class sommaireZone extends jZone { 
    1414   protected $_tplname='sommaire'; 
    1515 

  • trunk/testapp/modules/testapp/zones/test.zone.php

    r192 r314  
    1111*/ 
    1212 
    13 class ZoneTest extends jZone { 
     13class testZone extends jZone { 
    1414   protected $_tplname='testzone'; 
    1515 

  • trunk/testapp/modules/unittest/classes/testevents.listener.php

    r55 r314  
    1111*/ 
    1212 
    13 class ListenerTestevents extends jEventListener{ 
     13class testeventsListener extends jEventListener{ 
    1414 
    1515   /** 

  • trunk/testapp/modules/unittest/classes/urlsig.urlhandler.php

    r247 r314  
    11<?php 
    22 
    3 class URLSurlsig implements jIUrlSignificantHandler { 
     3class urlsigUrlsHandler implements jIUrlSignificantHandler { 
    44 
    55    // exemple de handler. 

  • trunk/testapp/modules/unittest/controllers/dao.classic.php

    r276 r314  
    1111*/ 
    1212 
    13 class CTDao extends jController { 
     13class daoCtrl extends jController { 
    1414 
    1515   function parser() { 

  • trunk/testapp/modules/unittest/controllers/default.classic.php

    r289 r314  
    1111*/ 
    1212 
    13 class CTDefault extends jController { 
     13class defaultCtrl extends jController { 
    1414 
    1515   function index() { 

  • trunk/testapp/modules/unittest/controllers/urlsig.classic.php

    r101 r314  
    1212 
    1313 
    14 class CTUrlsig extends jController { 
     14class urlsigCtrl extends jController { 
    1515 
    1616   function url1() { 
Download in other formats: Unified Diff Zip Archive