improved bytes conversion method

jfsimon · jfsimon · commit 8bddfa490117 · 2013-03-23T19:46:38.000+01:00
diff --git a/Extension/Validator/Util/ServerParams.php b/Extension/Validator/Util/ServerParams.php
@@ -29,12 +29,14 @@ public function getPostMaxSize()
             return null;
         }
 
-        if (preg_match('#^(\d+)([bkmgt])#i', $iniMax, $match)) {
-            $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);
-            $iniMax = ($match[1] * (1 << $shift[strtolower($match[2])]));
+        if (preg_match('#^\+?(0x?)?([^kmg]*)([KMG]?)#', $iniMax, $match)) {
+            $shifts = array('' => 0, 'K' => 10, 'M' => 20, 'G' => 30);
+            $bases = array('' => 10, '0' => 8, '0x' => 16);
+
+            return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));
         }
 
-        return (int) $iniMax;
+        return 0;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,14 @@ public function getPostMaxSize()`
`29`	`29`	`return null;`
`30`	`30`	`}`
`31`	`31`
`32`		`- if (preg_match('#^(\d+)([bkmgt])#i', $iniMax, $match)) {`
`33`		`- $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);`
`34`		`- $iniMax = ($match[1] * (1 << $shift[strtolower($match[2])]));`
	`32`	`+ if (preg_match('#^\+?(0x?)?([^kmg]*)([KMG]?)#', $iniMax, $match)) {`
	`33`	`+ $shifts = array('' => 0, 'K' => 10, 'M' => 20, 'G' => 30);`
	`34`	`+ $bases = array('' => 10, '0' => 8, '0x' => 16);`
	`35`	`+`
	`36`	`+ return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));`
`35`	`37`	`}`
`36`	`38`
`37`		`- return (int) $iniMax;`
	`39`	`+ return 0;`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`/**`