Changeset 1776 in subversion

Timestamp:

Sep 12, 2008 12:48:23 PM (5 years ago)

Author:

alec

Message:

• Fixed quota img height/width setting from template (#1484857)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• bin/quotaimg.php (modified) (1 diff)
• program/steps/mail/func.inc (modified) (4 diffs)
• skins/default/templates/mail.html (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -7 +7 @@
 - Added possibility to view all headers in message view
 - Fixed splitter drag/resize on Opera (#1485170)
+- Fixed quota img height/width setting from template (#1484857)
 
 2008/09/12 (thomasb)

trunk/roundcubemail/bin/quotaimg.php

@@ -160 +160 @@
 
                 $quota_width = $quota / 100 * $width;
-                imagefilledrectangle($im, $border, 0, $quota, $height-2*$border, $fill);
+                imagefilledrectangle($im, $border, 0, $quota_width, $height-2*$border, $fill);
 
                 $string = $quota . '%';

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

@@ -447 +447 @@
 
   $out = '<span' . $attrib_str . '>';
-  $out .= rcmail_quota_content();
+  $out .= rcmail_quota_content(NULL, $attrib);
   $out .= '</span>';
   return $out;
@@ -456 +456 @@
  *
  */
-function rcmail_quota_content($quota=NULL)
+function rcmail_quota_content($quota=NULL, $attrib=NULL)
   {
   global $IMAP, $COMM_PATH, $RCMAIL;
@@ -482 +482 @@
     if ($display == 'image' && function_exists('imagegif'))
       {
-      $attrib = array('width' => 100, 'height' => 14);
+      if (!$attrib['width'])
+        $attrib['width'] = isset($_SESSION['quota_width']) ? $_SESSION['quota_width'] : 100;
+      else
+        $_SESSION['quota_width'] = $attrib['width'];
+
+      if (!$attrib['height'])
+        $attrib['height'] = isset($_SESSION['quota_height']) ? $_SESSION['quota_height'] : 14;
+      else
+        $_SESSION['quota_height'] = $attrib['height'];
+            
       $quota_text = sprintf('<img src="./bin/quotaimg.php?u=%s&amp;q=%d&amp;w=%d&amp;h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />',
                             $quota['used'], $quota['total'],
@@ -488 +497 @@
                             $attrib['width'], $attrib['height'],
                             $quota_text,
-                            show_bytes($quota["used"] * 1024),
-                            show_bytes($quota["total"] * 1024));
+                            show_bytes($quota['used'] * 1024),
+                            show_bytes($quota['total'] * 1024));
       }
     }

trunk/roundcubemail/skins/default/templates/mail.html

@@ -110 +110 @@
 <roundcube:button command="select-none" label="none" classAct="active" /> &nbsp;&nbsp;&nbsp;
 <roundcube:if condition="env:quota" />
-<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="120" id="quotadisplay" />
+<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" />
 <roundcube:endif />
 </div>