Ticket #545: init.diff

init.php

@@ -167 +167 @@
-        protected $_cachePath;
-        protected $_compiler = null;
-        protected $_compilerPath;
+        protected $_dyn = false;
-        protected $_useMultiSourceCompiler=false;
-        function __construct($sel){
-                if(preg_match("/^(([a-zA-Z0-9_\.]+)~)?([a-zA-Z0-9_\.]+)$/", $sel, $m)){
@@ -545 +546 @@
-           $this->_cachePath = JELIX_APP_TEMP_PATH.'compiled/templates/'.$this->_where.'_'.$this->outputType.($this->trusted?'_t':'').$this->_cacheSuffix;
-        }
-}
+class jSelectorVTpl extends jSelectorModule {
+    protected $type = 'tpl';
+    protected $_dirname = 'classes/';
+    protected $_suffix = '.tpl';
+    protected $_where;
+    public $outputType='';
+    public $trusted=true;
+    public $_dyn = true;
+        function __construct($sel, $outputtype='', $trusted=true) {
+        if($outputtype == ''){
+            if($GLOBALS['gJCoord']->response)
+                $this->outputType = $GLOBALS['gJCoord']->response->getFormatType();
+            else
+                $this->outputType = $GLOBALS['gJCoord']->request->defaultResponseType;
+        } else
+            $this->outputType = $outputtype;
+        $this->trusted = $trusted;
+        $this->_compiler='jVTplCompiler';
+        $this->_compilerPath=JELIX_LIB_PATH.'tpl/jTplCompiler.class.php';
+        parent::__construct($sel);
+    }
+    protected function _createPath(){
+        global $gJConfig;
+        if(!isset($gJConfig->_modulesPathList[$this->module])){
+            throw new jExceptionSelector('jelix~errors.selector.module.unknow', $this->toString());
+        }
+                $path = $this->module.'/'.$this->resource;
+                // pas d'overload via themes/
+                // pas de local
+        $this->_path = $gJConfig->_modulesPathList[$this->module].$this->_dirname.'dynTpl.class.php';
+        if(is_readable($this->_path)){
+            $this->_where = 'modules/'.$path;
+            return;
+        }
+                throw new jExceptionSelector('jelix~errors.selector.invalid.target', array($this->toString(), "dyn template"));
+    }
+    protected function _createCachePath(){
+       $this->_cachePath = JELIX_APP_TEMP_PATH.'compiled/templates/'.$this->_where.'_'.$this->outputType.($this->trusted?'_t':'').$this->_cacheSuffix;
+    }
+}
-class jSelectorZone extends jSelectorModule{
-        protected $type = 'zone';
-        protected $_dirname = 'zones/';
@@ -1374 +1415 @@
-                }
-                $mustCompile = $gJConfig->compilation['force'] || !file_exists($cachefile);
-                $sourcefile = $aSelector->getPath();
-$sourcefile == '' || !file_exists($sourcefile)
+ ( $sourcefile == '' || !file_exists($sourcefile) ) && !$aSelector->_dyn 
-                        throw new jException('jelix~errors.includer.source.missing',array( $aSelector->toString(true)));
-                }
-                if($gJConfig->compilation['checkCacheFiletime'] && !$mustCompile){
@@ -1385 +1426 @@
-                $compileok=true;
-                if($mustCompile){
-                        $compiler = $aSelector->getCompiler();
-
+ 
-                                require_once($cachefile);
-                                jIncluder::$_includedFiles[$cachefile]=true;
-                        }