Merge branch '5878-some-domain-s-aren-t-backed-up' into 'develop'

Resolve "Some domain's aren't backed up"

Closes #5878

See merge request ispconfig/ispconfig3!1324

Author: Marius Burkard

interface/web/sites/form/web_vhost_domain.tform.php

@@ -640,24 +640,51 @@
 
 //* Backup
 if ($backup_available) {
+
+	$domain_server_id = null;
+	if(isset($_REQUEST["id"])) {
+		$domain_id = $app->functions->intval($_REQUEST["id"]);
+		if($domain_id) {
+			$domain_data = $app->db->queryOneRecord('SELECT `server_id` FROM `web_domain` WHERE `domain_id` = ?', $domain_id);
+			if($domain_data) {
+				$domain_server_id = $domain_data['server_id'];
+			}
+		}
+	}
+	if(!$domain_server_id) {
+		$domain_server_id = $conf['server_id'];
+	}
+
 	$missing_utils = array();
-	$compressors_list = array(
-		'gzip',
-		'gunzip',
-		'zip',
-		'unzip',
-		'pigz',
-		'tar',
-		'bzip2',
-		'bunzip2',
-		'xz',
-		'unxz',
-		'7z',
-		'rar',
-	);
-	foreach ($compressors_list as $compressor) {
-		if (!$app->system->is_installed($compressor)) {
-			array_push($missing_utils, $compressor);
+	if($domain_server_id != $conf['server_id']) {
+		$mon = $app->db->queryOneRecord('SELECT `data` FROM `monitor_data` WHERE `server_id` = ? AND `type` = ? ORDER BY `created` DESC', $domain_server_id, 'backup_utils');
+		if($mon) {
+			$missing_utils = unserialize($mon['data']);
+			if(!$missing_utils) {
+				$missing_utils = array();
+			} else {
+				$missing_utils = $missing_utils['missing_utils'];
+			}
+		}
+	} else {
+		$compressors_list = array(
+			'gzip',
+			'gunzip',
+			'zip',
+			'unzip',
+			'pigz',
+			'tar',
+			'bzip2',
+			'bunzip2',
+			'xz',
+			'unxz',
+			'7z',
+			'rar',
+		);
+		foreach ($compressors_list as $compressor) {
+			if (!$app->system->is_installed($compressor)) {
+				array_push($missing_utils, $compressor);
+			}
 		}
 	}
 	$app->tpl->setVar("missing_utils", implode(", ",$missing_utils), true);

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

@@ -0,0 +1,110 @@
+<?php
+
+/*
+Copyright (c) 2013, Marius Cramer, pixcept KG
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class cronjob_monitor_backup extends cronjob {
+
+	// job schedule
+	protected $_schedule = '*/5 * * * *';
+	protected $_run_at_new = true;
+
+	private $_tools = null;
+
+	/* this function is optional if it contains no custom code */
+	public function onPrepare() {
+		parent::onPrepare();
+	}
+
+	/* this function is optional if it contains no custom code */
+	public function onBeforeRun() {
+		return parent::onBeforeRun();
+	}
+
+	public function onRunJob() {
+		global $app, $conf;
+
+		/* used for all monitor cronjobs */
+		$app->load('monitor_tools');
+		$this->_tools = new monitor_tools();
+		/* end global section for monitor cronjobs */
+
+		/* the id of the server as int */
+		$server_id = intval($conf['server_id']);
+
+		/** The type of the data */
+
+
+		$type = 'backup_utils';
+
+		$missing_utils = array();
+		$compressors_list = array(
+			'gzip',
+			'gunzip',
+			'zip',
+			'unzip',
+			'pigz',
+			'tar',
+			'bzip2',
+			'bunzip2',
+			'xz',
+			'unxz',
+			'7z',
+			'rar',
+		);
+		foreach ($compressors_list as $compressor) {
+			if (!$app->system->is_installed($compressor)) {
+				$missing_utils[] = $compressor;
+			}
+		}
+
+		$res = array();
+		$res['server_id'] = $server_id;
+		$res['type'] = $type;
+		$res['data'] = array('missing_utils' => $missing_utils);
+		$res['state'] = 'ok';
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
+			'VALUES (?, ?, UNIX_TIMESTAMP(), ?, ?)';
+		$app->dbmaster->query($sql, $res['server_id'], $res['type'], serialize($res['data']), $res['state']);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_tools->delOldRecords($res['type'], $res['server_id']);
+
+		parent::onRunJob();
+	}
+
+	/* this function is optional if it contains no custom code */
+	public function onAfterRun() {
+		parent::onAfterRun();
+	}
+
+}