Changeset 693

Timestamp:

12/13/07 22:25:14 (1 year ago)

Author:

laurentj

Message:

worked on ticket #317: now when enableOldActionSelector is true, you can use also new action selector, only if you use full action selector : controler and method should be indicate. And selectors in urls.xml should be new action selector

Files:

• trunk/lib/jelix/controllers/jControllerDaoCrud.class.php (modified) (1 diff)
• trunk/lib/jelix/controllers/jControllerDaoCrud.class.php (modified) (1 diff)
• trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (2 diffs)
• trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (2 diffs)
• trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
• trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
• trunk/lib/jelix/core/jSelector.class.php (modified) (5 diffs)
• trunk/lib/jelix/core/jSelector.class.php (modified) (5 diffs)
• trunk/lib/jelix/core/request/jCmdLineRequest.class.php (modified) (1 diff)
• trunk/lib/jelix/core/request/jCmdLineRequest.class.php (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/significant.urls.php (modified) (3 diffs)
• trunk/lib/jelix/plugins/urls/significant/significant.urls.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/core.old_urls_generation.html.php (modified) (12 diffs)
• trunk/testapp/modules/jelix_tests/tests/core.old_urls_generation.html.php (modified) (12 diffs)
• trunk/testapp/modules/jelix_tests/tests/core.old_urls_parsing.html.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/core.old_urls_parsing.html.php (modified) (2 diffs)
• trunk/testapp/var/config/urls_old.xml (modified) (4 diffs)
• trunk/testapp/var/config/urls_old.xml (modified) (4 diffs)

trunk/lib/jelix/controllers/jControllerDaoCrud.class.php

@@ -120 +120 @@
-    protected function _getAction($method){
-        global $gJCoord;
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-        if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-            return $gJCoord->action->module.'~'.$gJCoord->action->controller.':'.$method;
-        else
-            return $gJCoord->action->module.'~'.$gJCoord->action->controller.'_'.$method;
-#else
-        return $gJCoord->action->module.'~'.$gJCoord->action->controller.':'.$method;
-#endif
-    }
-

trunk/lib/jelix/controllers/jControllerDaoCrud.class.php

@@ -120 +120 @@
-    protected function _getAction($method){
-        global $gJCoord;
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-        if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-            return $gJCoord->action->module.'~'.$gJCoord->action->controller.':'.$method;
-        else
-            return $gJCoord->action->module.'~'.$gJCoord->action->controller.'_'.$method;
-#else
-        return $gJCoord->action->module.'~'.$gJCoord->action->controller.':'.$method;
-#endif
-    }
-

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

@@ -43 +43 @@
-        $config->isWindows = (DIRECTORY_SEPARATOR == '\\');
-        if(trim( $config->startAction) == '') {
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-            if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-                $config->startAction = ':';
-            else
-                $config->startAction = '_';
-#else
-            $config->startAction = ':';
-
-
+
-
-        $config->_allBasePath = array();
@@ -101 +94 @@
-        $config['isWindows'] =  (DIRECTORY_SEPARATOR == '\\');
-        if(trim( $config['startAction']) == '') {
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-            if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-                $config['startAction'] = ':';
-            else
-                $config['startAction'] = '_';
-#else
-            $config['startAction'] = ':';
-#endif
-        }
-        

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

@@ -43 +43 @@
-        $config->isWindows = (DIRECTORY_SEPARATOR == '\\');
-        if(trim( $config->startAction) == '') {
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-            if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-                $config->startAction = ':';
-            else
-                $config->startAction = '_';
-#else
-            $config->startAction = ':';
-
-
+
-
-        $config->_allBasePath = array();
@@ -101 +94 @@
-        $config['isWindows'] =  (DIRECTORY_SEPARATOR == '\\');
-        if(trim( $config['startAction']) == '') {
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-            if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-                $config['startAction'] = ':';
-            else
-                $config['startAction'] = '_';
-#else
-            $config['startAction'] = ':';
-#endif
-        }
-        

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

@@ -181 +181 @@
-                $this->actionName = $gJConfig->startAction;
-            else {
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-                if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-                    $this->actionName = 'default:index';
-                else
-                    $this->actionName = 'default_index';
-#else
-                $this->actionName = 'default:index';
-#endif
-            }
-        }

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

@@ -181 +181 @@
-                $this->actionName = $gJConfig->startAction;
-            else {
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-                if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-                    $this->actionName = 'default:index';
-                else
-                    $this->actionName = 'default_index';
-#else
-                $this->actionName = 'default:index';
-#endif
-            }
-        }

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

@@ -195 +195 @@
-        $this->module = $module;
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-
+ || strpos($action,':') !== false
-            $separator = ':';
-        else
@@ -210 +210 @@
-            $this->method = $r[1]==''?'index':$r[1];
-        }
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-        $this->resource = $this->controller.$separator.$this->method;
-#else
-        $this->resource = $this->controller.':'.$this->method;
-#endif
-        $this->request = $request;
-        $this->_createPath();
@@ -273 +269 @@
-#if ENABLE_PHP_JELIX
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-
+ || strpos($sel,':') !== false
-            $res = jelix_scan_action_sel($sel, $this, $gJCoord->actionName)
-        }
@@ -308 +304 @@
-                $this->resource = $m[2];
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-
-separator = ':'
+ || strpos($this->resource,':') !== false
+r = explode(':',$this->resource)
-            else
-
-
-
+
-#else
-            $r = explode(':',$this->resource);
@@ -324 +318 @@
-                $this->method = $r[1]==''?'index':$r[1];
-            }
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-            $this->resource = $this->controller.$separator.$this->method;
-#else
-            $this->resource = $this->controller.':'.$this->method;
-
+
-            if($m[3] != '' && $enableRequestPart)
-                $this->request = $m[3];

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

