From 5605561ca8480bdcd9601b4e4b9e97e95c4c80ae Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Sat, 28 Feb 2015 22:30:21 +0000
Subject: [PATCH] functions.inc.php: - better formatting in db_quota_text() and
 db_quota_percent() results   (for example, infinity sign instead of / 0 for
 unlimited)

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1744 a1433add-5e2c-0410-b055-b7f2511e0802
---
 functions.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/functions.inc.php b/functions.inc.php
index 4ba9ba0b..63c0a499 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -1322,8 +1322,9 @@ function db_get_boolean($bool) {
  */
 function db_quota_text($count, $quota, $fieldname) {
     return " CASE $quota
-        WHEN '-1' THEN coalesce($count,0)
-        ELSE CONCAT(coalesce($count,0), ' / ', $quota)   
+        WHEN '-1' THEN CONCAT(coalesce($count,0), ' / -')
+        WHEN '0' THEN CONCAT(coalesce($count,0), ' / ', '" . escape_string(html_entity_decode('&infin;')) . "')
+        ELSE CONCAT(coalesce($count,0), ' / ', $quota)
     END AS $fieldname";
 }
 
@@ -1335,8 +1336,9 @@ function db_quota_text($count, $quota, $fieldname) {
  * @return string
  */
 function db_quota_percent($count, $quota, $fieldname) {
-    return " CASE $quota   
+    return " CASE $quota
         WHEN '-1' THEN -1
+        WHEN '0' THEN -1
         ELSE round(100 * coalesce($count,0) / $quota)
     END AS $fieldname";
 }