Changeset 688

Show
Ignore:
Timestamp:
12/08/07 00:40:00 (1 year ago)
Author:
laurentj
Message:

ticket #219: notfoundAct is now supported by all url engines.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/jelix-scripts/templates/var/config/defaultconfig.ini.php.tpl

    r674 r688  
    7272entrypointExtension= .php 
    7373 
    74 notfoundAct = "jelix~error_notfound" 
     74; leave empty to have jelix error messages 
     75notfoundAct = 
     76;notfoundAct = "jelix~error_notfound" 
    7577 
    7678;indique si vous utilisez IIS comme serveur 

  • trunk/lib/jelix-scripts/templates/var/config/defaultconfig.ini.php.tpl

    r674 r688  
    7272entrypointExtension= .php 
    7373 
    74 notfoundAct = "jelix~error_notfound" 
     74; leave empty to have jelix error messages 
     75notfoundAct = 
     76;notfoundAct = "jelix~error_notfound" 
    7577 
    7678;indique si vous utilisez IIS comme serveur 

  • trunk/lib/jelix/core-modules/jelix/templates/404.html.tpl

    r247 r688  
    11<h1>404 Not Found</h1> 
    2 <p>Sorry, the requested page doesn't exists</p> 
     2<p>Sorry, the requested page doesn't exist</p> 
    33<p style="font-size:0.6em; font-style:italic">Powered by Jelix.</p> 

  • trunk/lib/jelix/core-modules/jelix/templates/404.html.tpl

    r247 r688  
    11<h1>404 Not Found</h1> 
    2 <p>Sorry, the requested page doesn't exists</p> 
     2<p>Sorry, the requested page doesn't exist</p> 
    33<p style="font-size:0.6em; font-style:italic">Powered by Jelix.</p> 

  • trunk/lib/jelix/core-modules/jelix/templates/404.xul.tpl

    r247 r688  
    11<html:div> 
    22<html:h1>404 Not Found</html:h1> 
    3 <html:p>Sorry, the requested page doesn't exists</html:p> 
     3<html:p>Sorry, the requested page doesn't exist</html:p> 
    44<html:p style="font-size:0.6em; font-style:italic">Powered by Jelix.</html:p> 
    55</html:div> 

  • trunk/lib/jelix/core-modules/jelix/templates/404.xul.tpl

    r247 r688  
    11<html:div> 
    22<html:h1>404 Not Found</html:h1> 
    3 <html:p>Sorry, the requested page doesn't exists</html:p> 
     3<html:p>Sorry, the requested page doesn't exist</html:p> 
    44<html:p style="font-size:0.6em; font-style:italic">Powered by Jelix.</html:p> 
    55</html:div> 

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

    r674 r688  
    119119entrypointExtension= .php 
    120120 
    121 notfoundAct = "jelix~error_notfound" 
     121; leave empty to have jelix error messages 
     122notfoundAct = 
     123;notfoundAct = "jelix~error_notfound" 
    122124 
    123125;if you use IIS as a serveur set it to on 

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

    r674 r688  
    119119entrypointExtension= .php 
    120120 
    121 notfoundAct = "jelix~error_notfound" 
     121; leave empty to have jelix error messages 
     122notfoundAct = 
     123;notfoundAct = "jelix~error_notfound" 
    122124 
    123125;if you use IIS as a serveur set it to on 

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

    r673 r688  
    191191        try{ 
    192192            $this->action = new jSelectorActFast($this->request->type, $this->moduleName, $this->actionName); 
    193         }catch(jExceptionSelector $e){ 
    194             if($e->getCode() == 12){ 
    195                 throw new jException('jelix~errors.module.unknow',$this->moduleName); 
    196             }elseif($e->getCode() == 10){ 
    197                 throw new jException('jelix~errors.action.unknow',$this->actionName); 
    198             } 
    199         } 
    200  
    201         $ctrl = $this->getController($this->action); 
     193            $ctrl = $this->getController($this->action); 
     194        }catch(jException $e){ 
     195            if ($gJConfig->urlengine['notfoundAct'] =='') { 
     196                throw $e; 
     197            } 
     198            try { 
     199                $this->action = new jSelectorAct($gJConfig->urlengine['notfoundAct']); 
     200                $ctrl = $this->getController($this->action); 
     201            }catch(jException $e2){ 
     202                throw $e; 
     203            } 
     204        } 
    202205 
    203206        $pluginparams = array(); 

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

    r673 r688  
    191191        try{ 
    192192            $this->action = new jSelectorActFast($this->request->type, $this->moduleName, $this->actionName); 
    193         }catch(jExceptionSelector $e){ 
    194             if($e->getCode() == 12){ 
    195                 throw new jException('jelix~errors.module.unknow',$this->moduleName); 
    196             }elseif($e->getCode() == 10){ 
    197                 throw new jException('jelix~errors.action.unknow',$this->actionName); 
    198             } 
    199         } 
    200  
    201         $ctrl = $this->getController($this->action); 
     193            $ctrl = $this->getController($this->action); 
     194        }catch(jException $e){ 
     195            if ($gJConfig->urlengine['notfoundAct'] =='') { 
     196                throw $e; 
     197            } 
     198            try { 
     199                $this->action = new jSelectorAct($gJConfig->urlengine['notfoundAct']); 
     200                $ctrl = $this->getController($this->action); 
     201            }catch(jException $e2){ 
     202                throw $e; 
     203            } 
     204        } 
    202205 
    203206        $pluginparams = array(); 

  • trunk/testapp/var/config/defaultconfig.ini.php

    r666 r688  
    7575entrypointExtension= .php 
    7676 
    77 notfoundAct = "jelix~error_notfound" 
     77notfoundAct =  
     78;notfoundAct = "jelix~error_notfound" 
    7879 
    7980;indique si vous utilisez IIS comme serveur 

  • trunk/testapp/var/config/defaultconfig.ini.php

    r666 r688  
    7575entrypointExtension= .php 
    7676 
    77 notfoundAct = "jelix~error_notfound" 
     77notfoundAct =  
     78;notfoundAct = "jelix~error_notfound" 
    7879 
    7980;indique si vous utilisez IIS comme serveur 
Download in other formats: Unified Diff Zip Archive