@@ -195 +195 @@
-        $this->module = $module;
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-
+ || strpos($action,':') !== false
-            $separator = ':';
-        else
@@ -210 +210 @@
-            $this->method = $r[1]==''?'index':$r[1];
-        }
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-        $this->resource = $this->controller.$separator.$this->method;
-#else
-        $this->resource = $this->controller.':'.$this->method;
-#endif
-        $this->request = $request;
-        $this->_createPath();
@@ -273 +269 @@
-#if ENABLE_PHP_JELIX
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-
+ || strpos($sel,':') !== false
-            $res = jelix_scan_action_sel($sel, $this, $gJCoord->actionName)
-        }
@@ -308 +304 @@
-                $this->resource = $m[2];
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-
-separator = ':'
+ || strpos($this->resource,':') !== false
+r = explode(':',$this->resource)
-            else
-
-
-
+
-#else
-            $r = explode(':',$this->resource);
@@ -324 +318 @@
-                $this->method = $r[1]==''?'index':$r[1];
-            }
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-            $this->resource = $this->controller.$separator.$this->method;
-#else
-            $this->resource = $this->controller.':'.$this->method;
-
+
-            if($m[3] != '' && $enableRequestPart)
-                $this->request = $m[3];

trunk/lib/jelix/core/request/jCmdLineRequest.class.php

