Changeset 3854 for branches/2.2/expressoMail1_2

Timestamp:

03/10/11 11:14:29 (13 years ago)

Author:

niltonneto

Message:

Ticket #1035 - Corrigido problema na visualização de cota por subpasta IMAP.

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/InfoQuota.js (modified) (3 diffs)
• setup/phpgw_es-es.lang (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)

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

@@ -3997 +3997 @@
                     $line2 = str_replace(" /vendor/cmu/cyrus-imapd/size (value.shared ",";",str_replace("* ANNOTATION ","",$line2)); 
                     list($folder,$size) = explode(";",$line2); 
-                    $size = str_replace(")","",$size); 
-                    $quotaPercent = (($size / 1048576) / $data["quota_root"]["quota_limit"])*100; 
-                    if ($size < 1048576 && $size > 1024) 
-                            $quota_used = round($size / 1024, 0).' Kb'; 
-                    else if($size > 1024) 
-                            $quota_used = round($size / (1024*1024), 1).' Mb'; 
-                    else 
-                            $quota_used = $size." b"; 
+                    $quota_used = str_replace(")","",$size); 
+                    $quotaPercent = (($quota_used / 1024) / $data["quota_root"]["quota_limit"])*100; 
                     $folder = mb_convert_encoding($folder, "ISO_8859-1", "UTF7-IMAP"); 
                     if(!preg_match('/user\\'.$this->imap_delimiter.$this->username.'\\'.$this->imap_delimiter.'/i',$folder)){ 

branches/2.2/expressoMail1_2/js/InfoQuota.js

@@ -81 +81 @@
                 }
                 var content = '';
-                var q_limit = data.quota_root.quota_limit;              
+                var q_limit = borkb(data.quota_root.quota_limit*1024);          
                 
                 var value = '';
@@ -134 +134 @@
                 for(var x in data) {
                         if(x == 'quota_root') continue;                         
-                        q_used = data[x]['quota_used'];
+                        q_used = borkb(data[x]['quota_used']);
                         value = data[x]['quota_percent'];
                         td01 = document.createElement("TD");
@@ -199 +199 @@
                 th_tfoot.style.paddingRight = '5px';
                 th_tfoot.style.paddingLeft = '5px';             
-                th_tfoot.innerHTML = get_lang("You are currently using %1Mb (%2%).",data.quota_root.quota_used, data.quota_root.quota_percent);
+                th_tfoot.innerHTML = get_lang("You are currently using %1 (%2%).",borkb(data.quota_root.quota_used*1024), data.quota_root.quota_percent);
                 tr_tfoot.appendChild(th_tfoot);         
                 return table;

branches/2.2/expressoMail1_2/setup/phpgw_es-es.lang

@@ -1 +1 @@
 % used  expressoMail1_2 es-es   % utilizado
 View Quota Usage in Folders     expressoMail1_2 es-es   Visualizar cuota utilizada por cada carpeta
-You are currently using %1Mb (%2%).     expressoMail1_2 es-es   Usted está usando actualmente %1Mb (%2%).
+You are currently using %1 (%2%).       expressoMail1_2 es-es   Usted está usando actualmente %1 (%2%).
 News    expressoMail1_2 es-es   Noticias
 1 Day   expressoMail1_2 es-es   1 Día

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -1 +1 @@
 % used  expressoMail1_2 pt-br   % utilizado
 View Quota Usage in Folders     expressoMail1_2 pt-br   Visualizar quota utilizada por cada pasta
-You are currently using %1Mb (%2%).     expressoMail1_2 pt-br   Você está usando atualmente %1Mb (%2%).
+You are currently using %1 (%2%).       expressoMail1_2 pt-br   Você está usando atualmente %1 (%2%).
 News    expressoMail1_2 pt-br   Notícias
 1 Day   expressoMail1_2 pt-br   1 Dia