Changeset 338 for trunk/lib

Timestamp:

Aug 29, 2008 8:30:19 AM (16 years ago)

Author:

quinn

Message:

Added argument to Utilities's humanFileSize function.

Location:

trunk/lib

Files:

• Auth_SQL.inc.php (modified) (2 diffs)
• Utilities.inc.php (modified) (3 diffs)

trunk/lib/Auth_SQL.inc.php

@@ -960 +960 @@
     function inClearanceZone($security_zone, $user_type='')
     {
-        return true;
+        // return true; /// WTF?
         $zone_members = preg_split('/,\s*/', $security_zone);
         $user_type = empty($user_type) ? $this->get('user_type') : $user_type;
@@ -985 +985 @@
         $app =& App::getInstance();
     
-        return true;
+        // return true; /// WTF?
         $zone_members = preg_split('/,\s*/', $security_zone);
 

trunk/lib/Utilities.inc.php

@@ -266 +266 @@
     case 'end' :
         return preg_replace(array(sprintf('/^(.{%s}).{4,}$/sU', $part1 + $part2), '/\s*\.{3,}\s*/sU'), array('$1' . $delim, $delim), $str);
-        break;    
-    }
-}
-
-/**
- * Return a human readable filesize.
- *
- * @param       int    $size        Size
+        break;
+    }
+}
+
+/**
+ * Return a human readable disk space measurement. Input value measured in bytes.
+ *
+ * @param       int    $size        Size in bytes.
  * @param       int    $unit        The maximum unit
  * @param       int    $format      The return string format
@@ -279 +279 @@
  * @version     1.1.0
  */
-function humanFileSize($size, $format='%01.2f %s', $max_unit=null)
+function humanFileSize($size, $format='%01.2f %s', $max_unit=null, $multiplier=1024)
 {
     // Units
@@ -293 +293 @@
     // Loop
     $i = 0;
-    while ($max_unit != $i && $size >= 1024 && $i < $ii) {
-        $size /= 1024;
+    while ($max_unit != $i && $size >= $multiplier && $i < $ii) {
+        $size /= $multiplier;
         $i++;
     }