Changeset 44

Timestamp:

01/17/06 00:16:46 (3 years ago)

Author:

laurentj

Message:

corrections de bugs divers et ajout de plugin de template pour jUrl

Files:

• trunk/lib/jelix-scripts/templates/config.classic.ini.php.tpl (modified) (1 diff)
• trunk/lib/jelix/core/jCoordinator.class.php (modified) (4 diffs)
• trunk/lib/jelix/core/jSelector.class.php (modified) (1 diff)
• trunk/lib/jelix/core/response/jResponseHtml.class.php (modified) (1 diff)
• trunk/lib/jelix/core/url/jUrl.class.php (modified) (10 diffs)
• trunk/lib/jelix/db/drivers/mysql/jDbConnection.mysql.class.php (modified) (1 diff)
• trunk/lib/jelix/tpl_plugins/html/function.jurl.php (added)
• trunk/lib/jelix/tpl_plugins/text (added)
• trunk/lib/jelix/tpl_plugins/text/function.jurl.php (added)
• trunk/lib/jelix/tpl_plugins/xul (added)
• trunk/lib/jelix/tpl_plugins/xul/function.jurl.php (added)
• trunk/lib/jelix/utils/jTplCompiler.class.php (modified) (2 diffs)
• trunk/lib/jelix/utils/jZone.class.php (modified) (1 diff)
• trunk/myapp/var/config/dbprofils.ini.php.dist (modified) (1 diff)
• trunk/testapp/modules/testapp/templates/testzone.tpl (modified) (1 diff)
• trunk/testapp/responses/myHtmlResponse.class.php (modified) (1 diff)
• trunk/testapp/var/config/dbprofils.ini.php.dist (modified) (1 diff)

trunk/lib/jelix-scripts/templates/config.classic.ini.php.tpl

@@ -69 +69 @@
-
-[urlengine_specific_entrypoints]
-
-
+
+
+
+
+
-
+index = "@classic"
+xmlrpc = "@xmlrpc"
+jsonrpc = "@jsonrpc"

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

@@ -42 +42 @@
-     * @var string
-     */
-rivate
+ublic
-    /**
-     * @var string
-     */
-rivate
+ublic
-
-    /**
@@ -100 +100 @@
-    public function process ($request){
-        global $gJConfig;
+
-        $this->request = $request;
-                  session_start();
@@ -169 +170 @@
-
-        if(!isset($gJConfig->responses[$type])){
-
+his->moduleName.'~'.$this->actionName,$t
-            return null;
-        }
@@ -179 +180 @@
-           require_once ($path);
-        }else{
-ponse.not.loaded',array(
+sponse.not.loaded',array($this->moduleName.'~'.$this->actionName,
-           return null;
-        }

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

@@ -144 +144 @@
-        $this->_compilerPath=JELIX_LIB_CORE_PATH.'jActionsCompiler.class.php';
-        $this->request = $gJCoord->request->type;
-
-
-
+
+
-            $this->_valid = true;
- && $m[2]!=''
-2
+
+1
-                $this->module = $gJCoord->moduleName;
-              else
-2
+1
-            }else{
-                $this->module = jContext::get ();
-                //$this->module = $GLOBALS['gJConfig']->defaultModule;
-            }
-3
+2
-               $this->resource = $gJCoord->actionName;
-            else
-3
-
-4]) && $m[4] != '') // test �irer apr�activation de la nouvelle regexp
-4
+2
+
+3]) && $m[3] != '')
+3
-            else
-              $this->request = $gJCoord->request->type;
-
+
-            $this->_createPath();
-        }else{

trunk/lib/jelix/core/response/jResponseHtml.class.php

@@ -127 +127 @@
-            echo '<div id="jelixerror" style="position:absolute;left:0px;top:0px;border:3px solid red; background-color:#f39999;color:black;">';
-            echo implode("\n",$this->_errorMessages);
-
+p><a href="#" onclick="document.getElementById(\'jelixerror\').style.display=\'none\';return false;">fermer</a><
-        }
-        echo implode("\n",$this->_bodyBottom);

trunk/lib/jelix/core/url/jUrl.class.php

@@ -67 +67 @@
-    public $pathInfo = '';
-
-
+
-    public $requestType ='';
-    /**
@@ -123 +123 @@
-    * @return    string    l'url form�    */
-    public function toString ($forxml = false, $isUrlForApp=true){
-
+
-        $urlobj=$this;
-        if($isUrlForApp){
@@ -133 +133 @@
-               $urlobj->requestType = $gJCoord->request->type;
-            }
-
+
+
-            $engine = & self::getEngine();
-            $engine->create($urlobj); // set path info
@@ -198 +199 @@
-    */
-    static function get ($actSel = null, $params = array (), $forxml = false) {
+
-        if ($actSel === null){
-            return '/'.$GLOBALS['gJCoord']->request->url_script_path;
@@ -206 +208 @@
-            $sel = new JSelectorAct($actSel);
-            $params['module'] = $sel->module;
-            
+
-            $url = new jUrl('',$params);
-            $url->requestType= $sel->request;
@@ -261 +263 @@
-        }
-        $sel = new JSelectorAct($actionSelector);
-        
+
-           return array('module'=>$sel->module, 'action'=>$sel->ressource, 'request'=>$sel->request);
-        }else{
@@ -268 +270 @@
-    }
-
-
+
+
-        global $gJConfig;
-
-->default_entrypoint
+
+['default_entrypoint']
-
-        if(count($gJConfig->urlengine_specific_entrypoints)){
@@ -279 +282 @@
-                 $selectors = preg_split("/[\s,]+/", $sel);
-                 foreach($selectors as $sel){
-                 
+
-                 }
-               }
@@ -285 +288 @@
-
-           $found = false;
-
+
-           if($action && $action !='' && isset($sep[$module.'~'.$action.'@'.$requestType])){
-                $script = $sep[$module.'~'.$action.'@'.$requestType];
-                $found = true;
-           }
-
+
-           if($module && $module !='' && !$found &&  isset($sep[$module.'~*@'.$requestType])){
-                $script = $sep[$module.'~*@'.$requestType];
-                $found = true;
-           }
-
+
-           if(!$found && isset($sep['@'.$requestType])){
-               $script = $sep['@'.$requestType];
@@ -302 +305 @@
-        }
-
-->multiview_on
-->entrypoint_extension
+['multiview_on']
+['entrypoint_extension']
-        }
-        return $script;

