[Phpgroupware-cvs] filemanager/inc main.inc.php, 1.14.2.2.2.1, 1.14.2.2.2.2

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/filemanager/inc
In directory subversions:/tmp/cvs-serv5067

Modified Files:
      Tag: Version-0_9_16-branch
        main.inc.php 
Log Message:
real fix for bug #6775


Index: main.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/Attic/main.inc.php,v
retrieving revision 1.14.2.2.2.1
retrieving revision 1.14.2.2.2.2
diff -C2 -d -r1.14.2.2.2.1 -r1.14.2.2.2.2
*** main.inc.php        9 Sep 2003 06:42:08 -0000       1.14.2.2.2.1
--- main.inc.php        26 Nov 2003 20:42:15 -0000      1.14.2.2.2.2
***************
*** 91,95 ****
  
  ###
! # Calculate and display B or KB
  # And yes, that first if is strange, 
  # but it does do something
--- 91,95 ----
  
  ###
! # Calculate and display B or KB or MB
  # And yes, that first if is strange, 
  # but it does do something
***************
*** 108,115 ****
  
        if ($size < 1024)
                $rstring = $left . $size . 'B' . $right;
        else
!               $rstring = $left . round($size/1024) . 'KB' . $right;
!       
        return (eor ($rstring, $return));
  }
--- 108,122 ----
  
        if ($size < 1024)
+       {
                $rstring = $left . $size . 'B' . $right;
+       }
+       elseif ($size < 1048576)
+       {
+               $rstring = $left . round($size/1024, 1) . 'KB' . $right;
+       }
        else
!       {
!               $rstring = $left . round($size/1048576, 1) . 'MB' . $right;
!       }
        return (eor ($rstring, $return));
  }