Changeset 2309 for trunk/system/libraries/Input.php

Timestamp:

03/16/2008 03:34:43 AM (10 months ago)

Author:

Geert

Message:

Cleanup Input.

Files:

• trunk/system/libraries/Input.php (modified) (6 diffs)

trunk/system/libraries/Input.php

@@ -35 +35 @@
 
         /**
-         * Sets whether to globally enable the XSS processing.
+         * Sanitizes global GET, POST and COOKIE data. Also takes care of
+         * register_globals, if it has been enabled.
+         *
+         * @return  void
          */
         public function __construct()
@@ -219 +222 @@
                 $chars = (PCRE_UNICODE_PROPERTIES) ? '\pL' : 'a-zA-Z';
 
-                if ( ! preg_match('#^['.$chars.'0-9:_/-]+$#uD', $str))
+                if ( ! preg_match('#^['.$chars.'0-9:_/-]++$#uD', $str))
                 {
                         exit('Disallowed key characters in global data.');
@@ -255 +258 @@
 
                 if ($this->ip_address === FALSE)
-                {
-                        $this->ip_address = '0.0.0.0';
-                        return $this->ip_address;
-                }
+                        return $this->ip_address = '0.0.0.0';
 
                 if (strstr($this->ip_address, ','))
@@ -266 +266 @@
                 }
 
-                if ( ! $this->valid_ip($this->ip_address))
+                if ( ! valid::ip($this->ip_address))
                 {
                         $this->ip_address = '0.0.0.0';
@@ -321 +321 @@
 
                 // Do not clean empty strings
-                if (trim($string) == '')
+                if (trim($string) === '')
                         return $string;
 
@@ -406 +406 @@
                                         $oldstring = $string;
                                         $string = preg_replace('#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*>#i', '', $string);
-                                } while ($oldstring != $string);
+                                }
+                                while ($oldstring !== $string);
                         break;
                 }