Changeset 960
- Timestamp:
- 05/29/08 12:41:31 (6 months ago)
- Files:
-
- branches/1.0.x/build/manifests/testapp.mn (modified) (1 diff)
- branches/1.0.x/build/manifests/testapp.mn (modified) (1 diff)
- branches/1.0.x/build/manifests/testapp.mn (modified) (1 diff)
- branches/1.0.x/build/manifests/testapp.mn (modified) (1 diff)
- branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php (modified) (2 diffs)
- branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php (modified) (2 diffs)
- branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php (modified) (2 diffs)
- branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php (modified) (2 diffs)
- branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
- branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
- branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
- branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
- branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (3 diffs)
- branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (3 diffs)
- branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (3 diffs)
- branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (3 diffs)
- branches/1.0.x/testapp/modules/testurls (added)
- branches/1.0.x/testapp/modules/testurls (added)
- branches/1.0.x/testapp/modules/testurls (added)
- branches/1.0.x/testapp/modules/testurls (added)
- branches/1.0.x/testapp/modules/testurls/classes (added)
- branches/1.0.x/testapp/modules/testurls/classes (added)
- branches/1.0.x/testapp/modules/testurls/classes (added)
- branches/1.0.x/testapp/modules/testurls/classes (added)
- branches/1.0.x/testapp/modules/testurls/classes/urlhandlermodule.urlhandler.php (added)
- branches/1.0.x/testapp/modules/testurls/classes/urlhandlermodule.urlhandler.php (added)
- branches/1.0.x/testapp/modules/testurls/classes/urlhandlermodule.urlhandler.php (added)
- branches/1.0.x/testapp/modules/testurls/classes/urlhandlermodule.urlhandler.php (added)
- branches/1.0.x/testapp/modules/testurls/controllers (added)
- branches/1.0.x/testapp/modules/testurls/controllers (added)
- branches/1.0.x/testapp/modules/testurls/controllers (added)
- branches/1.0.x/testapp/modules/testurls/controllers (added)
- branches/1.0.x/testapp/modules/testurls/controllers/urlsig.classic.php (added)
- branches/1.0.x/testapp/modules/testurls/controllers/urlsig.classic.php (added)
- branches/1.0.x/testapp/modules/testurls/controllers/urlsig.classic.php (added)
- branches/1.0.x/testapp/modules/testurls/controllers/urlsig.classic.php (added)
- branches/1.0.x/testapp/var/config/urls.xml (modified) (1 diff)
- branches/1.0.x/testapp/var/config/urls.xml (modified) (1 diff)
- branches/1.0.x/testapp/var/config/urls.xml (modified) (1 diff)
- branches/1.0.x/testapp/var/config/urls.xml (modified) (1 diff)
- trunk/build/manifests/testapp.mn (modified) (1 diff)
- trunk/build/manifests/testapp.mn (modified) (1 diff)
- trunk/build/manifests/testapp.mn (modified) (1 diff)
- trunk/build/manifests/testapp.mn (modified) (1 diff)
- trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php (modified) (2 diffs)
- trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php (modified) (2 diffs)
- trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php (modified) (2 diffs)
- trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php (modified) (2 diffs)
- trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
- trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
- trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
- trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
- trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (3 diffs)
- trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (3 diffs)
- trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (3 diffs)
- trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (3 diffs)
- trunk/testapp/modules/testurls (added)
- trunk/testapp/modules/testurls (added)
- trunk/testapp/modules/testurls (added)
- trunk/testapp/modules/testurls (added)
- trunk/testapp/modules/testurls/classes (added)
- trunk/testapp/modules/testurls/classes (added)
- trunk/testapp/modules/testurls/classes (added)
- trunk/testapp/modules/testurls/classes (added)
- trunk/testapp/modules/testurls/classes/urlhandlermodule.urlhandler.php (added)
- trunk/testapp/modules/testurls/classes/urlhandlermodule.urlhandler.php (added)
- trunk/testapp/modules/testurls/classes/urlhandlermodule.urlhandler.php (added)
- trunk/testapp/modules/testurls/classes/urlhandlermodule.urlhandler.php (added)
- trunk/testapp/modules/testurls/controllers (added)
- trunk/testapp/modules/testurls/controllers (added)
- trunk/testapp/modules/testurls/controllers (added)
- trunk/testapp/modules/testurls/controllers (added)
- trunk/testapp/modules/testurls/controllers/urlsig.classic.php (added)
- trunk/testapp/modules/testurls/controllers/urlsig.classic.php (added)
- trunk/testapp/modules/testurls/controllers/urlsig.classic.php (added)
- trunk/testapp/modules/testurls/controllers/urlsig.classic.php (added)
- trunk/testapp/var/config/urls.xml (modified) (1 diff)
- trunk/testapp/var/config/urls.xml (modified) (1 diff)
- trunk/testapp/var/config/urls.xml (modified) (1 diff)
- trunk/testapp/var/config/urls.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.0.x/build/manifests/testapp.mn
r956 r960 163 163 utils.jdatetime.html_cli.php 164 164 165 cd testapp/modules/testurls/classes/ 166 urlhandlermodule.urlhandler.php 167 cd testapp/modules/testurls/controllers/ 168 urlsig.classic.php 169 165 170 cd testapp/var 166 171 .htaccess branches/1.0.x/build/manifests/testapp.mn
r956 r960 163 163 utils.jdatetime.html_cli.php 164 164 165 cd testapp/modules/testurls/classes/ 166 urlhandlermodule.urlhandler.php 167 cd testapp/modules/testurls/controllers/ 168 urlsig.classic.php 169 165 170 cd testapp/var 166 171 .htaccess branches/1.0.x/build/manifests/testapp.mn
r956 r960 163 163 utils.jdatetime.html_cli.php 164 164 165 cd testapp/modules/testurls/classes/ 166 urlhandlermodule.urlhandler.php 167 cd testapp/modules/testurls/controllers/ 168 urlsig.classic.php 169 165 170 cd testapp/var 166 171 .htaccess branches/1.0.x/build/manifests/testapp.mn
r956 r960 163 163 utils.jdatetime.html_cli.php 164 164 165 cd testapp/modules/testurls/classes/ 166 urlhandlermodule.urlhandler.php 167 cd testapp/modules/testurls/controllers/ 168 urlsig.classic.php 169 165 170 cd testapp/var 166 171 .htaccess branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php
r941 r960 5 5 * @author Laurent Jouanneau 6 6 * @contributor Thibault PIRONT < nuKs > 7 * @copyright 2005-200 7Laurent Jouanneau7 * @copyright 2005-2008 Laurent Jouanneau 8 8 * @copyright 2007 Thibault PIRONT 9 9 * @link http://www.jelix.org … … 164 164 $selclass = $class; 165 165 $s= new jSelectorUrlHandler($selclass); 166 if(!isset($url['action'])) { 167 $action = '*'; 168 } 166 169 $createUrlContent.="include_once('".$s->getPath()."');\n"; 167 170 $parseInfos[]=array($module, $action, $selclass, $actionOverride ); branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php
r941 r960 5 5 * @author Laurent Jouanneau 6 6 * @contributor Thibault PIRONT < nuKs > 7 * @copyright 2005-200 7Laurent Jouanneau7 * @copyright 2005-2008 Laurent Jouanneau 8 8 * @copyright 2007 Thibault PIRONT 9 9 * @link http://www.jelix.org … … 164 164 $selclass = $class; 165 165 $s= new jSelectorUrlHandler($selclass); 166 if(!isset($url['action'])) { 167 $action = '*'; 168 } 166 169 $createUrlContent.="include_once('".$s->getPath()."');\n"; 167 170 $parseInfos[]=array($module, $action, $selclass, $actionOverride ); branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php
r941 r960 5 5 * @author Laurent Jouanneau 6 6 * @contributor Thibault PIRONT < nuKs > 7 * @copyright 2005-200 7Laurent Jouanneau7 * @copyright 2005-2008 Laurent Jouanneau 8 8 * @copyright 2007 Thibault PIRONT 9 9 * @link http://www.jelix.org … … 164 164 $selclass = $class; 165 165 $s= new jSelectorUrlHandler($selclass); 166 if(!isset($url['action'])) { 167 $action = '*'; 168 } 166 169 $createUrlContent.="include_once('".$s->getPath()."');\n"; 167 170 $parseInfos[]=array($module, $action, $selclass, $actionOverride ); branches/1.0.x/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php
r941 r960 5 5 * @author Laurent Jouanneau 6 6 * @contributor Thibault PIRONT < nuKs > 7 * @copyright 2005-200 7Laurent Jouanneau7 * @copyright 2005-2008 Laurent Jouanneau 8 8 * @copyright 2007 Thibault PIRONT 9 9 * @link http://www.jelix.org … … 164 164 $selclass = $class; 165 165 $s= new jSelectorUrlHandler($selclass); 166 if(!isset($url['action'])) { 167 $action = '*'; 168 } 166 169 $createUrlContent.="include_once('".$s->getPath()."');\n"; 167 170 $parseInfos[]=array($module, $action, $selclass, $actionOverride ); branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
r941 r960 236 236 $urlList[]= array('jelix_tests~hello3', array()); 237 237 $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()); 238 241 239 242 $trueResult=array( … … 260 263 "/index.php/hello3", 261 264 "/withhandler/premier/deuxieme", 265 "/myhand/urlsig/urla", 266 "/myhand/urlsig/urla?first=premier", 267 "/myhand/urlsig/urlb", 262 268 ); 263 269 … … 290 296 "/index/hello3", 291 297 "/withhandler/premier/deuxieme", 298 "/myhand/urlsig/urla", 299 "/myhand/urlsig/urla?first=premier", 300 "/myhand/urlsig/urlb", 292 301 ); 293 302 $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
r941 r960 236 236 $urlList[]= array('jelix_tests~hello3', array()); 237 237 $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()); 238 241 239 242 $trueResult=array( … … 260 263 "/index.php/hello3", 261 264 "/withhandler/premier/deuxieme", 265 "/myhand/urlsig/urla", 266 "/myhand/urlsig/urla?first=premier", 267 "/myhand/urlsig/urlb", 262 268 ); 263 269 … … 290 296 "/index/hello3", 291 297 "/withhandler/premier/deuxieme", 298 "/myhand/urlsig/urla", 299 "/myhand/urlsig/urla?first=premier", 300 "/myhand/urlsig/urlb", 292 301 ); 293 302 $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
r941 r960 236 236 $urlList[]= array('jelix_tests~hello3', array()); 237 237 $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()); 238 241 239 242 $trueResult=array( … … 260 263 "/index.php/hello3", 261 264 "/withhandler/premier/deuxieme", 265 "/myhand/urlsig/urla", 266 "/myhand/urlsig/urla?first=premier", 267 "/myhand/urlsig/urlb", 262 268 ); 263 269 … … 290 296 "/index/hello3", 291 297 "/withhandler/premier/deuxieme", 298 "/myhand/urlsig/urla", 299 "/myhand/urlsig/urla?first=premier", 300 "/myhand/urlsig/urlb", 292 301 ); 293 302 $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
r941 r960 236 236 $urlList[]= array('jelix_tests~hello3', array()); 237 237 $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()); 238 241 239 242 $trueResult=array( … … 260 263 "/index.php/hello3", 261 264 "/withhandler/premier/deuxieme", 265 "/myhand/urlsig/urla", 266 "/myhand/urlsig/urla?first=premier", 267 "/myhand/urlsig/urlb", 262 268 ); 263 269 … … 290 296 "/index/hello3", 291 297 "/withhandler/premier/deuxieme", 298 "/myhand/urlsig/urla", 299 "/myhand/urlsig/urla?first=premier", 300 "/myhand/urlsig/urlb", 292 301 ); 293 302 $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 82 82 $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello2'); 83 83 $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'); 84 88 85 89 $request=array( … … 101 105 array("index.php","/hello2",array()), 102 106 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 103 112 ); 104 113 … … 134 143 array("index","/hello2",array()), 135 144 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()), 136 149 ); 137 150 foreach($request as $k=>$urldata){ branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php
r851 r960 82 82 $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello2'); 83 83 $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'); 84 88 85 89 $request=array( … … 101 105 array("index.php","/hello2",array()), 102 106 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 103 112 ); 104 113 … … 134 143 array("index","/hello2",array()), 135 144 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()), 136 149 ); 137 150 foreach($request as $k=>$urldata){ branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php
r851 r960 82 82 $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello2'); 83 83 $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'); 84 88 85 89 $request=array( … … 101 105 array("index.php","/hello2",array()), 102 106 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 103 112 ); 104 113 … … 134 143 array("index","/hello2",array()), 135 144 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()), 136 149 ); 137 150 foreach($request as $k=>$urldata){ branches/1.0.x/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php
r851 r960 82 82 $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:hello2'); 83 83 $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'); 84 88 85 89 $request=array( … … 101 105 array("index.php","/hello2",array()), 102 106 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 103 112 ); 104 113 … … 134 143 array("index","/hello2",array()), 135 144 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()), 136 149 ); 137 150 foreach($request as $k=>$urldata){ branches/1.0.x/testapp/var/config/urls.xml
r941 r960 63 63 <url handler="urlsig" module="jelix_tests" action="urlsig:bug599"/> 64 64 </classicentrypoint> 65 <classicentrypoint name="handlermodule" noentrypoint="true"> 66 <url handler="urlhandlermodule" module="testurls" /> 67 </classicentrypoint> 65 68 66 69 <classicentrypoint name="news"> branches/1.0.x/testapp/var/config/urls.xml
r941 r960 63 63 <url handler="urlsig" module="jelix_tests" action="urlsig:bug599"/> 64 64 </classicentrypoint> 65 <classicentrypoint name="handlermodule" noentrypoint="true"> 66 <url handler="urlhandlermodule" module="testurls" /> 67 </classicentrypoint> 65 68 66 69 <classicentrypoint name="news"> branches/1.0.x/testapp/var/config/urls.xml
r941 r960 63 63 <url handler="urlsig" module="jelix_tests" action="urlsig:bug599"/> 64 64 </classicentrypoint> 65 <classicentrypoint name="handlermodule" noentrypoint="true"> 66 <url handler="urlhandlermodule" module="testurls" /> 67 </classicentrypoint> 65 68 66 69 <classicentrypoint name="news"> branches/1.0.x/testapp/var/config/urls.xml
r941 r960 63 63 <url handler="urlsig" module="jelix_tests" action="urlsig:bug599"/> 64 64 </classicentrypoint> 65 <classicentrypoint name="handlermodule" noentrypoint="true"> 66 <url handler="urlhandlermodule" module="testurls" /> 67 </classicentrypoint> 65 68 66 69 <classicentrypoint name="news"> trunk/build/manifests/testapp.mn
r953 r960 179 179 utils.jclasses.html_cli.php 180 180 181 cd testapp/modules/testurls/classes/ 182 urlhandlermodule.urlhandler.php 183 cd testapp/modules/testurls/controllers/ 184 urlsig.classic.php 185 181 186 cd testapp/var 182 187 .htaccess trunk/build/manifests/testapp.mn
r953 r960 179 179 utils.jclasses.html_cli.php 180 180 181 cd testapp/modules/testurls/classes/ 182 urlhandlermodule.urlhandler.php 183 cd testapp/modules/testurls/controllers/ 184 urlsig.classic.php 185 181 186 cd testapp/var 182 187 .htaccess trunk/build/manifests/testapp.mn
r953 r960 179 179 utils.jclasses.html_cli.php 180 180 181 cd testapp/modules/testurls/classes/ 182 urlhandlermodule.urlhandler.php 183 cd testapp/modules/testurls/controllers/ 184 urlsig.classic.php 185 181 186 cd testapp/var 182 187 .htaccess trunk/build/manifests/testapp.mn
r953 r960 179 179 utils.jclasses.html_cli.php 180 180 181 cd testapp/modules/testurls/classes/ 182 urlhandlermodule.urlhandler.php 183 cd testapp/modules/testurls/controllers/ 184 urlsig.classic.php 185 181 186 cd testapp/var 182 187 .htaccess trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php
r941 r960 5 5 * @author Laurent Jouanneau 6 6 * @contributor Thibault PIRONT < nuKs > 7 * @copyright 2005-200 7Laurent Jouanneau7 * @copyright 2005-2008 Laurent Jouanneau 8 8 * @copyright 2007 Thibault PIRONT 9 9 * @link http://www.jelix.org … … 164 164 $selclass = $class; 165 165 $s= new jSelectorUrlHandler($selclass); 166 if(!isset($url['action'])) { 167 $action = '*'; 168 } 166 169 $createUrlContent.="include_once('".$s->getPath()."');\n"; 167 170 $parseInfos[]=array($module, $action, $selclass, $actionOverride ); trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php
r941 r960 5 5 * @author Laurent Jouanneau 6 6 * @contributor Thibault PIRONT < nuKs > 7 * @copyright 2005-200 7Laurent Jouanneau7 * @copyright 2005-2008 Laurent Jouanneau 8 8 * @copyright 2007 Thibault PIRONT 9 9 * @link http://www.jelix.org … … 164 164 $selclass = $class; 165 165 $s= new jSelectorUrlHandler($selclass); 166 if(!isset($url['action'])) { 167 $action = '*'; 168 } 166 169 $createUrlContent.="include_once('".$s->getPath()."');\n"; 167 170 $parseInfos[]=array($module, $action, $selclass, $actionOverride ); trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php
r941 r960 5 5 * @author Laurent Jouanneau 6 6 * @contributor Thibault PIRONT < nuKs > 7 * @copyright 2005-200 7Laurent Jouanneau7 * @copyright 2005-2008 Laurent Jouanneau 8 8 * @copyright 2007 Thibault PIRONT 9 9 * @link http://www.jelix.org … … 164 164 $selclass = $class; 165 165 $s= new jSelectorUrlHandler($selclass); 166 if(!isset($url['action'])) { 167 $action = '*'; 168 } 166 169 $createUrlContent.="include_once('".$s->getPath()."');\n"; 167 170 $parseInfos[]=array($module, $action, $selclass, $actionOverride ); trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php
r941 r960 5 5 * @author Laurent Jouanneau 6 6 * @contributor Thibault PIRONT < nuKs > 7 * @copyright 2005-200 7Laurent Jouanneau7 * @copyright 2005-2008 Laurent Jouanneau 8 8 * @copyright 2007 Thibault PIRONT 9 9 * @link http://www.jelix.org … … 164 164 $selclass = $class; 165 165 $s= new jSelectorUrlHandler($selclass); 166 if(!isset($url['action'])) { 167 $action = '*'; 168 } 166 169 $createUrlContent.="include_once('".$s->getPath()."');\n"; 167 170 $parseInfos[]=array($module, $action, $selclass, $actionOverride ); trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
r941 r960 236 236 $urlList[]= array('jelix_tests~hello3', array()); 237 237 $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()); 238 241 239 242 $trueResult=array( … … 260 263 "/index.php/hello3", 261 264 "/withhandler/premier/deuxieme", 265 "/myhand/urlsig/urla", 266 "/myhand/urlsig/urla?first=premier", 267 "/myhand/urlsig/urlb", 262 268 ); 263 269 … … 290 296 "/index/hello3", 291 297 "/withhandler/premier/deuxieme", 298 "/myhand/urlsig/urla", 299 "/myhand/urlsig/urla?first=premier", 300 "/myhand/urlsig/urlb", 292 301 ); 293 302 $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
r941 r960 236 236 $urlList[]= array('jelix_tests~hello3', array()); 237 237 $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()); 238 241 239 242 $trueResult=array( … … 260 263 "/index.php/hello3", 261 264 "/withhandler/premier/deuxieme", 265 "/myhand/urlsig/urla", 266 "/myhand/urlsig/urla?first=premier", 267 "/myhand/urlsig/urlb", 262 268 ); 263 269 … … 290 296 "/index/hello3", 291 297 "/withhandler/premier/deuxieme", 298 "/myhand/urlsig/urla", 299 "/myhand/urlsig/urla?first=premier", 300 "/myhand/urlsig/urlb", 292 301 ); 293 302 $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
r941 r960 236 236 $urlList[]= array('jelix_tests~hello3', array()); 237 237 $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()); 238 241 239 242 $trueResult=array( … … 260 263 "/index.php/hello3", 261 264 "/withhandler/premier/deuxieme", 265 "/myhand/urlsig/urla", 266 "/myhand/urlsig/urla?first=premier", 267 "/myhand/urlsig/urlb", 262 268 ); 263 269 … … 290 296 "/index/hello3", 291 297 "/withhandler/premier/deuxieme", 298 "/myhand/urlsig/urla", 299 "/myhand/urlsig/urla?first=premier", 300 "/myhand/urlsig/urlb", 292 301 ); 293 302 $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11]; trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
r941 r960 236 236 $urlList[]= array('jelix_tests~hello3', array()); 237 237 $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()); 238 241 239 242 $trueResult=array( … … 260 263 "/index.php/hello3", 261 264 "/withhandler/premier/deuxieme", 265 "/myhand/urlsig/urla", 266 "/myhand/urlsig/urla?first=premier", 267 "/myhand/urlsig/urlb", 262 268 ); 263 269 … … 290 296 "/index/hello3", 291 297 "/withhandler/premier/deuxieme",&n
