Changeset 718 for trunk/lib/Utilities.inc.php

Timestamp:

Feb 17, 2020 11:01:55 PM (4 years ago)

Author:

anonymous

Message:

Minor fixes

File:

• trunk/lib/Utilities.inc.php (modified) (3 diffs)

trunk/lib/Utilities.inc.php

@@ -677 +677 @@
     $val = trim(ini_get($val));
     if ($val != '') {
-        $last = strtolower($val{strlen($val) - 1});
-    } else {
-        $last = '';
-    }
-    switch ($last) {
-        // The 'G' modifier is available since PHP 5.1.0
-        case 'g':
-            $val *= 1024;
-        case 'm':
-            $val *= 1024;
-        case 'k':
-            $val *= 1024;
+        $unit = strtolower($val{strlen($val) - 1});
+        $val = preg_replace('/\D/', '', $val);
+
+        switch ($unit) {
+            // No `break`, so these multiplications are cumulative.
+            case 'g':
+                $val *= 1024;
+            case 'm':
+                $val *= 1024;
+            case 'k':
+                $val *= 1024;
+        }
     }
 
@@ -1063 +1063 @@
     $app =& App::getInstance();
 
-    if ('POST' == getenv('REQUEST_METHOD') && null === $key) {
-        return dispelMagicQuotes($_POST, $app->getParam('always_dispel_magicquotes'));
-    } else if ('GET' == getenv('REQUEST_METHOD') && null === $key) {
-        return dispelMagicQuotes($_GET, $app->getParam('always_dispel_magicquotes'));
+    if (null === $key) {
+        // Return entire array.
+        switch (strtoupper(getenv('REQUEST_METHOD'))) {
+        case 'POST':
+            return dispelMagicQuotes($_POST, $app->getParam('always_dispel_magicquotes'));
+
+        case 'GET':
+            return dispelMagicQuotes($_GET, $app->getParam('always_dispel_magicquotes'));
+
+        default:
+            return dispelMagicQuotes($_REQUEST, $app->getParam('always_dispel_magicquotes'));
+        }
     }
 
@@ -1139 +1147 @@
         break;
     }
+
+    $_REQUEST[$key] = $val;
 }