Browse Source

emailAccounts

andre 2 years ago
parent
commit
0ff275c7b2

+ 17 - 2
app/Libs/Kerio/Components/Api/Soap/Helpers/AccountHelper.php

@@ -38,9 +38,24 @@ class AccountHelper
      * @param $quote
      * @return float|int|string
      */
-    public static function getQuotaAsMb($quote)
+    public static function getQuotaAsMb($quote, $unit = 'Bytes')
     {
-        return isset($quote) ? ($quote / Size::B_TO_MB)  : ProductParams::SIZE_UNLIMITED;
+        switch($unit) {
+            case 'Bytes' :
+                $quote = $quote/1024/1024;
+                break;
+            case 'KiloBytes' :
+                $quote = $quote/1024;
+                break;
+            case 'MegaBytes' :
+                $quote = $quote;
+                break;
+            case 'GigaBytes' :
+                $quote = $quote*1024;
+                break;
+        }
+
+        return isset($quote) ? $quote : ProductParams::SIZE_UNLIMITED;
     }
 
 }

+ 1 - 1
app/UI/Client/EmailAccount/Pages/Accounts.php

@@ -189,7 +189,7 @@ class Accounts extends DataTable implements ClientArea
                 'id'           => $account['id'],
                 'mailbox'      => $account['loginName'] . '@' . $this->maildomain,
                 'last_login'   => AccountHelper::getFormattedData($account['lastLoginInfo']['dateTime'], 'd/m/Y H:i'),
-                'quota'        => $account['diskSizeLimit']['isActive'] ?  AccountHelper::getQuotaAsMb($account['diskSizeLimit']['limit']['value']) : '∞',
+                'quota'        => $account['diskSizeLimit']['isActive'] ?  AccountHelper::getQuotaAsMb($account['diskSizeLimit']['limit']['value'],$account['diskSizeLimit']['limit']['unit']) : '∞',
                 'status'       => $account['isEnabled'] ? 'active' : 'default',
 
             ];