Changeset 3064

Timestamp:

07/16/10 16:24:28 (14 years ago)

Author:

amuller

Message:

Ticket #1035 - Corrigindo visualização das quotas com borkb

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/common_functions.js (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -2986 +2986 @@
 
                 if(count($quota) && $quota['limit']) {
-                        $quota_limit = (($quota['limit']/1024)* 100 + .5 )* .01;
-                        $quota_used  = (($quota['usage']/1024)* 100 + .5 )* .01;
+                        $quota_limit = $quota['limit'];
+                        $quota_used  = $quota['usage'];
                         if($quota_used >= $quota_limit)
                         {
@@ -2999 +2999 @@
                         return array(
                                 'quota_percent' => floor($quotaPercent),
-                                'quota_used' => floor($quota_used),
-                                'quota_limit' =>  floor($quota_limit)
+                                'quota_used' => $quota_used,
+                                'quota_limit' =>  $quota_limit
                         );
                 }

branches/2.2/expressoMail1_2/js/common_functions.js

@@ -871 +871 @@
 }
 
-function borkb(size){ 
-        kbyte = 1024; 
-        mbyte = kbyte*1024; 
-        gbyte = mbyte*1024; 
-        if (!size) 
-                size = 0; 
-        if (size < kbyte) 
-                return size + ' B'; 
-        else if (size < mbyte) 
-                return parseInt(size/kbyte) + ' KB'; 
-        else if (size < gbyte) 
-                if (size/mbyte > 100) 
-                        return (size/mbyte).toFixed(0) + ' MB'; 
-                else 
-                        return (size/mbyte).toFixed(1) + ' MB'; 
-        else 
-                return parseInt(size/gbyte).toFixed(1) + ' GB'; 
-} 
+function borkb(size){
+        kbyte = 1024;
+        mbyte = kbyte*1024;
+        gbyte = mbyte*1024;
+        if (!size)
+                size = 0;
+        if (size < kbyte)
+                return size + ' B';
+        else if (size < mbyte)
+                return parseInt(size/kbyte) + ' KB';
+        else if (size < gbyte)
+                if (size/mbyte > 100)
+                        return (size/mbyte).toFixed(0) + ' MB';
+                else
+                        return (size/mbyte).toFixed(1) + ' MB';
+        else
+                return (size/gbyte).toFixed(1) + ' GB';
+}
 
 function validate_date(date){

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -2728 +2728 @@
         td11.align="center";
         td11.setAttribute("noWrap","true");
-        td11.innerHTML += '&nbsp;<span class="boxHeaderText">' + value+"% ("+q_used+"M/"+q_limit+"M)</span>";
+        td11.innerHTML += '&nbsp;<span class="boxHeaderText">' + value+"% ("+borkb(q_used*1024)+"/"+borkb(q_limit*1024)+")</span>";
         //tr1.appendChild(td11);