Changeset 960

Show
Ignore:
Timestamp:
05/29/08 12:41:31 (6 months ago)
Author:
laurentj
Message:

ticket #476: significant url, there was a bug when using a handler without indicating action

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.0.x/build/manifests/testapp.mn

    r956 r960  
    163163  utils.jdatetime.html_cli.php 
    164164 
     165cd testapp/modules/testurls/classes/ 
     166  urlhandlermodule.urlhandler.php 
     167cd testapp/modules/testurls/controllers/ 
     168  urlsig.classic.php 
     169 
    165170cd testapp/var 
    166171  .htaccess 
  • branches/1.0.x/build/manifests/testapp.mn

    r956 r960  
    163163  utils.jdatetime.html_cli.php 
    164164 
     165cd testapp/modules/testurls/classes/ 
     166  urlhandlermodule.urlhandler.php 
     167cd testapp/modules/testurls/controllers/ 
     168  urlsig.classic.php 
     169 
    165170cd testapp/var 
    166171  .htaccess 
  • branches/1.0.x/build/manifests/testapp.mn

    r956 r960  
    163163  utils.jdatetime.html_cli.php 
    164164 
     165cd testapp/modules/testurls/classes/ 
     166  urlhandlermodule.urlhandler.php 
     167cd testapp/modules/testurls/controllers/ 
     168  urlsig.classic.php 
     169 
    165170cd testapp/var 
    166171  .htaccess 
  • branches/1.0.x/build/manifests/testapp.mn

    r956 r960  
    163163  utils.jdatetime.html_cli.php 
    164164 
     165cd testapp/modules/testurls/classes/ 
     166  urlhandlermodule.urlhandler.php 
     167cd testapp/modules/testurls/controllers/ 
     168  urlsig.classic.php 
     169 
    165170cd testapp/var 
    166171  .htaccess 
  • branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

    r941 r960  
    55* @author      Laurent Jouanneau 
    66* @contributor Thibault PIRONT < nuKs > 
    7 * @copyright   2005-2007 Laurent Jouanneau 
     7* @copyright   2005-2008 Laurent Jouanneau 
    88* @copyright   2007 Thibault PIRONT 
    99* @link        http://www.jelix.org 
     
    164164                    $selclass = $class; 
    165165                  $s= new jSelectorUrlHandler($selclass); 
     166                  if(!isset($url['action'])) { 
     167                    $action = '*'; 
     168                  } 
    166169                  $createUrlContent.="include_once('".$s->getPath()."');\n"; 
    167170                  $parseInfos[]=array($module, $action, $selclass, $actionOverride ); 
  • branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

    r941 r960  
    55* @author      Laurent Jouanneau 
    66* @contributor Thibault PIRONT < nuKs > 
    7 * @copyright   2005-2007 Laurent Jouanneau 
     7* @copyright   2005-2008 Laurent Jouanneau 
    88* @copyright   2007 Thibault PIRONT 
    99* @link        http://www.jelix.org 
     
    164164                    $selclass = $class; 
    165165                  $s= new jSelectorUrlHandler($selclass); 
     166                  if(!isset($url['action'])) { 
     167                    $action = '*'; 
     168                  } 
    166169                  $createUrlContent.="include_once('".$s->getPath()."');\n"; 
    167170                  $parseInfos[]=array($module, $action, $selclass, $actionOverride ); 
  • branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

    r941 r960  
    55* @author      Laurent Jouanneau 
    66* @contributor Thibault PIRONT < nuKs > 
    7 * @copyright   2005-2007 Laurent Jouanneau 
     7* @copyright   2005-2008 Laurent Jouanneau 
    88* @copyright   2007 Thibault PIRONT 
    99* @link        http://www.jelix.org 
     
    164164                    $selclass = $class; 
    165165                  $s= new jSelectorUrlHandler($selclass); 
     166                  if(!isset($url['action'])) { 
     167                    $action = '*'; 
     168                  } 
    166169                  $createUrlContent.="include_once('".$s->getPath()."');\n"; 
    167170                  $parseInfos[]=array($module, $action, $selclass, $actionOverride ); 
  • branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

    r941 r960  
    55* @author      Laurent Jouanneau 
    66* @contributor Thibault PIRONT < nuKs > 
    7 * @copyright   2005-2007 Laurent Jouanneau 
     7* @copyright   2005-2008 Laurent Jouanneau 
    88* @copyright   2007 Thibault PIRONT 
    99* @link        http://www.jelix.org 
     
    164164                    $selclass = $class; 
    165165                  $s= new jSelectorUrlHandler($selclass); 
     166                  if(!isset($url['action'])) { 
     167                    $action = '*'; 
     168                  } 
    166169                  $createUrlContent.="include_once('".$s->getPath()."');\n"; 
    167170                  $parseInfos[]=array($module, $action, $selclass, $actionOverride ); 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

    r941 r960  
    236236      $urlList[]= array('jelix_tests~hello3', array()); 
    237237      $urlList[]= array('jelix_tests~urlsig:bug599', array('first'=>'premier',  'second'=>'deuxieme')); 
     238      $urlList[]= array('testurls~urlsig:urla', array()); 
     239      $urlList[]= array('testurls~urlsig:urla', array('first'=>'premier')); 
     240      $urlList[]= array('testurls~urlsig:urlb', array()); 
    238241 
    239242      $trueResult=array( 
     
    260263          "/index.php/hello3", 
    261264          "/withhandler/premier/deuxieme", 
     265          "/myhand/urlsig/urla", 
     266          "/myhand/urlsig/urla?first=premier", 
     267          "/myhand/urlsig/urlb", 
    262268       ); 
    263269 
     
    290296          "/index/hello3", 
    291297          "/withhandler/premier/deuxieme", 
     298          "/myhand/urlsig/urla", 
     299          "/myhand/urlsig/urla?first=premier", 
     300          "/myhand/urlsig/urlb", 
    292301       ); 
    293302      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

    r941 r960  
    236236      $urlList[]= array('jelix_tests~hello3', array()); 
    237237      $urlList[]= array('jelix_tests~urlsig:bug599', array('first'=>'premier',  'second'=>'deuxieme')); 
     238      $urlList[]= array('testurls~urlsig:urla', array()); 
     239      $urlList[]= array('testurls~urlsig:urla', array('first'=>'premier')); 
     240      $urlList[]= array('testurls~urlsig:urlb', array()); 
    238241 
    239242      $trueResult=array( 
     
    260263          "/index.php/hello3", 
    261264          "/withhandler/premier/deuxieme", 
     265          "/myhand/urlsig/urla", 
     266          "/myhand/urlsig/urla?first=premier", 
     267          "/myhand/urlsig/urlb", 
    262268       ); 
    263269 
     
    290296          "/index/hello3", 
    291297          "/withhandler/premier/deuxieme", 
     298          "/myhand/urlsig/urla", 
     299          "/myhand/urlsig/urla?first=premier", 
     300          "/myhand/urlsig/urlb", 
    292301       ); 
    293302      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

    r941 r960  
    236236      $urlList[]= array('jelix_tests~hello3', array()); 
    237237      $urlList[]= array('jelix_tests~urlsig:bug599', array('first'=>'premier',  'second'=>'deuxieme')); 
     238      $urlList[]= array('testurls~urlsig:urla', array()); 
     239      $urlList[]= array('testurls~urlsig:urla', array('first'=>'premier')); 
     240      $urlList[]= array('testurls~urlsig:urlb', array()); 
    238241 
    239242      $trueResult=array( 
     
    260263          "/index.php/hello3", 
    261264          "/withhandler/premier/deuxieme", 
     265          "/myhand/urlsig/urla", 
     266          "/myhand/urlsig/urla?first=premier", 
     267          "/myhand/urlsig/urlb", 
    262268       ); 
    263269 
     
    290296          "/index/hello3", 
    291297          "/withhandler/premier/deuxieme", 
     298          "/myhand/urlsig/urla", 
     299          "/myhand/urlsig/urla?first=premier", 
     300          "/myhand/urlsig/urlb", 
    292301       ); 
    293302      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

    r941 r960  
    236236      $urlList[]= array('jelix_tests~hello3', array()); 
    237237      $urlList[]= array('jelix_tests~urlsig:bug599', array('first'=>'premier',  'second'=>'deuxieme')); 
     238      $urlList[]= array('testurls~urlsig:urla', array()); 
     239      $urlList[]= array('testurls~urlsig:urla', array('first'=>'premier')); 
     240      $urlList[]= array('testurls~urlsig:urlb', array()); 
    238241 
    239242      $trueResult=array( 
     
    260263          "/index.php/hello3", 
    261264          "/withhandler/premier/deuxieme", 
     265          "/myhand/urlsig/urla", 
     266          "/myhand/urlsig/urla?first=premier", 
     267          "/myhand/urlsig/urlb", 
    262268       ); 
    263269 
     
    290296          "/index/hello3", 
    291297          "/withhandler/premier/deuxieme", 
     298          "/myhand/urlsig/urla", 
     299          "/myhand/urlsig/urla?first=premier", 
     300          "/myhand/urlsig/urlb", 
    292301       ); 
    293302      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php

    r851 r960  
    8282      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello2'); 
    8383      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello3'); 
     84      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urla'); 
     85      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urla', 'first'=>'premier'); 
     86      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urlb'); 
     87      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urlc'); 
    8488 
    8589      $request=array( 
     
    101105          array("index.php","/hello2",array()), 
    102106          array("index.php","/hello3",array()), 
     107          array("handlermodule.php","/myhand/urlsig/urla",array()), 
     108          array("handlermodule.php","/myhand/urlsig/urla",array('first'=>'premier')), 
     109          array("handlermodule.php","/myhand/urlsig/urlb",array()), 
     110          array("handlermodule.php","/myhand/urlsig/urlc",array()), 
     111 
    103112       ); 
    104113 
     
    134143          array("index","/hello2",array()), 
    135144          array("index","/hello3",array()), 
     145          array("handlermodule","/myhand/urlsig/urla",array()), 
     146          array("handlermodule","/myhand/urlsig/urla",array('first'=>'premier')), 
     147          array("handlermodule","/myhand/urlsig/urlb",array()), 
     148          array("handlermodule","/myhand/urlsig/urlc",array()), 
    136149       ); 
    137150      foreach($request as $k=>$urldata){ 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php

    r851 r960  
    8282      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello2'); 
    8383      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello3'); 
     84      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urla'); 
     85      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urla', 'first'=>'premier'); 
     86      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urlb'); 
     87      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urlc'); 
    8488 
    8589      $request=array( 
     
    101105          array("index.php","/hello2",array()), 
    102106          array("index.php","/hello3",array()), 
     107          array("handlermodule.php","/myhand/urlsig/urla",array()), 
     108          array("handlermodule.php","/myhand/urlsig/urla",array('first'=>'premier')), 
     109          array("handlermodule.php","/myhand/urlsig/urlb",array()), 
     110          array("handlermodule.php","/myhand/urlsig/urlc",array()), 
     111 
    103112       ); 
    104113 
     
    134143          array("index","/hello2",array()), 
    135144          array("index","/hello3",array()), 
     145          array("handlermodule","/myhand/urlsig/urla",array()), 
     146          array("handlermodule","/myhand/urlsig/urla",array('first'=>'premier')), 
     147          array("handlermodule","/myhand/urlsig/urlb",array()), 
     148          array("handlermodule","/myhand/urlsig/urlc",array()), 
    136149       ); 
    137150      foreach($request as $k=>$urldata){ 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php

    r851 r960  
    8282      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello2'); 
    8383      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello3'); 
     84      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urla'); 
     85      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urla', 'first'=>'premier'); 
     86      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urlb'); 
     87      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urlc'); 
    8488 
    8589      $request=array( 
     
    101105          array("index.php","/hello2",array()), 
    102106          array("index.php","/hello3",array()), 
     107          array("handlermodule.php","/myhand/urlsig/urla",array()), 
     108          array("handlermodule.php","/myhand/urlsig/urla",array('first'=>'premier')), 
     109          array("handlermodule.php","/myhand/urlsig/urlb",array()), 
     110          array("handlermodule.php","/myhand/urlsig/urlc",array()), 
     111 
    103112       ); 
    104113 
     
    134143          array("index","/hello2",array()), 
    135144          array("index","/hello3",array()), 
     145          array("handlermodule","/myhand/urlsig/urla",array()), 
     146          array("handlermodule","/myhand/urlsig/urla",array('first'=>'premier')), 
     147          array("handlermodule","/myhand/urlsig/urlb",array()), 
     148          array("handlermodule","/myhand/urlsig/urlc",array()), 
    136149       ); 
    137150      foreach($request as $k=>$urldata){ 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php

    r851 r960  
    8282      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello2'); 
    8383      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello3'); 
     84      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urla'); 
     85      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urla', 'first'=>'premier'); 
     86      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urlb'); 
     87      $resultList[]= array('module'=>'testurls', 'action'=>'urlsig:urlc'); 
    8488 
    8589      $request=array( 
     
    101105          array("index.php","/hello2",array()), 
    102106          array("index.php","/hello3",array()), 
     107          array("handlermodule.php","/myhand/urlsig/urla",array()), 
     108          array("handlermodule.php","/myhand/urlsig/urla",array('first'=>'premier')), 
     109          array("handlermodule.php","/myhand/urlsig/urlb",array()), 
     110          array("handlermodule.php","/myhand/urlsig/urlc",array()), 
     111 
    103112       ); 
    104113 
     
    134143          array("index","/hello2",array()), 
    135144          array("index","/hello3",array()), 
     145          array("handlermodule","/myhand/urlsig/urla",array()), 
     146          array("handlermodule","/myhand/urlsig/urla",array('first'=>'premier')), 
     147          array("handlermodule","/myhand/urlsig/urlb",array()), 
     148          array("handlermodule","/myhand/urlsig/urlc",array()), 
    136149       ); 
    137150      foreach($request as $k=>$urldata){ 
  • branches/1.0.x/testapp/var/config/urls.xml

    r941 r960  
    6363        <url handler="urlsig" module="jelix_tests" action="urlsig:bug599"/> 
    6464    </classicentrypoint> 
     65    <classicentrypoint name="handlermodule"  noentrypoint="true"> 
     66        <url handler="urlhandlermodule" module="testurls" /> 
     67    </classicentrypoint> 
    6568 
    6669    <classicentrypoint name="news"> 
  • branches/1.0.x/testapp/var/config/urls.xml

    r941 r960  
    6363        <url handler="urlsig" module="jelix_tests" action="urlsig:bug599"/> 
    6464    </classicentrypoint> 
     65    <classicentrypoint name="handlermodule"  noentrypoint="true"> 
     66        <url handler="urlhandlermodule" module="testurls" /> 
     67    </classicentrypoint> 
    6568 
    6669    <classicentrypoint name="news"> 
  • branches/1.0.x/testapp/var/config/urls.xml

    r941 r960  
    6363        <url handler="urlsig" module="jelix_tests" action="urlsig:bug599"/> 
    6464    </classicentrypoint> 
     65    <classicentrypoint name="handlermodule"  noentrypoint="true"> 
     66        <url handler="urlhandlermodule" module="testurls" /> 
     67    </classicentrypoint> 
    6568 
    6669    <classicentrypoint name="news"> 
  • branches/1.0.x/testapp/var/config/urls.xml

    r941 r960  
    6363        <url handler="urlsig" module="jelix_tests" action="urlsig:bug599"/> 
    6464    </classicentrypoint> 
     65    <classicentrypoint name="handlermodule"  noentrypoint="true"> 
     66        <url handler="urlhandlermodule" module="testurls" /> 
     67    </classicentrypoint> 
    6568 
    6669    <classicentrypoint name="news"> 
  • trunk/build/manifests/testapp.mn

    r953 r960  
    179179  utils.jclasses.html_cli.php 
    180180 
     181cd testapp/modules/testurls/classes/ 
     182  urlhandlermodule.urlhandler.php 
     183cd testapp/modules/testurls/controllers/ 
     184  urlsig.classic.php 
     185 
    181186cd testapp/var 
    182187  .htaccess 
  • trunk/build/manifests/testapp.mn

    r953 r960  
    179179  utils.jclasses.html_cli.php 
    180180 
     181cd testapp/modules/testurls/classes/ 
     182  urlhandlermodule.urlhandler.php 
     183cd testapp/modules/testurls/controllers/ 
     184  urlsig.classic.php 
     185 
    181186cd testapp/var 
    182187  .htaccess 
  • trunk/build/manifests/testapp.mn

    r953 r960  
    179179  utils.jclasses.html_cli.php 
    180180 
     181cd testapp/modules/testurls/classes/ 
     182  urlhandlermodule.urlhandler.php 
     183cd testapp/modules/testurls/controllers/ 
     184  urlsig.classic.php 
     185 
    181186cd testapp/var 
    182187  .htaccess 
  • trunk/build/manifests/testapp.mn

    r953 r960  
    179179  utils.jclasses.html_cli.php 
    180180 
     181cd testapp/modules/testurls/classes/ 
     182  urlhandlermodule.urlhandler.php 
     183cd testapp/modules/testurls/controllers/ 
     184  urlsig.classic.php 
     185 
    181186cd testapp/var 
    182187  .htaccess 
  • trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

    r941 r960  
    55* @author      Laurent Jouanneau 
    66* @contributor Thibault PIRONT < nuKs > 
    7 * @copyright   2005-2007 Laurent Jouanneau 
     7* @copyright   2005-2008 Laurent Jouanneau 
    88* @copyright   2007 Thibault PIRONT 
    99* @link        http://www.jelix.org 
     
    164164                    $selclass = $class; 
    165165                  $s= new jSelectorUrlHandler($selclass); 
     166                  if(!isset($url['action'])) { 
     167                    $action = '*'; 
     168                  } 
    166169                  $createUrlContent.="include_once('".$s->getPath()."');\n"; 
    167170                  $parseInfos[]=array($module, $action, $selclass, $actionOverride ); 
  • trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

    r941 r960  
    55* @author      Laurent Jouanneau 
    66* @contributor Thibault PIRONT < nuKs > 
    7 * @copyright   2005-2007 Laurent Jouanneau 
     7* @copyright   2005-2008 Laurent Jouanneau 
    88* @copyright   2007 Thibault PIRONT 
    99* @link        http://www.jelix.org 
     
    164164                    $selclass = $class; 
    165165                  $s= new jSelectorUrlHandler($selclass); 
     166                  if(!isset($url['action'])) { 
     167                    $action = '*'; 
     168                  } 
    166169                  $createUrlContent.="include_once('".$s->getPath()."');\n"; 
    167170                  $parseInfos[]=array($module, $action, $selclass, $actionOverride ); 
  • trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

    r941 r960  
    55* @author      Laurent Jouanneau 
    66* @contributor Thibault PIRONT < nuKs > 
    7 * @copyright   2005-2007 Laurent Jouanneau 
     7* @copyright   2005-2008 Laurent Jouanneau 
    88* @copyright   2007 Thibault PIRONT 
    99* @link        http://www.jelix.org 
     
    164164                    $selclass = $class; 
    165165                  $s= new jSelectorUrlHandler($selclass); 
     166                  if(!isset($url['action'])) { 
     167                    $action = '*'; 
     168                  } 
    166169                  $createUrlContent.="include_once('".$s->getPath()."');\n"; 
    167170                  $parseInfos[]=array($module, $action, $selclass, $actionOverride ); 
  • trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

    r941 r960  
    55* @author      Laurent Jouanneau 
    66* @contributor Thibault PIRONT < nuKs > 
    7 * @copyright   2005-2007 Laurent Jouanneau 
     7* @copyright   2005-2008 Laurent Jouanneau 
    88* @copyright   2007 Thibault PIRONT 
    99* @link        http://www.jelix.org 
     
    164164                    $selclass = $class; 
    165165                  $s= new jSelectorUrlHandler($selclass); 
     166                  if(!isset($url['action'])) { 
     167                    $action = '*'; 
     168                  } 
    166169                  $createUrlContent.="include_once('".$s->getPath()."');\n"; 
    167170                  $parseInfos[]=array($module, $action, $selclass, $actionOverride ); 
  • trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

    r941 r960  
    236236      $urlList[]= array('jelix_tests~hello3', array()); 
    237237      $urlList[]= array('jelix_tests~urlsig:bug599', array('first'=>'premier',  'second'=>'deuxieme')); 
     238      $urlList[]= array('testurls~urlsig:urla', array()); 
     239      $urlList[]= array('testurls~urlsig:urla', array('first'=>'premier')); 
     240      $urlList[]= array('testurls~urlsig:urlb', array()); 
    238241 
    239242      $trueResult=array( 
     
    260263          "/index.php/hello3", 
    261264          "/withhandler/premier/deuxieme", 
     265          "/myhand/urlsig/urla", 
     266          "/myhand/urlsig/urla?first=premier", 
     267          "/myhand/urlsig/urlb", 
    262268       ); 
    263269 
     
    290296          "/index/hello3", 
    291297          "/withhandler/premier/deuxieme", 
     298          "/myhand/urlsig/urla", 
     299          "/myhand/urlsig/urla?first=premier", 
     300          "/myhand/urlsig/urlb", 
    292301       ); 
    293302      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; 
  • trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

    r941 r960  
    236236      $urlList[]= array('jelix_tests~hello3', array()); 
    237237      $urlList[]= array('jelix_tests~urlsig:bug599', array('first'=>'premier',  'second'=>'deuxieme')); 
     238      $urlList[]= array('testurls~urlsig:urla', array()); 
     239      $urlList[]= array('testurls~urlsig:urla', array('first'=>'premier')); 
     240      $urlList[]= array('testurls~urlsig:urlb', array()); 
    238241 
    239242      $trueResult=array( 
     
    260263          "/index.php/hello3", 
    261264          "/withhandler/premier/deuxieme", 
     265          "/myhand/urlsig/urla", 
     266          "/myhand/urlsig/urla?first=premier", 
     267          "/myhand/urlsig/urlb", 
    262268       ); 
    263269 
     
    290296          "/index/hello3", 
    291297          "/withhandler/premier/deuxieme", 
     298          "/myhand/urlsig/urla", 
     299          "/myhand/urlsig/urla?first=premier", 
     300          "/myhand/urlsig/urlb", 
    292301       ); 
    293302      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; 
  • trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

    r941 r960  
    236236      $urlList[]= array('jelix_tests~hello3', array()); 
    237237      $urlList[]= array('jelix_tests~urlsig:bug599', array('first'=>'premier',  'second'=>'deuxieme')); 
     238      $urlList[]= array('testurls~urlsig:urla', array()); 
     239      $urlList[]= array('testurls~urlsig:urla', array('first'=>'premier')); 
     240      $urlList[]= array('testurls~urlsig:urlb', array()); 
    238241 
    239242      $trueResult=array( 
     
    260263          "/index.php/hello3", 
    261264          "/withhandler/premier/deuxieme", 
     265          "/myhand/urlsig/urla", 
     266          "/myhand/urlsig/urla?first=premier", 
     267          "/myhand/urlsig/urlb", 
    262268       ); 
    263269 
     
    290296          "/index/hello3", 
    291297          "/withhandler/premier/deuxieme", 
     298          "/myhand/urlsig/urla", 
     299          "/myhand/urlsig/urla?first=premier", 
     300          "/myhand/urlsig/urlb", 
    292301       ); 
    293302      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; 
  • trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

    r941 r960  
    236236      $urlList[]= array('jelix_tests~hello3', array()); 
    237237      $urlList[]= array('jelix_tests~urlsig:bug599', array('first'=>'premier',  'second'=>'deuxieme')); 
     238      $urlList[]= array('testurls~urlsig:urla', array()); 
     239      $urlList[]= array('testurls~urlsig:urla', array('first'=>'premier')); 
     240      $urlList[]= array('testurls~urlsig:urlb', array()); 
    238241 
    239242      $trueResult=array( 
     
    260263          "/index.php/hello3", 
    261264          "/withhandler/premier/deuxieme", 
     265          "/myhand/urlsig/urla", 
     266          "/myhand/urlsig/urla?first=premier", 
     267          "/myhand/urlsig/urlb", 
    262268       ); 
    263269 
     
    290296          "/index/hello3", 
    291297          "/withhandler/premier/deuxieme",&n