Changeset 2019 in subversion

Timestamp:

Oct 27, 2008 1:49:05 PM (5 years ago)

Author:

thomasb

Message:

Also check for negative image size + set caching headers for 1 hour

File:

• trunk/roundcubemail/bin/quotaimg.php (modified) (4 diffs)

trunk/roundcubemail/bin/quotaimg.php

@@ -97 +97 @@
         if (ereg("^[^0-9?]*$", $used) || ereg("^[^0-9?]*$", $total)) {
                 return false; 
-    }
+        }
 
-        if (strpos($used, '?') !== false || strpos($total, '?') !== false
-        && $used != 0) {
+        if (strpos($used, '?') !== false || strpos($total, '?') !== false && $used != 0) {
                 $unknown = true; 
-    }
+        }
 
         $im = imagecreate($width, $height);
@@ -154 +153 @@
                         $fill = imagecolorallocate($im, $r, $g, $b);
                 } else {
-                    // if($quota >= $limit['low'])
+                        // if($quota >= $limit['low'])
                         list($r, $g, $b) = explode(',', $color['fill']['low']);
                         $fill = imagecolorallocate($im, $r, $g, $b);
@@ -164 +163 @@
                 $string = $quota . '%';
                 $mid    = floor(($width-(strlen($string)*imagefontwidth($font)))/2)+1;
-        // Print percent in black
+                // Print percent in black
                 imagestring($im, $font, $mid, $padding, $string, $text); 
         }
 
         header('Content-Type: image/gif');
-    
-    // @todo is harcoding GMT necessary?
-        header('Expires: ' . gmdate('D, d M Y H:i:s', mktime()+86400) . ' GMT');
-        header('Cache-Control: ');
-        header('Pragma: ');
+
+        // cache for 1 hour
+        $maxage = 3600;
+        header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$maxage). ' GMT');
+        header('Cache-Control: max-age=' . $maxage);
         
         imagegif($im);
@@ -179 +178 @@
 }
 
-genQuota($used, $quota, $width, $height);
+if ($width > 1 && $height > 1) {
+        genQuota($used, $quota, $width, $height);  
+}
+else {
+        header("HTTP/1.0 404 Not Found");
+}
+
 exit;
 ?>