@@ -41 +41 @@
-            $argsel = array_shift($argv); // get the module~action selector
-            if ($argsel == 'help') {
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-                if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-                    $argsel = 'jelix~help:index';
-                else
-                    $argsel = 'jelix~help_index';
-#else
-                $argsel = 'jelix~help:index';
-#endif
-            }
-            if (!preg_match('/(?:([\w\.]+)~)/', $argsel)) {

trunk/lib/jelix/core/request/jCmdLineRequest.class.php

@@ -41 +41 @@
-            $argsel = array_shift($argv); // get the module~action selector
-            if ($argsel == 'help') {
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-                if($GLOBALS['gJConfig']->enableOldActionSelector == false)
-                    $argsel = 'jelix~help:index';
-                else
-                    $argsel = 'jelix~help_index';
-#else
-                $argsel = 'jelix~help:index';
-#endif
-            }
-            if (!preg_match('/(?:([\w\.]+)~)/', $argsel)) {

trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

@@ -134 +134 @@
-
-               $action = (string)$url['action'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-               if (strpos($action, ':') === false) {
-                  $action = 'default:'.$action;
@@ -159 +144 @@
-                     if (strpos($each, ':') === false) {
-                        $each = 'default:'.$each;
-#endif
-                     }
-                  }

trunk/lib/jelix/plugins/urls/significant/jSignificantUrlsCompiler.class.php

@@ -134 +134 @@
-
-               $action = (string)$url['action'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-               if (strpos($action, ':') === false) {
-                  $action = 'default:'.$action;
@@ -159 +144 @@
-                     if (strpos($each, ':') === false) {
-                        $each = 'default:'.$each;
-#endif
-                     }
-                  }

trunk/lib/jelix/plugins/urls/significant/significant.urls.php

@@ -170 +170 @@
-                // et qu'elle fait partie des actions secondaires, alors on la laisse
-                // sinon on prend celle indiquée dans la conf
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }else{
-                    $url->params['action']=$infoparsing[1];
@@ -197 +210 @@
-                    // et qu'elle fait partie des actions secondaires, alors on la laisse
-                    // sinon on prend celle indiquée dans la conf
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        if($infoparsing[1] !='')
-                            $params['action']=$infoparsing[1];
@@ -231 +260 @@
-                $urlact = jUrl::get($gJConfig->urlengine['notfoundAct'],array(),jUrl::JURLACTION);
-            }catch(Exception $e){
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-                if($gJConfig->enableOldActionSelector)
-                    $urlact = new jUrlAction(array('module'=>'jelix', 'action'=>'error_notfound'));
-                else
-                    $urlact = new jUrlAction(array('module'=>'jelix', 'action'=>'error:notfound'));
-#else
-                $urlact = new jUrlAction(array('module'=>'jelix', 'action'=>'error:notfound'));
-#endif
-            }
-        }else if(!$urlact && $isDefault){

trunk/lib/jelix/plugins/urls/significant/significant.urls.php

@@ -170 +170 @@
-                // et qu'elle fait partie des actions secondaires, alors on la laisse
-                // sinon on prend celle indiquée dans la conf
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }else{
-                    $url->params['action']=$infoparsing[1];
@@ -197 +210 @@
-                    // et qu'elle fait partie des actions secondaires, alors on la laisse
-                    // sinon on prend celle indiquée dans la conf
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        if($infoparsing[1] !='')
-                            $params['action']=$infoparsing[1];
@@ -231 +260 @@
-                $urlact = jUrl::get($gJConfig->urlengine['notfoundAct'],array(),jUrl::JURLACTION);
-            }catch(Exception $e){
-#ifdef ENABLE_OLD_ACTION_SELECTOR
-                if($gJConfig->enableOldActionSelector)
-                    $urlact = new jUrlAction(array('module'=>'jelix', 'action'=>'error_notfound'));
-                else
-                    $urlact = new jUrlAction(array('module'=>'jelix', 'action'=>'error:notfound'));
-#else
-                $urlact = new jUrlAction(array('module'=>'jelix', 'action'=>'error:notfound'));
-#endif
-            }
-        }else if(!$urlact && $isDefault){

trunk/testapp/modules/jelix_tests/tests/core.old_urls_generation.html.php

@@ -30 +30 @@
-      $this->oldActionSelector = $gJConfig->enableOldActionSelector;
-      $gJConfig->enableOldActionSelector = true;
-_url2@classic jelix_tests~urlsig_
-_
+:url2@classic jelix_tests~urlsig:
+:
-    }
-
@@ -107 +107 @@
-         'entrypointExtension'=>'.php',
-         'notfoundAct'=>'jelix~notfound',
-_
+:
-         'significantFile'=>'urls_old.xml',
-       );
@@ -130 +130 @@
-
-      $trueResult=array(
-_
-_
-_
-_
-_
+:
+:
+:
+:
+:
-          "/xmlrpc.php",
-_
+:
-       );
-
@@ -147 +147 @@
-      jUrl::getEngine(true); // on recharge le nouveau moteur d'url
-      $trueResult=array(
-_
-_
-_
-_
-_
+:
+:
+:
+:
+:
-          "/xmlrpc",
-_
+:
-       );
-      $trueResult[5]='https://'.$_SERVER['HTTP_HOST'].$trueResult[5];
@@ -176 +176 @@
-         'defaultEntrypoint'=>'index',
-         'entrypointExtension'=>'.php',
-
-_
+error:
+:
-         'significantFile'=>'urls_old.xml',
-       );
@@ -218 +218 @@
-         'defaultEntrypoint'=>'index',
-         'entrypointExtension'=>'.php',
-
+error:
-         'significantFile'=>'urls_old.xml',
-       );
@@ -229 +229 @@
-      $urlList=array();
-      $urlList[]= array('urlsig_url1', array('mois'=>'10',  'annee'=>'2005', 'id'=>'01'));
+      $urlList[]= array('urlsig:url1', array('mois'=>'10',  'annee'=>'2005', 'id'=>'01'));
-      $urlList[]= array('urlsig_url9', array('mois'=>'10',  'annee'=>'2005', 'id'=>'09'));
+      $urlList[]= array('urlsig:url9', array('mois'=>'10',  'annee'=>'2005', 'id'=>'09'));
-      $urlList[]= array('urlsig_url10', array('mois'=>'10',  'annee'=>'2005', 'id'=>'10'));
-      $urlList[]= array('urlsig_url2', array('mois'=>'05',  'annee'=>'2004'));
@@ -253 +255 @@
-      $trueResult=array(
-          "/index.php/test/news/2005/10/01",
-
-
+
+
+
+
-          "/testnews.php/2004/05",
-          "/index.php/test/cms/actualite/65-c-est-la-fete-au-village",
-          "/test/cms2/actualite/65",
-          "/foo/bar.php/withhandler/premier/deuxieme",
-_
+:
-          "/xmlrpc.php",
-_
-_
+:
+:
-          "/index.php/shop/vetements/98",
-          "/index.php/shop/bricolage/53/",
@@ -275 +279 @@
-       );
-
-1]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11
+3]='https://'.$_SERVER['HTTP_HOST'].$trueResult[13
-      $this->_doCompareUrl("significant, multiview = false", $urlList,$trueResult);
-
@@ -282 +286 @@
-      $trueResult=array(
-          "/index/test/news/2005/10/01",
-
-
+
+
+
+
-          "/testnews/2004/05",
-          "/index/test/cms/actualite/65-c-est-la-fete-au-village",
-          "/test/cms2/actualite/65",
-          "/foo/bar/withhandler/premier/deuxieme",
-_
+:
-          "/xmlrpc",
-_
-_
+:
+:
-          "/index/shop/vetements/98",
-          "/index/shop/bricolage/53/",
@@ -303 +309 @@
-          "/index/hello3",
-       );
-1]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11
+3]='https://'.$_SERVER['HTTP_HOST'].$trueResult[13
-      $this->_doCompareUrl("significant, multiview = true", $urlList,$trueResult);
-
@@ -348 +354 @@
-       );
-      $this->_doCompareError("significant, errors multiview = true", $urlList,$trueResult);
-
-
-
-
-
-
-
+
-}
-?>

