Merge branch '6785-hd-quota-du' into 'develop'

Resolve "Error from 100-monitor_hd_quota.inc.php when a server has no sites"

Closes #6785

See merge request ispconfig/ispconfig3!1951

Author: Till Brehm

server/lib/classes/cron.d/100-monitor_hd_quota.inc.php

@@ -59,6 +59,7 @@ public function onRunJob() {
 
 		//* Initialize data array
 		$data = array();
+		$df = array();
 
 		//* the id of the server as int
 		$server_id = intval($conf['server_id']);
@@ -72,20 +73,22 @@ public function onRunJob() {
 		if(!$app->system->is_installed('setquota')) {
 			//* No Quota on this System ... 
 
-			//** Fetch the data for all users
-			$dfData = shell_exec('du -s /var/www/clients/client*/web[0-9]*');
-
-			//* split into array
-			$df = explode("\n", $dfData);
-
 			//* Get Limits for Calculation
 			$records = $app->db->queryAllRecords('SELECT hd_quota, system_user, system_group FROM `web_domain`  WHERE `server_id` = ?', $conf['server_id']);
 			foreach ($records as $record) {
 				$options['group'][$record['system_group']] = $record['hd_quota']*1024;
 				$options['user'][$record['system_user']] = $record['hd_quota']*1024;
 			}
 
-			//* ignore the first 5 lines, process the rest
+			if (!empty($records)) {
+				//** Fetch the data for all users
+				$dfData = shell_exec('du -s /var/www/clients/client*/web[0-9]*');
+
+				//* split into array
+				$df = explode("\n", $dfData);
+			}
+
+			//* Loop over all the output lines, for groups.
 			for ($i = 0; $i <= sizeof($df); $i++) {
 				if (isset($df[$i]) && $df[$i] != '') {
 					//* Make a array of the data
@@ -106,14 +109,14 @@ public function onRunJob() {
 				}
 			}		
 
-			//* ignore the first 5 lines, process the rest
+			//* Loop over all the output lines, for users.
 			for ($i = 0; $i <= sizeof($df); $i++) {
 				if (isset($df[$i]) && $df[$i] != '') {
 					//* Make a array of the data
 					$s1 = preg_split('/[\s]+/', $df[$i]);
 					$s2 = preg_split('/\//', $s1[1]);
 					$username = $s2[5];
-					if (substr($username, 0, 3) == 'web') {
+					if (preg_match('/^web\d+$/', $username)) {
 						if (isset($data['user'][$username])) {
 							$data['user'][$username]['used'] += $s1[0];
 							$data['user'][$username]['soft'] = $options['user'][$username];