UsageUpdate

app/Http/Actions/UsageUpdate.php

@@ -41,16 +41,29 @@ class UsageUpdate extends AddonController
 					'consumedSize'
                 );
                 $users = $api->getUsers($fields,$domainID);
-                $mailboxes = $users['totalItems'];
+                $mailboxes = count($users);
                 $totalUsage = 0;
-                if ($users['totalItems'] > 0) {
-                    foreach ($users['list'] as $user) {
-                        $usage = $user['consumedSize']['value'];
+                if ($mailboxes > 0) {
+                    foreach ($users as $user) {
+                        switch($user['consumedSize']['units']) {
+                            case 'Bytes' :
+                                $usage = $user['consumedSize']['value']/1024/1024/1024;
+                                break;
+                            case 'KiloBytes' :
+                                $usage = $user['consumedSize']['value']/1024/1024;
+                                break;
+                            case 'MegaBytes' :
+                                $usage = $user['consumedSize']['value']/1024;
+                                break;
+                            case 'GigaBytes' :
+                                $usage = $user['consumedSize']['value'];
+                                break;
+                        }
                         $totalUsage += $usage;
                     }
                 }
 
-                $storage = $totalUsage == 0 ? 0 : round($totalUsage/1024/1024);
+                $storage = $totalUsage == 0 ? 0 : round($totalUsage);
                 $serverId =$params['serverid'];
 
                 Whmcs\Hosting::where('server', $serverId)->where('domain', $domainName)->update(['bwusage' => $mailboxes]);