Changeset 892af47 in github

Timestamp:

Jan 5, 2010 9:10:37 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

57837fd

Parents:

c3b6763

Message:

• Support show_bytes() output in parse_bytes() (#1486405)

File:

• program/include/rcube_shared.inc (modified) (2 diffs)

program/include/rcube_shared.inc

@@ -153 +153 @@
   if (is_numeric($str))
     return floatval($str);
-    
-  if (preg_match('/([0-9]+)([a-z])/i', $str, $regs))
+
+  if (preg_match('/([0-9\.]+)\s*([a-z]*)/i', $str, $regs))
   {
     $bytes = floatval($regs[1]);
@@ -160 +160 @@
     {
       case 'g':
+      case 'gb':
         $bytes *= 1073741824;
         break;
       case 'm':
+      case 'mb':
         $bytes *= 1048576;
         break;
       case 'k':
+      case 'kb':
         $bytes *= 1024;
         break;