Changeset 2239

Timestamp:

03/08/2008 03:57:44 AM (10 months ago)

Author:

Geert

Message:

Cleaning up security helper

Files:

• trunk/system/helpers/security.php (modified) (3 diffs)

trunk/system/helpers/security.php

@@ -20 +20 @@
         public static function xss_clean($str)
         {
-                static $input;
-
-                if ($input === NULL)
-                {
-                        $input = new Input();
-                }
-
-                return $input->xss_clean($str);
+                return Input::instance()->xss_clean($str);
         }
 
@@ -38 +31 @@
         public static function strip_image_tags($str)
         {
-                $str = preg_replace('#<img\b.*?(?:src\s*=\s*["\']?([^"\'<>\s]*)["\']?[^>]*)?>#is', '$1', $str);
-
-                return trim($str);
+                return preg_replace('#<img\s.*?(?:src\s*=\s*["\']?([^"\'<>\s]*)["\']?[^>]*)?>#is', '$1', $str);
         }
 
@@ -51 +42 @@
         public static function encode_php_tags($str)
         {
-                return str_replace(array('<?', '?>'),  array('&lt;?', '?&gt;'), $str);
+                return str_replace(array('<?', '?>'), array('&lt;?', '?&gt;'), $str);
         }