usageupdate

clientarea.tpl

@@ -152,15 +152,14 @@
             <div class="card panel panel-tabs">
               <div class="card-header">
                 <ul class="nav nav-pills card-header-pills flex-column flex-md-row">
-                  {if $lastupdate}
                     <li class="nav-item">
-                      <i class="fas fa-inbox fa-fw"></i> {lang key='resourceUsage'}
-                    <div class="tiles clearfix">
+                      <i class="fas fa-inbox fa-fw"></i> Speicherplatz {$quota}MB von {$limit} belegt
+                      <div class="tiles clearfix">
                       <div class="my-3 my-md-0" aria-live="polite">
                         <div class="tile">
                           <div style="positon:relative;">
                             <div style="position: absolute; min-width: 100%; min-height: 10px; border: 1px solid black;"></div>
-                            <div style="position: absolute; min-width: 80%; min-height: 10px; background-color: #1b5f8f;"></div>
+                            <div style="position: absolute; min-width: {round($quota * 100 / $limit)}%; min-height: 10px; background-color: #1b5f8f;"></div>
                           </div>
                         </div>
                       </div>

siteBuilder.php

@@ -370,22 +370,18 @@ function siteBuilder_ClientArea($params) {
 		}
 		array_push($clientInfo['sites'],['name' => $site->name, 'sslSite' => $sslSite, 'enabled' => $site->enabled]);
 	}
-	$quota = $siteBuilder->getQuota($params['username']);
-	logModuleCall(
-		'siteBuilder',
-		__FUNCTION__,
-		$clientInfo,
-		'debug',
-		$quota
-		);
-	$stats = $siteBuilder->getStats();
-	logModuleCall(
-		'siteBuilder',
-		__FUNCTION__,
-		$clientInfo,
-		'debug',
-		$stats
-		);
+	$response = $siteBuilder->getQuota($params['username']);
+	if($response['status'] != '200') {
+		logModuleCall(
+			'siteBuilder',
+			__FUNCTION__,
+			$params,
+			'Error getting Quota',
+			$response
+			);
+	}
+	$clientInfo['quota'] = round($response['response']['quota'][0]['blocks']/1024);
+	$clientInfo['limit'] = round($response['response']['quota'][0]['hard']/1024);
 	return array(
         'tabOverviewReplacementTemplate' => 'clientarea',
         'vars' => $clientInfo,