Changeset 2665:2976f191aadb for inc

Timestamp:

02/19/14 15:19:21 (11 years ago)

Author:

Xavier Mouton-Dubosc <xavier@…>

Branch:

default

Message:

Mise en place de l'attribut générique "encode_url" dans le parser de template
Ajout du filtre encode_url="1" dans le mécanisme de template

Location:

inc/public

Files:

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

inc/public/class.dc.template.php

@@ -276 +276 @@
           $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']));
@@ -287 +288 @@
           $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)."')";

inc/public/lib.tpl.context.php

@@ -100 +100 @@
 
 
-     # Static methods
-     public static function global_filter($str,
-     $encode_xml, $remove_html, $cut_string, $lower_case, $upper_case ,$tag='')
-     {
-          $args = func_get_args();
-          array_pop($args);
-          $args[0] =& $str;
-
-          # --BEHAVIOR-- publicBeforeContentFilter
-          $res = $GLOBALS['core']->callBehavior('publicBeforeContentFilter',$GLOBALS['core'],$tag,$args);
-
-          if ($remove_html) {
-               $str = self::remove_html($str);
-               $str = preg_replace('/\s+/',' ',$str);
-          }
-
-          if ($encode_xml) {
-               $str = self::encode_xml($str);
-          }
-
-          if ($cut_string) {
-               $str = self::cut_string($str,(integer) $cut_string);
-          }
-
-          if ($lower_case) {
-               $str = self::lower_case($str);
-          } elseif ($upper_case) {
-               if ($upper_case == 2) {
-                    $str = self::capitalize($str);
-               } else {
-                    $str = self::upper_case($str);
-               }
-          }
-
-          # --BEHAVIOR-- publicAfterContentFilter
-          $res = $GLOBALS['core']->callBehavior('publicAfterContentFilter',$GLOBALS['core'],$tag,$args);
-
-          return $str;
-     }
-
+        # Static methods
+        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);
+                $args[0] =& $str;
+
+                # --BEHAVIOR-- publicBeforeContentFilter
+                $res = $GLOBALS['core']->callBehavior('publicBeforeContentFilter',$GLOBALS['core'],$tag,$args);
+
+                if ($remove_html) {
+                        $str = self::remove_html($str);
+                        $str = preg_replace('/\s+/',' ',$str);
+                }
+
+                if ($encode_xml) {
+                        $str = self::encode_xml($str);
+                }
+
+                if ($cut_string) {
+                        $str = self::cut_string($str,(integer) $cut_string);
+                }
+
+                if ($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) {
+                        $str = self::encode_url($str);
+                }
+
+                # --BEHAVIOR-- publicAfterContentFilter
+                $res = $GLOBALS['core']->callBehavior('publicAfterContentFilter',$GLOBALS['core'],$tag,$args);
+
+                return $str;
+        }
+
+        public static function encode_url($str)
+        {
+                return urlencode($str);
+        }
 
      public static function cut_string($str,$l)