o2system / kernel

src/Http/Input.php

Spacing +47 added lines, -47 removed lines

@@ -44,7 +44,7 @@ 
             return;
         }
 
-        if (isset($_REQUEST[ 'GLOBALS' ])) {
+        if (isset($_REQUEST['GLOBALS'])) {
             die('GLOBALS overwrite attempt detected');
         }
 
@@ -54,8 +54,8 @@ 
         $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
             isset($_SESSION) && is_array($_SESSION) ? $_SESSION : []);
         foreach ($input as $k => $v) {
-            if ( ! in_array($k, $no_unset) && isset($GLOBALS[ $k ])) {
-                unset($GLOBALS[ $k ]);
+            if ( ! in_array($k, $no_unset) && isset($GLOBALS[$k])) {
+                unset($GLOBALS[$k]);
             }
         }
 
@@ -68,51 +68,51 @@ 
         $_SERVER = array_merge($default_server_values, $_SERVER);
 
         // Fix for IIS when running with PHP ISAPI
-        if (empty($_SERVER[ 'REQUEST_URI' ]) || (PHP_SAPI != 'cgi-fcgi' && preg_match('/^Microsoft-IIS\//',
-                    $_SERVER[ 'SERVER_SOFTWARE' ]))) {
+        if (empty($_SERVER['REQUEST_URI']) || (PHP_SAPI != 'cgi-fcgi' && preg_match('/^Microsoft-IIS\//',
+                    $_SERVER['SERVER_SOFTWARE']))) {
 
-            if (isset($_SERVER[ 'HTTP_X_ORIGINAL_URL' ])) {
+            if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
                 // IIS Mod-Rewrite
-                $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'HTTP_X_ORIGINAL_URL' ];
-            } elseif (isset($_SERVER[ 'HTTP_X_REWRITE_URL' ])) {
+                $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
+            } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
                 // IIS Isapi_Rewrite
-                $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'HTTP_X_REWRITE_URL' ];
+                $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
             } else {
                 // Use ORIG_PATH_INFO if there is no PATH_INFO
-                if ( ! isset($_SERVER[ 'PATH_INFO' ]) && isset($_SERVER[ 'ORIG_PATH_INFO' ])) {
-                    $_SERVER[ 'PATH_INFO' ] = $_SERVER[ 'ORIG_PATH_INFO' ];
+                if ( ! isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO'])) {
+                    $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
                 }
 
                 // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
-                if (isset($_SERVER[ 'PATH_INFO' ])) {
-                    if ($_SERVER[ 'PATH_INFO' ] == $_SERVER[ 'SCRIPT_NAME' ]) {
-                        $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'PATH_INFO' ];
+                if (isset($_SERVER['PATH_INFO'])) {
+                    if ($_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME']) {
+                        $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
                     } else {
-                        $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'SCRIPT_NAME' ] . $_SERVER[ 'PATH_INFO' ];
+                        $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
                     }
                 }
 
                 // Append the query string if it exists and isn't null
-                if ( ! empty($_SERVER[ 'QUERY_STRING' ])) {
-                    $_SERVER[ 'REQUEST_URI' ] .= '?' . $_SERVER[ 'QUERY_STRING' ];
+                if ( ! empty($_SERVER['QUERY_STRING'])) {
+                    $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
                 }
             }
         }
 
         // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-        if (isset($_SERVER[ 'SCRIPT_FILENAME' ]) && (strpos($_SERVER[ 'SCRIPT_FILENAME' ],
-                    'php.cgi') == strlen($_SERVER[ 'SCRIPT_FILENAME' ]) - 7)) {
-            $_SERVER[ 'SCRIPT_FILENAME' ] = $_SERVER[ 'PATH_TRANSLATED' ];
+        if (isset($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'],
+                    'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7)) {
+            $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
         }
 
         // Fix for Dreamhost and other PHP as CGI hosts
-        if (strpos($_SERVER[ 'SCRIPT_NAME' ], 'php.cgi') !== false) {
-            unset($_SERVER[ 'PATH_INFO' ]);
+        if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false) {
+            unset($_SERVER['PATH_INFO']);
         }
 
         // Fix empty PHP_SELF
         if (empty($PHP_SELF)) {
-            $_SERVER[ 'PHP_SELF' ] = $PHP_SELF = preg_replace('/(\?.*)?$/', '', $_SERVER[ 'REQUEST_URI' ]);
+            $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace('/(\?.*)?$/', '', $_SERVER['REQUEST_URI']);
         }
     }
 
@@ -137,7 +137,7 @@ 
         // Use $_GET directly here, since filter_has_var only
         // checks the initial GET data, not anything that might
         // have been added since.
-        return isset($_GET[ $offset ])
+        return isset($_GET[$offset])
             ? $this->get($offset, $filter)
             : $this->post($offset, $filter);
     }
