|
 |
2f9049c |
--- bin/quotaimg.php.orig 2008-09-12 11:48:23.000000000 -0500
|
|
|
2f9049c |
+++ bin/quotaimg.php 2008-12-16 11:21:30.000000000 -0600
|
|
|
2f9049c |
@@ -4 +4 @@
|
|
|
2f9049c |
- | program/bin/quotaimg.php |
|
|
|
2f9049c |
+ | bin/quotaimg.php |
|
|
|
2f9049c |
@@ -7 +7 @@
|
|
|
2f9049c |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
|
|
|
2f9049c |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
|
|
|
2f9049c |
@@ -17 +17 @@
|
|
|
2f9049c |
- $Id: $
|
|
|
2f9049c |
+ $Id$
|
|
|
2f9049c |
@@ -21,4 +21,4 @@
|
|
|
2f9049c |
-$used = ((isset($_GET['u']) && !empty($_GET['u'])) || $_GET['u']=='0')?(int)$_GET['u']:'??';
|
|
|
2f9049c |
-$quota = ((isset($_GET['q']) && !empty($_GET['q'])) || $_GET['q']=='0')?(int)$_GET['q']:'??';
|
|
|
2f9049c |
-$width = empty($_GET['w']) ? 100 : (int)$_GET['w'];
|
|
|
2f9049c |
-$height = empty($_GET['h']) ? 14 : (int)$_GET['h'];
|
|
|
2f9049c |
+$used = isset($_GET['u']) ? intval($_GET['u']) : '??';
|
|
|
2f9049c |
+$quota = isset($_GET['q']) ? intval($_GET['q']) : '??';
|
|
|
2f9049c |
+$width = empty($_GET['w']) ? 100 : min(300, intval($_GET['w']));
|
|
|
2f9049c |
+$height = empty($_GET['h']) ? 14 : min(50, intval($_GET['h']));
|
|
|
2f9049c |
@@ -99 +99 @@
|
|
|
2f9049c |
- }
|
|
|
2f9049c |
+ }
|
|
|
2f9049c |
@@ -101,2 +101 @@
|
|
|
2f9049c |
- if (strpos($used, '?') !== false || strpos($total, '?') !== false
|
|
|
2f9049c |
- && $used != 0) {
|
|
|
2f9049c |
+ if (strpos($used, '?') !== false || strpos($total, '?') !== false && $used != 0) {
|
|
|
2f9049c |
@@ -104 +103 @@
|
|
|
2f9049c |
- }
|
|
|
2f9049c |
+ }
|
|
|
2f9049c |
@@ -156 +155 @@
|
|
|
2f9049c |
- // if($quota >= $limit['low'])
|
|
|
2f9049c |
+ // if($quota >= $limit['low'])
|
|
|
2f9049c |
@@ -166 +165 @@
|
|
|
2f9049c |
- // Print percent in black
|
|
|
2f9049c |
+ // Print percent in black
|
|
|
2f9049c |
@@ -171,5 +170,5 @@
|
|
|
2f9049c |
-
|
|
|
2f9049c |
- // @todo is harcoding GMT necessary?
|
|
|
2f9049c |
- header('Expires: ' . gmdate('D, d M Y H:i:s', mktime()+86400) . ' GMT');
|
|
|
2f9049c |
- header('Cache-Control: ');
|
|
|
2f9049c |
- header('Pragma: ');
|
|
|
2f9049c |
+
|
|
|
2f9049c |
+ // cache for 1 hour
|
|
|
2f9049c |
+ $maxage = 3600;
|
|
|
2f9049c |
+ header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$maxage). ' GMT');
|
|
|
2f9049c |
+ header('Cache-Control: max-age=' . $maxage);
|
|
|
2f9049c |
@@ -181 +180,7 @@
|
|
|
2f9049c |
-genQuota($used, $quota, $width, $height);
|
|
|
2f9049c |
+if ($width > 1 && $height > 1) {
|
|
|
2f9049c |
+ genQuota($used, $quota, $width, $height);
|
|
|
2f9049c |
+}
|
|
|
2f9049c |
+else {
|
|
|
2f9049c |
+ header("HTTP/1.0 404 Not Found");
|
|
|
2f9049c |
+}
|
|
|
2f9049c |
+
|
|
|
2f9049c |
@@ -183 +188 @@
|
|
|
2f9049c |
-?>
|
|
|
2f9049c |
\ No newline at end of file
|
|
|
2f9049c |
+?>
|