Ticket #684: 684-jUrl-current-entry-point-is-not-used.diff

lib/jelix/plugins/urls/simple/simple.urls.php

@@ -3 +3 @@
 * @package     jelix
 * @subpackage  urls_engine
 * @author      Laurent Jouanneau
-* @contributor
+* @contributor Julien Issler
 * @copyright   2005-2008 Laurent Jouanneau
+* @copyright   Julien Issler
 * @link        http://www.jelix.org
 * @licence     GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
 */
@@ -114 +115 @@
      * @param string  $action
      */
     protected function getScript($requestType, $module=null, $action=null){
-        global $gJConfig;
+        global $gJConfig, $gJCoord;
 
-        $script = $gJConfig->urlengine['defaultEntrypoint'];
-
+        $script = substr($gJCoord->request->urlScriptName,0,-strlen($gJConfig->urlengine['entrypointExtension']));
+        
         if(count($gJConfig->simple_urlengine_entrypoints)){
-           if($this->urlspe == null){
-               $this->urlspe = array();
-               foreach($gJConfig->simple_urlengine_entrypoints as $entrypoint=>$sel){
-                 $selectors = preg_split("/[\s,]+/", $sel);
-                 foreach($selectors as $sel2){
-                     $this->urlspe[$sel2]= $entrypoint;
-                 }
-               }
-           }
-
-           if($action && isset($this->urlspe[$s1 = $module.'~'.$action.'@'.$requestType])){
+            if($this->urlspe == null){
+                $this->urlspe = array();
+                foreach($gJConfig->simple_urlengine_entrypoints as $entrypoint=>$sel){
+                    $selectors = preg_split("/[\s,]+/", $sel);
+                    foreach($selectors as $sel2){
+                        $this->urlspe[$sel2]= $entrypoint;
+                    }
+                }
+            }
+            if($action && isset($this->urlspe[$s1 = $module.'~'.$action.'@'.$requestType]))
                 $script = $this->urlspe[$s1];
-           }elseif($module &&  isset($this->urlspe[$s2 = $module.'~*@'.$requestType])){
+            elseif($module &&  isset($this->urlspe[$s2 = $module.'~*@'.$requestType]))
                 $script = $this->urlspe[$s2];
-           }elseif( isset($this->urlspe[$s3 = '@'.$requestType])){
-               $script = $this->urlspe[$s3];
-           }
+            elseif($gJCoord->request->type != $requestType && isset($this->urlspe[$s3 = '@'.$requestType]))
+                $script = $this->urlspe[$s3];
         }
 
         return $script;