trunk/lib/jelix/db/drivers/mysql/jDbConnection.mysql.class.php

@@ -77 +77 @@
-
-       // ici et non lors du connect, pour le cas o�y a plusieurs connexion active
-
+{
-         throw new JException('jelix~db.error.database.unknow',$this->profil['database']);
+      }
-
-      if ($qI = mysql_query ($query, $this->_connection)){

trunk/lib/jelix/utils/jTplCompiler.class.php

@@ -310 +310 @@
-
-    private function _getPlugin($type, $name){
-
+, $gJConfig
-       $treq = $gJCoord->response->getType();
-
-       $foundPath='';
-
-
+
+
+
-           $foundPath=$path.$type.'.'.$name.'.php';
+
-           if(file_exists($foundPath)){
-              return $foundPath;
@@ -322 +324 @@
-         }
-       }
-ord->tplplugin
-ord->tplplugin
+nfig->tplplugins
+nfig->tplplugins
-            $foundPath=$path.$type.'.'.$name.'.php';
-           if(file_exists($foundPath)){

trunk/lib/jelix/utils/jZone.class.php

@@ -85 +85 @@
-    * @param array   $params un tableau a passer a la fonction processZone de l'objet zone.
-    */
-
+protected static 
-
-        $sel = new jSelectorZone($name);

trunk/myapp/var/config/dbprofils.ini.php.dist

@@ -15 +15 @@
-password=
-persistent= on
-shared= on
-schema=
-
-
+

trunk/testapp/modules/testapp/templates/testzone.tpl

@@ -9 +9 @@
-
-<p>one conf key={$oneconf->ckey} value={$oneconf->cvalue}</p>
+<p>Link to actions:</p>
+<ul>
+<li> "testapp~default@classic" : {jurl "testapp~default@classic"}</li>
+<li> "default@classic": {jurl "default@classic"}</li>
+<li> "default" : {jurl "default"}</li>
+<li> "testapp~default" : {jurl "testapp~default"}</li>
+<li> "testapp~#" : {jurl "testapp~#"}</li>
+<li> "#~#" : {jurl "#~#"}</li>
+<li> "@" : {jurl "@"}</li>
+</ul>

trunk/testapp/responses/myHtmlResponse.class.php

@@ -17 +17 @@
-
-
-my
-my
+test
+test
-
-

trunk/testapp/var/config/dbprofils.ini.php.dist

@@ -15 +15 @@
-password=
-persistent= on
-shared= on
-schema=
-
-