@@ -223,7 +223,7 @@ 
             $loopThrough = [];
 
             foreach ($offset as $key) {
-                $loopThrough[ $key ] = $this->filter($type, $key, $filter);
+                $loopThrough[$key] = $this->filter($type, $key, $filter);
             }
 
             if (empty($loopThrough)) {
@@ -237,38 +237,38 @@ 
             // of the simpler filter_input();
             switch ($type) {
                 case INPUT_GET:
-                    $value = isset($_GET[ $offset ])
-                        ? $_GET[ $offset ]
+                    $value = isset($_GET[$offset])
+                        ? $_GET[$offset]
                         : null;
                     break;
                 case INPUT_POST:
-                    $value = isset($_POST[ $offset ])
-                        ? $_POST[ $offset ]
+                    $value = isset($_POST[$offset])
+                        ? $_POST[$offset]
                         : null;
                     break;
                 case INPUT_SERVER:
-                    $value = isset($_SERVER[ $offset ])
-                        ? $_SERVER[ $offset ]
+                    $value = isset($_SERVER[$offset])
+                        ? $_SERVER[$offset]
                         : null;
                     break;
                 case INPUT_ENV:
-                    $value = isset($_ENV[ $offset ])
-                        ? $_ENV[ $offset ]
+                    $value = isset($_ENV[$offset])
+                        ? $_ENV[$offset]
                         : null;
                     break;
                 case INPUT_COOKIE:
-                    $value = isset($_COOKIE[ $offset ])
-                        ? $_COOKIE[ $offset ]
+                    $value = isset($_COOKIE[$offset])
+                        ? $_COOKIE[$offset]
                         : null;
                     break;
                 case INPUT_REQUEST:
-                    $value = isset($_REQUEST[ $offset ])
-                        ? $_REQUEST[ $offset ]
+                    $value = isset($_REQUEST[$offset])
+                        ? $_REQUEST[$offset]
                         : null;
                     break;
                 case INPUT_SESSION:
-                    $value = isset($_SESSION[ $offset ])
-                        ? $_SESSION[ $offset ]
+                    $value = isset($_SESSION[$offset])
+                        ? $_SESSION[$offset]
                         : null;
                     break;
                 default:
@@ -327,13 +327,13 @@ 
     {
         foreach ($data as $key => $value) {
             if (is_array($value) AND is_array($filter)) {
-                $data[ $key ] = filter_var_array($value, $filter);
+                $data[$key] = filter_var_array($value, $filter);
             } elseif (is_array($value)) {
-                $data[ $key ] = $this->filterRecursive($value, $filter);
+                $data[$key] = $this->filterRecursive($value, $filter);
             } elseif (isset($filter)) {
-                $data[ $key ] = filter_var($value, $filter);
+                $data[$key] = filter_var($value, $filter);
             } else {
-                $data[ $key ] = $value;
+                $data[$key] = $value;
             }
         }
 
@@ -382,7 +382,7 @@ 
         // Use $_POST directly here, since filter_has_var only
         // checks the initial POST data, not anything that might
         // have been added since.
-        return isset($_POST[ $offset ])
+        return isset($_POST[$offset])
             ? $this->post($offset, $filter)
             : $this->get($offset, $filter);
     }
@@ -405,8 +405,8 @@ 
         $uploadFiles = server_request()->getUploadedFiles();
 
         if (isset($offset)) {
-            if (isset($uploadFiles[ $offset ])) {
-                return $uploadFiles[ $offset ];
+            if (isset($uploadFiles[$offset])) {
+                return $uploadFiles[$offset];
             }
         }
 
@@ -632,6 +632,6 @@ 
      */
     final public function submit()
     {
-        return (bool)isset($_POST[ 'submit' ]);
+        return (bool)isset($_POST['submit']);
     }
 }
\ No newline at end of file