[Phpgroupware-cvs] filemanager/inc class.bofilemanager.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    filemanager
Changes by:     Dave Hall <skwashd>     06/08/17 10:55:33

Modified files:
        inc            : class.bofilemanager.inc.php 

Log message:
        make borkb less geeky and enable json calls to this class

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/filemanager/inc/class.bofilemanager.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28

Patches:
Index: class.bofilemanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/class.bofilemanager.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.bofilemanager.inc.php 16 Aug 2006 14:20:32 -0000      1.27
+++ class.bofilemanager.inc.php 17 Aug 2006 10:55:32 -0000      1.28
@@ -8,7 +8,7 @@
        * @copyright Portions Copyright (C) 2000-2005 Free Software Foundation, 
Inc http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package filemanager
-       * @version $Id: class.bofilemanager.inc.php,v 1.27 2006/08/16 14:20:32 
skwashd Exp $
+       * @version $Id: class.bofilemanager.inc.php,v 1.28 2006/08/17 10:55:32 
skwashd Exp $
        * @internal Based on phpWebhosting
        */
 
@@ -60,6 +60,11 @@
                //var $debug = true;
                var $debug = false;
 
+               var $public_functions = array
+               (
+                       'load_files'    => true
+               );
+
                function bofilemanager()
                {
                        if (@!is_object($GLOBALS['phpgw']->vfs))
@@ -968,27 +973,40 @@
                        );
                }
 
-               function borkb ($size,$enclosed = NULL,$return = 0)
+               function borkb ($size, $enclosed = false, $return = false)
                {
-                       if(!$size)
+                       if ( !(int) $size )
                        {
                                $size = 0;
                        }
 
-                       if($enclosed)
+                       if ($size < 1024)
                        {
-                               $left = '(';
-                               $right = ')';
+                               $rstring = $size . 'B';
                        }
-
-                       if($size<1024)
+                       elseif ($size < 1024*1024)
                        {
-                               return $left.$size.' B '.$right;
+                               $rstring = round($size/1024, 1) . 'KB';
+                       }
+                       else if ($size < (1024*1024*1024))
+                       {
+                               $rstring = round($size/(1024*1024), 1) . 'MB';
+                       }
+                       else if ($size < (1024*1024*1024*1024))
+                       {
+                               $rstring = round($size/(1024*1024*1024),3) . 
'GB';
                        }
                        else
                        {
-                               return $left.round($size/1024).' KB'.$right;
+                               $rstring = round($size/(1024*1024*1024*1024),3) 
. 'TB';
+                       }
+
+                       if ( $enclosed )
+                       {
+                               $rstring = "({$rstring})";
                        }
+
+                       return $rstring;
                }
 
                /**