Changeset 2794

Timestamp:

11/11/08 22:10:39 (2 months ago)

Author:

sean

Message:

cleanup (PHP 5-itize), and make process_gpc() single-run.

Files:

• branches/sginput/htdocs/system/classes/superglobal.php (modified) (5 diffs)

branches/sginput/htdocs/system/classes/superglobal.php

@@ -10 +10 @@
     protected $values = array();
 
-    function SuperGlobal($array)
+    function __construct(array $array)
     {
         $values['default'] = array();
@@ -25 +25 @@
         /* We should only revert the magic quotes once per page hit */
         static $revert = true;
-        if ( get_magic_quotes_gpc() && $revert) {
+        
+        if (!$revert) {
+            // our work has already been done
+            return;
+        }
+        
+        if ( get_magic_quotes_gpc() ) {
             $_GET = Utils::stripslashes($_GET);
             $_POST = Utils::stripslashes($_POST);
             $_COOKIE = Utils::stripslashes($_COOKIE);
-            $revert = false;
         }
 
@@ -36 +41 @@
         $_COOKIE = new SuperGlobal($_COOKIE);
         unset($_REQUEST);
+
+        $revert = false;
     }
 
-    function offsetGet($index)
+    public function offsetGet($index)
     {
         $cp = $this->getArrayCopy();
@@ -60 +67 @@
      * @return SuperGlobal The merged array
      */
-    function merge()
+    public function merge()
     {
         $args = func_get_args();
@@ -99 +106 @@
      * @return SuperGlobal The values from this array that match the supplied keys
      */
-    function filter_keys()
+    public function filter_keys()
     {
         $keys = array();