diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/lib/imap.inc | 11 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/program/lib/imap.inc b/program/lib/imap.inc index c10c90101..7f2315671 100644 --- a/program/lib/imap.inc +++ b/program/lib/imap.inc @@ -63,6 +63,7 @@ - added iil_PutLine() wrapper for fputs() - 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() ********************************************************/ @@ -2621,13 +2622,9 @@ function iil_C_GetQuota(&$conn) { $parts = explode(' ', $quota_line); $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']; } } diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index b1f359f63..7607cccd3 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -457,7 +457,7 @@ function rcmail_quota_display($attrib) */ function rcmail_quota_content($quota=NULL) { - global $IMAP, $COMM_PATH; + global $IMAP, $COMM_PATH, $RCMAIL; $display = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : ''; @@ -471,7 +471,7 @@ function rcmail_quota_content($quota=NULL) else $quota = $IMAP->get_quota(); - if ($quota) + if ($quota && !($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited'))) { $quota_text = sprintf('%s / %s (%.0f%%)', show_bytes($quota['used'] * 1024), |