Changeset 1150

Timestamp:

11/06/08 21:11:06 (2 months ago)

Author:

laurentj

Message:

ticket #385: made some little improvements in jController for optimized edition
little optimisation on sessions

Files:

• trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (1 diff)
• trunk/lib/jelix/core/jCoordinator.class.php (modified) (2 diffs)
• trunk/lib/jelix/core/jRequest.class.php (modified) (1 diff)
• trunk/lib/jelix/core/jSession.class.php (modified) (3 diffs)
• trunk/lib/jelix/core/selector/jSelectorActFast.class.php (modified) (1 diff)

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

@@ -167 +167 @@
-                $config->timeZone = "Europe/Paris";
-#endif
+        }
+
+        if($config->sessions['storage'] == 'files'){
+            $config->sessions['files_path'] = str_replace(array('lib:','app:'), array(LIB_PATH, JELIX_APP_PATH), $config->sessions['files_path']);
-        }
-

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

@@ -28 +28 @@
-    * @var  array
-    */
-=
+ = 
-
-    /**
@@ -225 +225 @@
-
-        $ctrlpath = $selector->getPath();
-
+
-        if(!file_exists($ctrlpath)){
-            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath));
-        }
+#endif
-        require_once($ctrlpath);
-        $class = $selector->getClass();
+#ifnot ENABLE_OPTIMIZED_SOURCE
-        if(!class_exists($class,false)){
-            throw new jException('jelix~errors.ad.controller.class.unknow',array($this->actionName,$class, $ctrlpath));
-        }
-
+
-        $ctrl = new $class($this->request);
-        if($ctrl instanceof jIRestController){
-            $method = $selector->method = strtolower($_SERVER['REQUEST_METHOD']);
-
-
+ 
+ 
-        }
-        return $ctrl;

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

@@ -111 +111 @@
-        }
-
- 
+
-            //under IIS, we may get  /subdir/index.php/mypath/myaction as PATH_INFO, so we fix it
-            $pathinfo = substr ($pathinfo, strlen ($this->urlScript));

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

@@ -30 +30 @@
-
-        // do not start the session if the request is made from the command line or if sessions are disabled in configuration
-($GLOBALS['gJCoord']->request instanceof jCmdLineRequest || !$params['start'])
+ ($GLOBALS['gJCoord']->request instanceof jCmdLineRequest || !$params['start']) 
-            return false;
-        }
-
-        //make sure that the session cookie is only for the current application
-
+ 
-            session_set_cookie_params ( 0 , $GLOBALS['gJConfig']->urlengine['basePath']);
-
-($params['storage'] != '')
+ ($params['storage'] != '') 
-
-            /* on debian/ubuntu (maybe others), garbage collector launch probability is set to 0
@@ -47 +47 @@
-
-            switch($params['storage']){
-
-                case 'dao':
-                    session_set_save_handler(
@@ -61 +60 @@
-
-                case 'files':
-
-
-
-
-
+
-                    break;
-            }
-
-        }
-

trunk/lib/jelix/core/selector/jSelectorActFast.class.php

@@ -72 +72 @@
-
-    public function getClass(){
+#if ENABLE_OLD_CLASS_NAMING
-        $className = $this->controller.'Ctrl';
-#if ENABLE_OLD_CLASS_NAMING
-        if(!class_exists($className,false)){
-            if(class_exists('CT'.$this->controller,false))
-                $className = 'CT'.$this->controller;
-        }
+        return $className;
+#else
+        return $this->controller.'Ctrl';
-#endif
-        return $className;
-    }
-