trunk/testapp/modules/jelix_tests/tests/core.old_urls_generation.html.php

@@ -30 +30 @@
-      $this->oldActionSelector = $gJConfig->enableOldActionSelector;
-      $gJConfig->enableOldActionSelector = true;
-_url2@classic jelix_tests~urlsig_
-_
+:url2@classic jelix_tests~urlsig:
+:
-    }
-
@@ -107 +107 @@
-         'entrypointExtension'=>'.php',
-         'notfoundAct'=>'jelix~notfound',
-_
+:
-         'significantFile'=>'urls_old.xml',
-       );
@@ -130 +130 @@
-
-      $trueResult=array(
-_
-_
-_
-_
-_
+:
+:
+:
+:
+:
-          "/xmlrpc.php",
-_
+:
-       );
-
@@ -147 +147 @@
-      jUrl::getEngine(true); // on recharge le nouveau moteur d'url
-      $trueResult=array(
-_
-_
-_
-_
-_
+:
+:
+:
+:
+:
-          "/xmlrpc",
-_
+:
-       );
-      $trueResult[5]='https://'.$_SERVER['HTTP_HOST'].$trueResult[5];
@@ -176 +176 @@
-         'defaultEntrypoint'=>'index',
-         'entrypointExtension'=>'.php',
-
-_
+error:
+:
-         'significantFile'=>'urls_old.xml',
-       );
@@ -218 +218 @@
-         'defaultEntrypoint'=>'index',
-         'entrypointExtension'=>'.php',
-
+error:
-         'significantFile'=>'urls_old.xml',
-       );
@@ -229 +229 @@
-      $urlList=array();
-      $urlList[]= array('urlsig_url1', array('mois'=>'10',  'annee'=>'2005', 'id'=>'01'));
+      $urlList[]= array('urlsig:url1', array('mois'=>'10',  'annee'=>'2005', 'id'=>'01'));
-      $urlList[]= array('urlsig_url9', array('mois'=>'10',  'annee'=>'2005', 'id'=>'09'));
+      $urlList[]= array('urlsig:url9', array('mois'=>'10',  'annee'=>'2005', 'id'=>'09'));
-      $urlList[]= array('urlsig_url10', array('mois'=>'10',  'annee'=>'2005', 'id'=>'10'));
-      $urlList[]= array('urlsig_url2', array('mois'=>'05',  'annee'=>'2004'));
@@ -253 +255 @@
-      $trueResult=array(
-          "/index.php/test/news/2005/10/01",
-
-
+
+
+
+
-          "/testnews.php/2004/05",
-          "/index.php/test/cms/actualite/65-c-est-la-fete-au-village",
-          "/test/cms2/actualite/65",
-          "/foo/bar.php/withhandler/premier/deuxieme",
-_
+:
-          "/xmlrpc.php",
-_
-_
+:
+:
-          "/index.php/shop/vetements/98",
-          "/index.php/shop/bricolage/53/",
@@ -275 +279 @@
-       );
-
-1]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11
+3]='https://'.$_SERVER['HTTP_HOST'].$trueResult[13
-      $this->_doCompareUrl("significant, multiview = false", $urlList,$trueResult);
-
@@ -282 +286 @@
-      $trueResult=array(
-          "/index/test/news/2005/10/01",
-
-