Changeset 735

Show
Ignore:
Timestamp:
01/11/08 23:24:16 (1 year ago)
Author:
laurentj
Message:

fixed bug #416: calling getController twice with a same selector generates an error
ticket #414: error message on basePath should be more details

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.0.x/lib/jelix/core/jConfigCompiler.class.php

    r733 r735  
    55* @author       Jouanneau Laurent 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2006-2007 Jouanneau laurent 
     7* @copyright    2006-2008 Jouanneau laurent 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 

  • branches/1.0.x/lib/jelix/core/jConfigCompiler.class.php

    r733 r735  
    55* @author       Jouanneau Laurent 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2006-2007 Jouanneau laurent 
     7* @copyright    2006-2008 Jouanneau laurent 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 

  • branches/1.0.x/lib/jelix/core/jConfigCompiler.class.php

    r733 r735  
    55* @author       Jouanneau Laurent 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2006-2007 Jouanneau laurent 
     7* @copyright    2006-2008 Jouanneau laurent 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 

  • branches/1.0.x/lib/jelix/core/jCoordinator.class.php

    r701 r735  
    55* @author       Laurent Jouanneau 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2005-2006 laurent Jouanneau 
     7* @copyright    2005-2008 laurent Jouanneau 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 
    …… 
    264264            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath)); 
    265265        } 
    266         require($ctrlpath); 
     266        require_once($ctrlpath); 
    267267        $class = $selector->getClass(); 
    268268        if(!class_exists($class,false)){ 

  • branches/1.0.x/lib/jelix/core/jCoordinator.class.php

    r701 r735  
    55* @author       Laurent Jouanneau 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2005-2006 laurent Jouanneau 
     7* @copyright    2005-2008 laurent Jouanneau 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 
    …… 
    264264            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath)); 
    265265        } 
    266         require($ctrlpath); 
     266        require_once($ctrlpath); 
    267267        $class = $selector->getClass(); 
    268268        if(!class_exists($class,false)){ 

  • branches/1.0.x/lib/jelix/core/jCoordinator.class.php

    r701 r735  
    55* @author       Laurent Jouanneau 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2005-2006 laurent Jouanneau 
     7* @copyright    2005-2008 laurent Jouanneau 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 
    …… 
    264264            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath)); 
    265265        } 
    266         require($ctrlpath); 
     266        require_once($ctrlpath); 
    267267        $class = $selector->getClass(); 
    268268        if(!class_exists($class,false)){ 

  • branches/1.0.x/lib/jelix/core/jRequest.class.php

    r716 r735  
    55* @author     Laurent Jouanneau 
    66* @contributor 
    7 * @copyright  2005-2007 Laurent Jouanneau 
     7* @copyright  2005-2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    …… 
    122122                $gJConfig->urlengine['jelixWWWPath'] = $this->urlScriptPath.$gJConfig->urlengine['jelixWWWPath']; 
    123123        }else if(strpos($this->urlScriptPath,$gJConfig->urlengine['basePath']) !== 0){ 
    124             throw new Exception('Jelix Error: basePath in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
     124            throw new Exception('Jelix Error: basePath ('.$gJConfig->urlengine['basePath'].') in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
    125125        } 
    126126 

  • branches/1.0.x/lib/jelix/core/jRequest.class.php

    r716 r735  
    55* @author     Laurent Jouanneau 
    66* @contributor 
    7 * @copyright  2005-2007 Laurent Jouanneau 
     7* @copyright  2005-2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    …… 
    122122                $gJConfig->urlengine['jelixWWWPath'] = $this->urlScriptPath.$gJConfig->urlengine['jelixWWWPath']; 
    123123        }else if(strpos($this->urlScriptPath,$gJConfig->urlengine['basePath']) !== 0){ 
    124             throw new Exception('Jelix Error: basePath in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
     124            throw new Exception('Jelix Error: basePath ('.$gJConfig->urlengine['basePath'].') in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
    125125        } 
    126126 

  • branches/1.0.x/lib/jelix/core/jRequest.class.php

    r716 r735  
    55* @author     Laurent Jouanneau 
    66* @contributor 
    7 * @copyright  2005-2007 Laurent Jouanneau 
     7* @copyright  2005-2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    …… 
    122122                $gJConfig->urlengine['jelixWWWPath'] = $this->urlScriptPath.$gJConfig->urlengine['jelixWWWPath']; 
    123123        }else if(strpos($this->urlScriptPath,$gJConfig->urlengine['basePath']) !== 0){ 
    124             throw new Exception('Jelix Error: basePath in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
     124            throw new Exception('Jelix Error: basePath ('.$gJConfig->urlengine['basePath'].') in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
    125125        } 
    126126 

  • branches/1.0.x/lib/jelix/utils/jIniFile.class.php

    r733 r735  
    44* @subpackage utils 
    55* @author     Loic Mathaud 
    6 * @contributor 
    7 * @copyright  2006 Loic Mathaud 
     6* @contributor Laurent Jouanneau 
     7* @copyright  2006 Loic Mathaud, 2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 

  • branches/1.0.x/lib/jelix/utils/jIniFile.class.php

    r733 r735  
    44* @subpackage utils 
    55* @author     Loic Mathaud 
    6 * @contributor 
    7 * @copyright  2006 Loic Mathaud 
     6* @contributor Laurent Jouanneau 
     7* @copyright  2006 Loic Mathaud, 2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 

  • branches/1.0.x/lib/jelix/utils/jIniFile.class.php

    r733 r735  
    44* @subpackage utils 
    55* @author     Loic Mathaud 
    6 * @contributor 
    7 * @copyright  2006 Loic Mathaud 
     6* @contributor Laurent Jouanneau 
     7* @copyright  2006 Loic Mathaud, 2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 

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

    r733 r735  
    55* @author       Jouanneau Laurent 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2006-2007 Jouanneau laurent 
     7* @copyright    2006-2008 Jouanneau laurent 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 

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

    r733 r735  
    55* @author       Jouanneau Laurent 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2006-2007 Jouanneau laurent 
     7* @copyright    2006-2008 Jouanneau laurent 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 

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

    r733 r735  
    55* @author       Jouanneau Laurent 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2006-2007 Jouanneau laurent 
     7* @copyright    2006-2008 Jouanneau laurent 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 

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

    r701 r735  
    55* @author       Laurent Jouanneau 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2005-2006 laurent Jouanneau 
     7* @copyright    2005-2008 laurent Jouanneau 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 
    …… 
    264264            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath)); 
    265265        } 
    266         require($ctrlpath); 
     266        require_once($ctrlpath); 
    267267        $class = $selector->getClass(); 
    268268        if(!class_exists($class,false)){ 

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

    r701 r735  
    55* @author       Laurent Jouanneau 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2005-2006 laurent Jouanneau 
     7* @copyright    2005-2008 laurent Jouanneau 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 
    …… 
    264264            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath)); 
    265265        } 
    266         require($ctrlpath); 
     266        require_once($ctrlpath); 
    267267        $class = $selector->getClass(); 
    268268        if(!class_exists($class,false)){ 

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

    r701 r735  
    55* @author       Laurent Jouanneau 
    66* @contributor  Thibault PIRONT < nuKs > 
    7 * @copyright    2005-2006 laurent Jouanneau 
     7* @copyright    2005-2008 laurent Jouanneau 
    88* @copyright    2007 Thibault PIRONT 
    99* @link         http://www.jelix.org 
    …… 
    264264            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath)); 
    265265        } 
    266         require($ctrlpath); 
     266        require_once($ctrlpath); 
    267267        $class = $selector->getClass(); 
    268268        if(!class_exists($class,false)){ 

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

    r716 r735  
    55* @author     Laurent Jouanneau 
    66* @contributor 
    7 * @copyright  2005-2007 Laurent Jouanneau 
     7* @copyright  2005-2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    …… 
    122122                $gJConfig->urlengine['jelixWWWPath'] = $this->urlScriptPath.$gJConfig->urlengine['jelixWWWPath']; 
    123123        }else if(strpos($this->urlScriptPath,$gJConfig->urlengine['basePath']) !== 0){ 
    124             throw new Exception('Jelix Error: basePath in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
     124            throw new Exception('Jelix Error: basePath ('.$gJConfig->urlengine['basePath'].') in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
    125125        } 
    126126 

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

    r716 r735  
    55* @author     Laurent Jouanneau 
    66* @contributor 
    7 * @copyright  2005-2007 Laurent Jouanneau 
     7* @copyright  2005-2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    …… 
    122122                $gJConfig->urlengine['jelixWWWPath'] = $this->urlScriptPath.$gJConfig->urlengine['jelixWWWPath']; 
    123123        }else if(strpos($this->urlScriptPath,$gJConfig->urlengine['basePath']) !== 0){ 
    124             throw new Exception('Jelix Error: basePath in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
     124            throw new Exception('Jelix Error: basePath ('.$gJConfig->urlengine['basePath'].') in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
    125125        } 
    126126 

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

    r716 r735  
    55* @author     Laurent Jouanneau 
    66* @contributor 
    7 * @copyright  2005-2007 Laurent Jouanneau 
     7* @copyright  2005-2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    …… 
    122122                $gJConfig->urlengine['jelixWWWPath'] = $this->urlScriptPath.$gJConfig->urlengine['jelixWWWPath']; 
    123123        }else if(strpos($this->urlScriptPath,$gJConfig->urlengine['basePath']) !== 0){ 
    124             throw new Exception('Jelix Error: basePath in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
     124            throw new Exception('Jelix Error: basePath ('.$gJConfig->urlengine['basePath'].') in config file doesn\'t correspond to current base path. You should setup it to '.$this->urlScriptPath); 
    125125        } 
    126126 

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

    r733 r735  
    44* @subpackage utils 
    55* @author     Loic Mathaud 
    6 * @contributor 
    7 * @copyright  2006 Loic Mathaud 
     6* @contributor Laurent Jouanneau 
     7* @copyright  2006 Loic Mathaud, 2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 

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

    r733 r735  
    44* @subpackage utils 
    55* @author     Loic Mathaud 
    6 * @contributor 
    7 * @copyright  2006 Loic Mathaud 
     6* @contributor Laurent Jouanneau 
     7* @copyright  2006 Loic Mathaud, 2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 

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

    r733 r735  
    44* @subpackage utils 
    55* @author     Loic Mathaud 
    6 * @contributor 
    7 * @copyright  2006 Loic Mathaud 
     6* @contributor Laurent Jouanneau 
     7* @copyright  2006 Loic Mathaud, 2008 Laurent Jouanneau 
    88* @link        http://www.jelix.org 
    99* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 
Download in other formats: Unified Diff Zip Archive