Changeset 3426:3dde74bd36ee for inc/public

Timestamp:

11/30/16 09:40:32 (9 years ago)

Author:

Jean-Christian Denis

Branch:

Template tags filters

Message:

Open template tags to third party filters, addresses #2051

Location:

inc/public

Files:

• class.dc.template.php (modified) (1 diff)
• lib.tpl.context.php (modified) (3 diffs)

inc/public/class.dc.template.php

@@ -273 +273 @@
      }
 
-     public function getFilters($attr)
-     {
-          $p[0] = '0';   # encode_xml
-          $p[1] = '0';   # remove_html
-          $p[2] = '0';   # cut_string
-          $p[3] = '0';   # lower_case
-          $p[4] = '0';   # upper_case or capitalize
-          $p[5] = '0';    # encode_url
-
-          $p[0] = (integer) (!empty($attr['encode_xml']) || !empty($attr['encode_html']));
-          $p[1] = (integer) !empty($attr['remove_html']);
-
-          if (!empty($attr['cut_string']) && (integer) $attr['cut_string'] > 0) {
-               $p[2] = (integer) $attr['cut_string'];
-          }
-
-          $p[3] = (integer) !empty($attr['lower_case']);
-          $p[4] = (integer) !empty($attr['upper_case']);
-          $p[4] = (!empty($attr['capitalize']) ? 2 : $p[4]);
-          $p[5] = (integer) !empty($attr['encode_url']);
-
-          return "context::global_filter(%s,".implode(",",$p).",'".addslashes($this->current_tag)."')";
+     public function getFilters($attr,$default=array())
+     {
+          if (!is_array($attr) && !($attr instanceof arrayObject)) {
+               $attr = array();
+          }
+
+          $p = array_merge(
+               array(
+                    0 => null,
+                    'encode_xml' => 0,
+                    'encode_html' => 0,
+                    'cut_string' => 0,
+                    'lower_case' => 0,
+                    'upper_case' => 0,
+                    'encode_url' => 0,
+                    'remove_html' => 0,
+                    'capitalize' => 0,
+                    'strip_tags' => 0
+               ),
+               $default
+          );
+
+          foreach($attr as $k => $v) {
+               // attributes names must follow this rule
+               $k = preg_filter('/[a-zA-Z0-9_]/','$0',$k);
+               if ($k) {
+                    // addslashes protect var_export, str_replace protect sprintf;
+                    $p[$k] = str_replace('%','%%',addslashes($v));
+               }
+          }
+
+          return "context::global_filters(%s,".var_export($p,true).",'".addslashes($this->current_tag)."')";
      }
 

inc/public/lib.tpl.context.php

@@ -103 +103 @@
      }
 
-    # Static methods
+     /**
+     @deprecated since version 2.11 , use tpl_context::global_filters instead
+     */
      public static function global_filter($str,
           $encode_xml, $remove_html, $cut_string, $lower_case, $upper_case ,$encode_url ,$tag='')
      {
-          $args = func_get_args();
-          array_pop($args);
+          return $str;
+     }
+
+     public static function global_filters($str,$args,$tag='')
+     {
           $args[0] =& $str;
 
@@ -114 +119 @@
           $res = $GLOBALS['core']->callBehavior('publicBeforeContentFilter',$GLOBALS['core'],$tag,$args);
 
-          if ($remove_html) {
+          if ($args['strip_tags']) {
+               $str = self::strip_tags($str);
+          }
+          elseif ($args['remove_html']) {
                $str = self::remove_html($str);
                $str = preg_replace('/\s+/',' ',$str);
           }
-
-          if ($encode_xml) {
+          elseif ($args['encode_xml'] || $args['encode_html']) {
                $str = self::encode_xml($str);
           }
 
-          if ($cut_string) {
-               $str = self::cut_string($str,(integer) $cut_string);
-          }
-
-          if ($lower_case) {
+          if ($args['cut_string'] > 0) {
+               $str = self::cut_string($str,(integer) $args['cut_string']);
+          }
+
+          if ($args['lower_case']) {
                $str = self::lower_case($str);
-          } elseif ($upper_case) {
-               if ($upper_case == 2) {
-                    $str = self::capitalize($str);
-               } else {
-                    $str = self::upper_case($str);
-               }
-          }
-          if ($encode_url) {
+          } elseif ($args['capitalize']) {
+               $str = self::capitalize($str);
+          } elseif ($args['upper_case']) {
+               $str = self::upper_case($str);
+          }
+
+          if ($args['encode_url']) {
                $str = self::encode_url($str);
           }
@@ -164 +170 @@
      {
           return html::decodeEntities(html::clean($str));
+     }
+
+     public static function strip_tags($str)
+     {
+          return trim(preg_replace('/ {2,}/',' ',str_replace(array("\r","\n","\t"),' ',html::clean($str))));
      }