list-virtual.php + its template

- better fix for used quota not showing up (SELECT quota2.bytes _as current_)
- this includes reverting the template patch from r746, patch from
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2889335&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@747 a1433add-5e2c-0410-b055-b7f2511e0802

list-virtual.php

@@ -166,7 +166,7 @@ if ($CONF['vacation_control_admin'] == 'YES')
     {
         if (boolconf('new_quota_table'))
         {
-            $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active, $table_quota2.bytes FROM $table_mailbox
+            $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active, $table_quota2.bytes as current FROM $table_mailbox
                 LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email
                 LEFT JOIN $table_quota2 ON $table_mailbox.username=$table_quota2.username
                 WHERE $table_mailbox.domain='$fDomain'

templates/list-virtual.php

@@ -295,13 +295,7 @@ if (sizeof ($tMailbox) > 0) {
             }
             else
             {
-               if (boolconf('used_quotas')) {
-                 if (boolconf('new_quota_table')) {
-                   print divide_quota ($tMailbox[$i]['bytes']).'/';
-                 } else {
-                   print divide_quota ($tMailbox[$i]['current']).'/';
-                 }
-               }
+               if (boolconf('used_quotas')) print divide_quota ($tMailbox[$i]['current']).'/';
                print divide_quota ($tMailbox[$i]['quota']);
             }
             print "</td>\n";