Changeset 1691 in subversion

Timestamp:

Aug 28, 2008 2:04:19 PM (5 years ago)

Author:

alec

Message:

• Added option 'quota_zero_as_unlimited' (#1484604)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/lib/imap.inc (modified) (2 diffs)
• program/steps/mail/func.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/08/28 (alec)
+----------
+- Added option 'quota_zero_as_unlimited' (#1484604)
 
 2008/08/28 (robin)

trunk/roundcubemail/config/main.inc.php.dist

@@ -175 +175 @@
 // protect the default folders from renames, deletes, and subscription changes
 $rcmail_config['protect_default_folders'] = TRUE;
+
+// if in your system 0 quota means no limit set this option to TRUE 
+$rcmail_config['quota_zero_as_unlimited'] = FALSE;
 
 // Set TRUE if deleted messages should not be displayed

trunk/roundcubemail/program/lib/imap.inc

@@ -64 +64 @@
                 - code cleanup and identation fixes
                 - removed flush() calls in iil_C_HandlePartBody() to prevent from memory leak (#1485187)
+                - don't return "??" from iil_C_GetQuota()
 
 ********************************************************/
@@ -2622 +2623 @@
                 $storage_part = array_search('STORAGE', $parts);
                 if ($storage_part > 0) {
-                        $result = array();
-                        $used   = $parts[$storage_part+1];
-                        $total  = $parts[$storage_part+2];
-            
-                        $result['used']    = $used;
-                        $result['total']   = (empty($total)?"??":$total);
-                        $result['percent'] = (empty($total)?"??":round(($used/$total)*100));
+                        $result['used']    = intval($parts[$storage_part+1]);
+                        $result['total']   = intval($parts[$storage_part+2]);
+                        $result['percent'] = min(100, round(($result['used']/max(1,$result['total']))*100));
                         $result['free']    = 100 - $result['percent'];
                 }

trunk/roundcubemail/program/steps/mail/func.inc

@@ -458 +458 @@
 function rcmail_quota_content($quota=NULL)
   {
-  global $IMAP, $COMM_PATH;
+  global $IMAP, $COMM_PATH, $RCMAIL;
 
   $display = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
@@ -472 +472 @@
     $quota = $IMAP->get_quota();
 
-  if ($quota)
+  if ($quota && !($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited')))
     {
     $quota_text = sprintf('%s / %s (%.0f%%)',