Merge branch 'misc-updates' into 'develop'

Misc updates

See merge request ispconfig/ispconfig3!1935

Author: Till Brehm

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

@@ -36,6 +36,8 @@ class cronjob_mailbox_stats_hourly extends cronjob {
 	protected $mail_boxes = array();
 	protected $mail_rewrites = array();
 
+	private $_tools = null;
+
 	/* this function is optional if it contains no custom code */
 	public function onPrepare() {
 		global $app;
@@ -61,7 +63,7 @@ public function onRunJob() {
 
 		$sql = "SELECT mailuser_id FROM mail_user WHERE server_id = ?";
 		$records = $app->db->queryAllRecords($sql, $conf['server_id']);
-    if(count($records) > 0) {
+		if(count($records) > 0) {
 			$this->update_last_mail_login();
 		}
 

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

@@ -73,7 +73,7 @@ public function onRunJob() {
 			//* No Quota on this System ... 
 
 			//** Fetch the data for all users
-			$dfData = shell_exec('du -s /var/www/clients/client*/we*');
+			$dfData = shell_exec('du -s /var/www/clients/client*/web[0-9]*');
 
 			//* split into array
 			$df = explode("\n", $dfData);

server/lib/classes/cron.d/300-quota_notify.inc.php

@@ -33,6 +33,8 @@ class cronjob_quota_notify extends cronjob {
 	// job schedule
 	protected $_schedule = '0 0 * * *';
 
+	private $_tools = null;
+
 	/* this function is optional if it contains no custom code */
 	public function onPrepare() {
 		global $app;

server/lib/classes/cronjob.inc.php

@@ -103,7 +103,7 @@ protected function onPrepare() {
 		// check the run time and values for this job
 
 		// remove stale cronjobs
-		$data = $app->db->queryAllRecords("SELECT `last_run` FROM `sys_cron` WHERE `name` = ? AND (`last_run` IS NOT NULL AND `last_run` < DATE_SUB(NOW(), INTERVAL 24 HOUR)) AND `running` = 1", get_class($this));
+               $data = $app->db->queryAllRecords("SELECT `name`, `last_run` FROM `sys_cron` WHERE `name` = ? AND (`last_run` IS NOT NULL AND `last_run` < DATE_SUB(NOW(), INTERVAL 24 HOUR)) AND `running` = 1", get_class($this));
 		foreach ($data as $rec) {
 			if($conf['log_priority'] <= LOGLEVEL_WARN) print "Removing stale sys_cron entry for ".get_class($this)." (last run ".$rec['last_run'].")\n";
 			$app->db->query("DELETE FROM `sys_cron` WHERE `name` = ? AND `last_run` = ? AND `running` = 1", $rec['name'], $rec['last_run']);
@@ -149,10 +149,10 @@ protected function onBeforeRun() {
 
 		// next_run time reached (reached === 0 or -1)
 
-		// calculare next run time based on last_run or current time
+		// calculate next run time based on last_run or current time
 		$app->cron->parseCronLine($this->getSchedule());
 		if($this->_no_skip == true) {
-			// we need to calculare the next run based on the previous next_run, as we may not skip one.
+			// we need to calculate the next run based on the previous next_run, as we may not skip one.
 			$next_run = $app->cron->getNextRun($this->_next_run);
 			if($next_run === false) {
 				// we could not calculate next run, try it with current time