Ticket #545: template_virtuel.diff

lib/jelix/core/jIncluder.class.php

@@ -98 +98 @@
-        $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)));
-        }
-

lib/jelix/core/jSelector.class.php

@@ -104 +104 @@
-    protected $_cachePath;
-    protected $_compiler = null;
-    protected $_compilerPath;
+    protected $_dyn = false;
-    protected $_useMultiSourceCompiler=false;
-
-    function __construct($sel){
@@ -709 +710 @@
-    }
-}
-
+
+
+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;
+    }
+}
+
+
+
-/**
- * Zone selector
- *

lib/jelix/tpl/jTpl.class.php

@@ -242 +242 @@
-     * @param boolean $callMeta false if meta should not be called
-     * @return string the generated content
-     */
-
+, $dyn=false
-        $content = '';
-        ob_start ();
-        try{
-#ifnot JTPL_STANDALONE
-
+
+
+
-            jIncluder::inc($sel);
-            $md = md5($sel->module.'_'.$sel->resource.'_'.$sel->outputType.($trusted?'_t':''));
-#else
@@ -283 +285 @@
-        }
-        return $content;
-    }
+    
+     public function dynFetch($tpl, $outputtype='', $trusted = true, $callMeta=true){
+        return $this->fetch($tpl, $outputtype, $trusted, $callMeta, true);
+     }
-
-    /**
-     * deprecated function: optimized version of meta() + fetch().

lib/jelix/tpl/jTplCompiler.class.php

@@ -592 +592 @@
-
-}
-
+class jVTplCompiler extends jTplCompiler {
+    private $_pluginPath=array();
+    private $_metaBody = '';
+        
+    public function compile($selector){
+        
+        $this->dynFile = $selector->getPath();
+        $cachefile = $selector->getCompiledFilePath();
+        $this->outputType = $selector->outputType;
+        $this->trusted = $selector->trusted;
+        jContext::push($selector->module);
+                
+        require_once($this->dynFile);
+        $dyn = new dynTpl();
+        if( !is_callable(array($dyn, $selector->resource)) ) {
+              $this->doError0('errors.tpl.not.found');
+        }
+                
+        $result = $this->compileContent($dyn->{$selector->resource}());
+                
+        $header ="<?php \n";
+        foreach($this->_pluginPath as $path=>$ok){
+            $header.=' require_once(\''.$path."');\n";
+        }
+        $header.='function template_meta_'.md5($selector->module.'_'.$selector->resource.'_'.$this->outputType.($this->trusted?'_t':'')).'($t){';
+        $header .="\n".$this->_metaBody."\n}\n";
+        $header.='function template_'.md5($selector->module.'_'.$selector->resource.'_'.$this->outputType.($this->trusted?'_t':'')).'($t){'."\n?>";
+        $result = $header.$result."<?php \n}\n?>";
+        jFile::write($cachefile, $result);
+        jContext::pop();
+        return true;
+    }
+}
+
-?>