Changeset 2980

Timestamp:

06/29/10 17:16:41 (14 years ago)

Author:

amuller

Message:

Ticket #1059 - Arrumando visualização da quota

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/jscode/draw_api_folders.js (modified) (3 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3054 +3054 @@
 
                 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)
                         {
@@ -3067 +3067 @@
                         return array(
                                 'quota_percent' => floor($quotaPercent),
-                                'quota_used' => floor($quota_used),
-                                'quota_limit' =>  floor($quota_limit)
+                                'quota_used' => $quota_used,
+                                'quota_limit' =>  $quota_limit
                         );
                 }

trunk/expressoMail1_2/js/jscode/draw_api_folders.js

@@ -208 +208 @@
 function build_quota(data){
         id = "content_quota";
-        q_limit = data['quota_limit'];
+        q_limit = data['quota_limit']*1024;
         var div = document.getElementById(id);
         if(!q_limit){
@@ -218 +218 @@
                         div.innerHTML = '';
                         value = data['quota_percent'];
-                        q_used = data['quota_used'];
+                        q_used = data['quota_used']*1024;
                         table = document.getElementById("table_quota");
                         if(table)
@@ -235 +235 @@
                         td11.align="center";
                         td11.setAttribute("noWrap","true");
-                        td11.innerHTML += '&nbsp;<span class="boxHeaderText">' + value+"% ("+q_used+"M/"+q_limit+"M)</span>";
+                        alert(q_used + "-" + q_limit);
+
+                        td11.innerHTML += '&nbsp;<span class="boxHeaderText">' + value+"% ("+borkb(q_used)+"/"+borkb(q_limit)+")</span>";
                         //tr1.appendChild(td11);