fix(Tinebase/Metrics): fix mail storage calculation

tine20 · May 24, 2023 · 517f176 · 517f176
1 parent 0f424ac
commit 517f176
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/tine20/Tinebase/Server/RoutingTests.php b/tests/tine20/Tinebase/Server/RoutingTests.php
@@ -157,7 +157,7 @@ public function testMetric()
         $imapBackend = Tinebase_EmailUser::getInstance();
         if ($imapBackend instanceof Tinebase_EmailUser_Imap_Dovecot) {
             $imapUsageQuota = $imapBackend->getTotalUsageQuota();
-            $emailStorage = $imapUsageQuota['mailQuota'] * 1024 * 1024;
+            $emailStorage = $imapUsageQuota['mailQuota'];
             self::assertEquals($emailStorage, $content['emailStorage']);
             self::assertGreaterThanOrEqual(6, $content['usersWithSystemAccount']);
         }

diff --git a/tine20/Tinebase/Controller.php b/tine20/Tinebase/Controller.php
@@ -323,7 +323,7 @@ protected function _isSyncClient($accessLog)
             ActiveSync_Server_Http::REQUEST_TYPE
         ));
     }
-    
+
     /**
      * check user status
      * 
@@ -1312,7 +1312,7 @@ public function getStatusMetrics($apiKey = null)
 
             if ($imapBackend instanceof Tinebase_EmailUser_Imap_Dovecot) {
                 $imapUsageQuota = $imapBackend->getTotalUsageQuota();
-                $emailStorage = $imapUsageQuota['mailQuota'] * 1024 * 1024;
+                $emailStorage = $imapUsageQuota['mailQuota'];
                 $data = array_merge($data, ['emailStorage' => $emailStorage]);
 
                 // there are tine instances without felamimail that still have system mailaccounts