Changeset 998

Timestamp:

06/21/08 17:08:23 (2 months ago)

Author:

laurentj

Message:

ticket #138: added registerModifier and registerFunction into jTpl

Files:

• trunk/lib/jelix/core/jSelector.class.php (modified) (1 diff)
• trunk/lib/jelix/tpl/jTpl.class.php (modified) (4 diffs)
• trunk/lib/jelix/tpl/jTplCompiler.class.php (modified) (5 diffs)
• trunk/testapp/modules/jelix_tests/tests/jtpl.compiler.html_cli.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/jtpl.expressions_parsing.html_cli.php (modified) (4 diffs)

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

@@ -644 +644 @@
-    public $outputType='';
-    public $trusted=true;
+    public $userModifiers = array();
+    public $userFunctions = array();
+
-
-    /**

trunk/lib/jelix/tpl/jTpl.class.php

@@ -5 +5 @@
-* @author      Laurent Jouanneau
-* @contributor Dominique Papin
-6
+8
-* @link        http://www.jelix.org
-* @licence     GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
@@ -207 +207 @@
-#ifnot JTPL_STANDALONE
-        $sel = new jSelectorTpl($tpl,$outputtype,$trusted);
+        $sel->userModifiers = $this->userModifiers;
+        $sel->userFunctions = $this->userFunctions;
-        jIncluder::inc($sel);
-        $fct = $fctname.md5($sel->module.'_'.$sel->resource.'_'.$sel->outputType.($trusted?'_t':''));
@@ -225 +227 @@
-
-            $compiler = new jTplCompiler();
+            $compiler->setUserPlugins( $this->userModifiers, $this->userFunctions);
-            $compiler->compile($tpl,$outputtype, $trusted);
-        }
@@ -297 +300 @@
-
-
+    protected $userModifiers = array();
+
+    /**
+     * register a user modifier. The function should accept at least a
+     * string as first parameter, and should return this string
+     * which can be modified.
+     * @param string $name  the name of the modifier in a template
+     * @param string $functionName the corresponding PHP function
+     * @since jelix 1.1
+     */
+    public function registerModifier($name, $functionName) {
+        $this->userModifiers[$name] = $functionName;
+    }
+
+    protected $userFunctions = array();
+
+    /**
+     * register a user function. The function should accept a jTpl object
+     * as first parameter.
+     * @param string $name  the name of the modifier in a template
+     * @param string $functionName the corresponding PHP function
+     * @since jelix 1.1
+     */
+    public function registerFunction($name, $functionName) {
+        $this->userFunctions[$name] = $functionName;
+    }
+
-    /**
-     * return the current encoding

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

@@ -57 +57 @@
-    private $_metaBody = '';
-
-ivate
+otected
-        'escxml'=>'htmlspecialchars', 'eschtml'=>'htmlspecialchars', 'strip_tags'=>'strip_tags', 'escurl'=>'rawurlencode',
-        'capitalize'=>'ucwords', 'stripslashes'=>'stripslashes'
@@ -68 +68 @@
-    public $outputType='';
-    public $trusted=true;
+
+    protected $_userFunctions = array();
-
-    /**
@@ -93 +95 @@
-     * @return boolean true if ok
-     */
-
+, $userModifiers = array(), $userFunctions = array()
-        $this->_sourceFile = $tplFile;
-        $this->outputType = ($outputtype==''?'html':$outputtype);
-        $cachefile = JTPL_CACHE_PATH .$this->outputType.($trusted?'_t':'').'_'. basename($tplFile);
-        $this->trusted = $trusted;
+        $this->_modifier = array_merge($this->_modifier, $userModifiers);
+        $this->_userFunctions = $userFunctions;
+
-#else
-    /**
@@ -111 +116 @@
-        $this->outputType = $selector->outputType;
-        $this->trusted = $selector->trusted;
+        $this->_modifier = array_merge($this->_modifier, $selector->userModifiers);
+        $this->_userFunctions = $selector->userFunctions;
+
-        jContext::push($selector->module);
-#endif
@@ -393 +401 @@
-                    $res = $path[1].'( $t'.(trim($argfct)!=''?','.$argfct:'').');';
-                    $this->_pluginPath[$path[0]] = true;
+
+                } else if ( isset($this->_userFunctions[$name])) {
+                    $argfct=$this->_parseFinal($args,$this->_allowedAssign);
+                    $res = $this->_userFunctions[$name].'( $t'.(trim($argfct)!=''?','.$argfct:'').');';
-
-                } else {

trunk/testapp/modules/jelix_tests/tests/jtpl.compiler.html_cli.php

@@ -14 +14 @@
-class testJtplContentCompiler extends jTplCompiler {
-
-
+
+
+
+
+
+
-        return $this->compileContent($content);
-
-
-
-
+
+
+
+
+
+
-
-
@@ -119 +126 @@
-        '<p>ok<?php if(($t->_vars[\'foo\'] || $t->_vars[\'bar\']) && $t->_vars[\'baz\']):?> <?php endif;?></p>',
-        ),
+19=>array(
+        '<p>ok{bla $foo, $params}</p>',
+        '<p>ok<?php testjtplcontentUserFunction( $t,$t->_vars[\'foo\'], $t->_vars[\'params\']);?></p>',
+        ),
-    );
-
@@ -125 +136 @@
-        $compil->outputType = 'html';
-        $compil->trusted = true;
-
+
-        foreach($this->content as $k=>$t){
-            try{

trunk/testapp/modules/jelix_tests/tests/jtpl.expressions_parsing.html_cli.php

@@ -14 +14 @@
-class testJtplCompiler extends jTplCompiler {
-
+    public function setUserPlugins($userModifiers, $userFunctions) {
+        $this->_modifier = array_merge($this->_modifier, $userModifiers);
+        $this->_userFunctions = $userFunctions;
+    }
+
+
-   public function testParseExpr($string, $allowed=array(), $exceptchar=array(';'), $splitArgIntoArray=false){
-        return $this->_parseFinal($string, $allowed, $exceptchar, $splitArgIntoArray);
@@ -44 +50 @@
-}
-
-
+
-
-
@@ -262 +268 @@
-        '$aaa|jdatetime:\'db_date\',\'lang_date\'' => 'jtpl_modifier_common_jdatetime($t->_vars[\'aaa\'],\'db_date\',\'lang_date\')',
-        '$aaa|jdatetime:\'db_:date\',\'lang_date\'' => 'jtpl_modifier_common_jdatetime($t->_vars[\'aaa\'],\'db_:date\',\'lang_date\')',
+        '$aaa|bla'=>'testjtplcontentUserModifier($t->_vars[\'aaa\'])',
-    );
-
@@ -268 +275 @@
-        $compil = new testJtplCompiler();
-        $compil->trusted = true;
+        $compil->setUserPlugins(array('bla'=>'testjtplcontentUserModifier'),array());
+
-        foreach($this->varTag as $k=>$t){
-            try{