Changeset 2798

Timestamp:

11/12/08 00:52:32 (2 months ago)

Author:

sean

Message:

add server to superglobal breakout, also: remove type hinting and handle as array OR SuperGlobal in constructor

Location:

branches/sginput/htdocs

Files:

• index.php (modified) (1 diff)
• system/classes/superglobal.php (modified) (3 diffs)

branches/sginput/htdocs/index.php

@@ -112 +112 @@
 Error::handle_errors();
 
-// Replace all of the $_GET, $_POST, and $_COOKIE superglobals with object
+// Replace all of the $_GET, $_POST, $_COOKIE and $_SERVER superglobals with object
 // representations of each.  Unset $_REQUEST, which is evil.
-SuperGlobal::process_gpc();
+SuperGlobal::process_gpcs();
 
 /* Initiate install verifications */

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

@@ -10 +10 @@
     protected $values = array();
 
-    public function __construct(array $array)
+    public function __construct($array)
     {
+        if (!is_array($array) && !$array instanceof SuperGlobal) {
+            throw new Exception('Parameter must be array or SuperGlobal');
+        }
         $values['default'] = array();
         parent::__construct($array);
@@ -17 +20 @@
 
     /**
-     * Convert $_GET, $_POST, and $_COOKIE into SuperGlobal instances, also kill $_REQUEST
+     * Convert $_GET, $_POST, $_COOKIE and $_SERVER into SuperGlobal instances, also kill $_REQUEST
      *
      * @return
      */
-    public static function process_gpc()
+    public static function process_gpcs()
     {
         /* We should only revert the magic quotes once per page hit */
@@ -40 +43 @@
         $_POST = new SuperGlobal($_POST);
         $_COOKIE = new SuperGlobal($_COOKIE);
+        $_SERVER = new SuperGlobal($_SERVER);
         unset($_REQUEST);