move modifiers to environment

diff --git a/ipf/shortcuts.php b/ipf/shortcuts.php
index f6dd0982950dcba1016538f4cc17def1fd60a636..738ba4ec4a7fd574de7b20141d2e3b496d681732 100644 (file)
--- a/ipf/shortcuts.php
+++ b/ipf/shortcuts.php
@@ -52,8 +52,12 @@ final class IPF_Shortcuts
 
             self::$defaultEnvironment = new IPF_Template_Environment_FileSystem($dirs, IPF::get('tmp'));
 
-            self::$defaultEnvironment->allowedTags['url'] = 'IPF_Template_Tag_Url';
-            self::$defaultEnvironment->allowedTags = array_merge(IPF::get('template_tags', array()), self::$defaultEnvironment->allowedTags);
+            self::$defaultEnvironment->tags['url'] = 'IPF_Template_Tag_Url';
+            // extra tags
+            self::$defaultEnvironment->tags = array_merge(IPF::get('template_tags', array()), self::$defaultEnvironment->tags);
+
+            // extra modifiers
+            self::$defaultEnvironment->modifiers = array_merge(IPF::get('template_modifiers', array()), self::$defaultEnvironment->modifiers);
         }
         return self::$defaultEnvironment;
     }

diff --git a/ipf/template/compiler.php b/ipf/template/compiler.php
index 195408e1438ebe663fd1e0188a1ff86f83e6d384..f28cca5c50f0b3e3ff94304eec3f8363d1f34445 100644 (file)
--- a/ipf/template/compiler.php
+++ b/ipf/template/compiler.php
@@ -28,28 +28,6 @@ class IPF_Template_Compiler
         self::$allowedForeach = array_merge(self::$allowedInExpr, array(T_AS));
     }
 
-    protected $_modifier = array(
-        'upper'       => 'strtoupper',
-        'lower'       => 'strtolower',
-        'escxml'      => 'htmlspecialchars',
-        'escape'      => 'IPF_Template_Modifier::escape',
-        'strip_tags'  => 'strip_tags',
-        'escurl'      => 'rawurlencode',
-        'capitalize'  => 'ucwords',
-        'debug'       => 'print_r', // Not var_export because of recursive issues.
-        'fulldebug'   => 'var_export',
-        'count'       => 'count',
-        'nl2br'       => 'nl2br',
-        'trim'        => 'trim',
-        'unsafe'      => 'IPF_Template_SafeString::markSafe',
-        'safe'        => 'IPF_Template_SafeString::markSafe',
-        'date'        => 'IPF_Template_Modifier::dateFormat',
-        'time'        => 'IPF_Template_Modifier::timeFormat',
-        'floatformat' => 'IPF_Template_Modifier::floatFormat',
-        'limit_words' => 'IPF_Template_Modifier::limitWords',
-        'limit_chars' => 'IPF_Template_Modifier::limitCharacters',
-    );
-
     protected $_literals;
 
     protected $_blockStack = array();
@@ -65,9 +43,6 @@ class IPF_Template_Compiler
 
     function __construct($templateContent, $environment)
     {
-        $modifiers = IPF::get('template_modifiers', array());
-        $this->_modifier = array_merge($modifiers, $this->_modifier);
-
         $this->templateContent = $templateContent;
         $this->environment = $environment;
     }
@@ -212,17 +187,17 @@ class IPF_Template_Compiler
                 return '';
             }
 
-            if (isset($this->_modifier[$m[1]])) {
+            if ($this->environment->hasModifier($m[1])) {
                 trigger_error(sprintf(__('Unknown modifier: (%s) %s'), $expr, $m[1]), E_USER_ERROR);
                 return '';
             }
 
-            $modifier = $this->_modifier[$m[1]];
+            $mod = $this->environment->getModifier($m[1]);
 
             if (isset($m[2])) {
-                $res = $modifier.'('.$res.','.$m[2].')';
+                $res = $mod.'('.$res.','.$m[2].')';
             } else {
-                $res = $modifier.'('.$res.')';
+                $res = $mod.'('.$res.')';
             }
         }
         return $res;
@@ -395,7 +370,7 @@ class IPF_Template_Compiler
             // but we need the array of args.
             $argfct = $this->_parseFinal($args, self::$allowedAssign);
 
-            $res = '$_extra_tag = new '.$this->environment->allowedTags[$name].'($t);';
+            $res = '$_extra_tag = new '.$this->environment->getTag($name).'($t);';
             if ($_start) {
                 $res .= '$_extra_tag->start('.$argfct.'); ';
             } else {

diff --git a/ipf/template/environment.php b/ipf/template/environment.php
index 90b7b0a9e040c6824ce6a4968c5365a627919814..8141715579ea4c3045c30c5f8768db57f74cb8d6 100644 (file)
--- a/ipf/template/environment.php
+++ b/ipf/template/environment.php
@@ -6,11 +6,56 @@ abstract class IPF_Template_Environment
 
     abstract public function getCompiledTemplateName($template);
 
-    public $allowedTags = array();
+    // Dictionary of allowed tags (tag name => class)
+    public $tags = array();
 
     public function isTagAllowed($name)
     {
-        return isset($this->allowedTags[$name]);
+        return isset($this->tags[$name]);
+    }
+
+    public function getTag($name)
+    {
+        if (isset($this->tags[$name]))
+            return $this->tags[$name];
+        else
+            throw new IPF_Exception_Template('Tag '.$name.' is not defined.');
+    }
+
+    // Dictionary of modifiers (modifier name => function)
+    public $modifiers = array(
+        'upper'       => 'strtoupper',
+        'lower'       => 'strtolower',
+        'escxml'      => 'htmlspecialchars',
+        'escape'      => 'IPF_Template_Modifier::escape',
+        'strip_tags'  => 'strip_tags',
+        'escurl'      => 'rawurlencode',
+        'capitalize'  => 'ucwords',
+        'debug'       => 'print_r', // Not var_export because of recursive issues.
+        'fulldebug'   => 'var_export',
+        'count'       => 'count',
+        'nl2br'       => 'nl2br',
+        'trim'        => 'trim',
+        'unsafe'      => 'IPF_Template_SafeString::markSafe',
+        'safe'        => 'IPF_Template_SafeString::markSafe',
+        'date'        => 'IPF_Template_Modifier::dateFormat',
+        'time'        => 'IPF_Template_Modifier::timeFormat',
+        'floatformat' => 'IPF_Template_Modifier::floatFormat',
+        'limit_words' => 'IPF_Template_Modifier::limitWords',
+        'limit_chars' => 'IPF_Template_Modifier::limitCharacters',
+    );
+
+    public function hasModifier($name)
+    {
+        return isset($this->modifiers[$name]);
+    }
+
+    public function getModifier($name)
+    {
+        if (isset($this->modifiers[$name]))
+            return $this->modifiers[$name];
+        else
+            throw new IPF_Exception_Template('Modifier '.$name.' is not defined.');
     }
 }