Changeset 5b3ed54 in github

Timestamp:

Dec 13, 2009 1:28:47 PM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

63ffe33c

Parents:

317a7d9

Message:

• Plugin API: added 'quota' hook

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/check_recent.inc (modified) (1 diff)
• program/steps/mail/func.inc (modified) (4 diffs)
• program/steps/mail/move_del.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Plugin API: added 'quota' hook
 - Fix parsing conditional comments in HTML messages (#1486350)
 - Use built-in json_encode() for proper JSON format in AJAX replies

program/steps/mail/check_recent.inc

@@ -47 +47 @@
 
       if (!empty($_GET['_quota']))
-        $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
+        $OUTPUT->command('set_quota', rcmail_quota_content());
 
       // trigger plugin hook

program/steps/mail/func.inc

@@ -516 +516 @@
   $OUTPUT->add_gui_object('quotadisplay', $attrib['id']);
   
-  $quota = rcmail_quota_content(NULL, $attrib);
+  $quota = rcmail_quota_content($attrib);
   
   if (is_array($quota)) {
@@ -528 +528 @@
 
 
-function rcmail_quota_content($quota=NULL, $attrib=NULL)
-  {
-  global $IMAP, $COMM_PATH, $RCMAIL;
+function rcmail_quota_content($attrib=NULL)
+  {
+  global $COMM_PATH, $RCMAIL;
 
   $display = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
 
-  if (empty($quota)) {
-    if (!$IMAP->get_capability('QUOTA'))
-      return rcube_label('unknown');
-    else 
-      $quota = $IMAP->get_quota();
-    }
-
-  if ($quota && !($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited')))
+  $quota = $RCMAIL->imap->get_quota();
+  $quota = $RCMAIL->plugins->exec_hook('quota', $quota);
+
+  if (!isset($quota['used']) || !isset($quota['total']))
+    return rcube_label('unknown');
+
+  if (!($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited')))
     {
+    if (!isset($quota['percent']))
+      $quota['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));
+    
     $quota_result = sprintf('%s / %s (%.0f%%)',
         show_bytes($quota['used'] * 1024), show_bytes($quota['total'] * 1024),
@@ -548 +550 @@
 
     if ($display == 'image') {
-      $quota_result = array(        
+      $quota_result = array(
         'percent'       => $quota['percent'],
         'title'         => $quota_result,
         );
+
       if ($attrib['width'])
         $quota_result['width'] = $attrib['width'];
@@ -734 +737 @@
   $html = $washer->wash($html);
   $REMOTE_OBJECTS = $washer->extlinks;
-  
+
   return $html;
 }

program/steps/mail/move_del.inc

@@ -114 +114 @@
   }
 
-  $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
+  $OUTPUT->command('set_quota', rcmail_quota_content());
   $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));