Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

Author: florian030

install/lib/installer_base.lib.php

@@ -493,7 +493,7 @@ public function detect_ips(){
 						0,
 						?,
 						?,
-						"y",
+						"n",
 						"80,443"
 					)', $conf['server_id'], $ip_type, $line);
 					$server_ip_id = $this->dbmaster->insertID();
@@ -512,7 +512,7 @@ public function detect_ips(){
 						0,
 						?,
 						?,
-						"y",
+						"n",
 						"80,443"
 					)', $server_ip_id, $conf['server_id'], $ip_type, $line);
 				} else {
@@ -530,7 +530,7 @@ public function detect_ips(){
 						0,
 						?,
 						?,
-						"y",
+						"n",
 						"80,443"
 					)', $conf['server_id'], $ip_type, $line);
 				}
@@ -666,6 +666,14 @@ public function grant_master_database_rights($verbose = false) {
 					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
 				}
 
+				$query = "GRANT SELECT ON ?? TO ?@?";
+				if ($verbose){
+					echo $query ."\n";
+				}
+				if(!$this->dbmaster->query($query, $value['db'] . '.web_database', $value['user'], $host)) {
+					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
+				}
+
 				$query = "GRANT SELECT ON ?? TO ?@?";
 				if ($verbose){
 					echo $query ."\n";

interface/lib/classes/aps_guicontroller.inc.php

@@ -53,7 +53,7 @@ public function getMainDomain($domain) {
 		if (substr($domain, 0, 4) == 'www.') $domain = substr($domain, 4);
 		return $domain;
 	}
-	
+
 
 	/**
 	 * Reads in a package metadata file and registers it's namespaces
@@ -220,7 +220,7 @@ public function isValidInstanceID($id, $client_id, $is_admin = false)
 			$params[] = $client_id;
 		}
 		$params[] = $id;
-		
+
 		$result = $app->db->queryOneRecord('SELECT id FROM aps_instances WHERE '.$sql_ext.' id = ?', true, $params);
 		if(!$result) return false;
 
@@ -229,18 +229,18 @@ public function isValidInstanceID($id, $client_id, $is_admin = false)
 
 	public function createDatabaseForPackageInstance(&$settings, $websrv) {
 		global $app;
-	
+
 		$app->uses('tools_sites');
-	
+
 		$global_config = $app->getconf->get_global_config('sites');
-	
+
 		$tmp = array();
 		$tmp['parent_domain_id'] = $websrv['domain_id'];
 		$tmp['sys_groupid'] = $websrv['sys_groupid'];
 		$dbname_prefix = $app->tools_sites->replacePrefix($global_config['dbname_prefix'], $tmp);
 		$dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $tmp);
 		unset($tmp);
-	
+
 		// get information if the webserver is a db server, too
 		$web_server = $app->db->queryOneRecord("SELECT server_id,server_name,db_server FROM server WHERE server_id  = ?", $websrv['server_id']);
 		if($web_server['db_server'] == 1) {
@@ -276,14 +276,14 @@ public function createDatabaseForPackageInstance(&$settings, $websrv) {
 				* although this does not present any error message to the user.
 				*/
 				return false;
-	
+
 				/*$mysql_db_server_id = $websrv['server_id'];
 				 $settings['main_database_host'] = 'localhost';
 				$mysql_db_remote_access = 'n';
 				$mysql_db_remote_ips = '';*/
 			}
 		}
-		
+
 		if (empty($settings['main_database_name'])) {
 			//* Find a free db name for the app
 			for($n = 1; $n <= 1000; $n++) {
@@ -302,7 +302,7 @@ public function createDatabaseForPackageInstance(&$settings, $websrv) {
 			}
 			$settings['main_database_login'] = $mysql_db_user;
 		}
-		
+
 		//* Create the mysql database user if not existing
 		$tmp = $app->db->queryOneRecord("SELECT database_user_id FROM web_database_user WHERE database_user = ?", $settings['main_database_login']);
 		if(!$tmp) {
@@ -320,7 +320,7 @@ public function createDatabaseForPackageInstance(&$settings, $websrv) {
 			$mysql_db_user_id = $app->db->datalogInsert('web_database_user', $insert_data, 'database_user_id');
 		}
 		else $mysql_db_user_id = $tmp['database_user_id'];
-		
+
 		//* Create the mysql database if not existing
 		$tmp = $app->db->queryOneRecord("SELECT count(database_id) as number FROM web_database WHERE database_name = ?", $settings['main_database_name']);
 		if($tmp['number'] == 0) {
@@ -340,17 +340,15 @@ public function createDatabaseForPackageInstance(&$settings, $websrv) {
 								 "remote_access" => $mysql_db_remote_access,
 								 "remote_ips" => $mysql_db_remote_ips,
 								 "backup_copies" => $websrv['backup_copies'],
-								 "backup_format_web" => $websrv['backup_format_web'],
-								 "backup_format_db" => $websrv['backup_format_db'],
-								 "active" => 'y', 
+								 "active" => 'y',
 								 "backup_interval" => $websrv['backup_interval']
 								 );
 			$app->db->datalogInsert('web_database', $insert_data, 'database_id');
 		}
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Creates a new database record for the package instance and
 	 * an install task
@@ -398,7 +396,7 @@ public function createPackageInstance($settings, $packageid)
 			// mysql-database-name is updated inside if not set already
 			if (!$this->createDatabaseForPackageInstance($settings, $websrv)) return false;
 		}
-		
+
 		//* Insert new package instance
 		$insert_data = array(
 			"sys_userid" => $websrv['sys_userid'],
@@ -428,7 +426,7 @@ public function createPackageInstance($settings, $packageid)
 
 		//* Set package status to install afetr we inserted the settings
 		$app->db->datalogUpdate('aps_instances', array("instance_status" => INSTANCE_INSTALL), 'id', $InstanceID);
-		
+
 		return $InstanceID;
 	}
 
@@ -446,7 +444,7 @@ public function deleteInstance($instanceid, $keepdatabase = false)
 			$sql = "SELECT web_database.database_id as database_id, web_database.database_user_id as `database_user_id` FROM aps_instances_settings, web_database WHERE aps_instances_settings.value = web_database.database_name AND aps_instances_settings.name = 'main_database_name' AND aps_instances_settings.instance_id = ? LIMIT 0,1";
 			$tmp = $app->db->queryOneRecord($sql, $instanceid);
 			if($tmp['database_id'] > 0) $app->db->datalogDelete('web_database', 'database_id', $tmp['database_id']);
-	
+
 			$database_user = $tmp['database_user_id'];
 			$tmp = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `database_user_id` = ? OR `database_ro_user_id` = ?", $database_user, $database_user);
 			if($tmp['cnt'] < 1) $app->db->datalogDelete('web_database_user', 'database_user_id', $database_user);
@@ -685,7 +683,7 @@ public function validateInstallerInput($postinput, $pkg_details, $domains, $sett
 			if (isset($postinput['main_database_host'])) $input['main_database_host'] = $postinput['main_database_host'];
 			if (isset($postinput['main_database_name'])) $input['main_database_name'] = $postinput['main_database_name'];
 			if (isset($postinput['main_database_login'])) $input['main_database_login'] = $postinput['main_database_login'];
-			
+
 			if(isset($postinput['main_database_password']))
 			{
 				if($postinput['main_database_password'] == '') $error[] = $app->lng('error_no_database_pw');

interface/lib/classes/plugin_backuplist.inc.php

@@ -56,10 +56,22 @@ protected function makeBackup(&$message, &$error, $wb)
 		$sql = "SELECT count(action_id) as number FROM sys_remoteaction WHERE action_state = 'pending' AND action_type = ? AND action_param = ?";
 		$tmp = $app->db->queryOneRecord($sql, $action_type, $domain_id);
 		if ($tmp['number'] == 0) {
-			$server_id = $this->form->dataRecord['server_id'];
+			if($action_type === 'backup_database') {
+				// get all server ids of databases for this domain
+				$sql = 'SELECT `server_id` FROM `web_database` WHERE `parent_domain_id` = ?';
+				$result = $app->db->query($sql, $domain_id);
+				while(($cur = $result->get())) {
+					$server_id = $cur['server_id'];
+					$sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) VALUES (?, UNIX_TIMESTAMP(), ?, ?, 'pending', '')";
+					$app->db->query($sql, $server_id, $action_type, $domain_id);
+				}
+				$result->free();
+			} else {
+				$server_id = $this->form->dataRecord['server_id'];
+				$sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) VALUES (?, UNIX_TIMESTAMP(), ?, ?, 'pending', '')";
+				$app->db->query($sql, $server_id, $action_type, $domain_id);
+			}
 			$message .= $wb['backup_info_txt'];
-			$sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) VALUES (?, UNIX_TIMESTAMP(), ?, ?, 'pending', '')";
-			$app->db->query($sql, $server_id, $action_type, $domain_id);
 		} else {
 			$error .= $wb['backup_pending_txt'];
 		}
@@ -193,10 +205,10 @@ function onShow() {
 				$rec['backup_encrypted'] = empty($rec['backup_password']) ? $wb["no_txt"] : $wb["yes_txt"];
 				$backup_manual_prefix = 'manual-';
 				$rec['backup_job'] = (substr($rec['filename'], 0, strlen($backup_manual_prefix)) == $backup_manual_prefix) ? $wb["backup_job_manual_txt"] : $wb["backup_job_auto_txt"];
-				
+
 				$rec['download_available'] = true;
 				if($rec['server_id'] != $web['server_id']) $rec['download_available'] = false;
-				
+
 				if($rec['filesize'] > 0){
 					$rec['filesize'] = $app->functions->currency_format($rec['filesize']/(1024*1024), 'client').' MB';
 				}

interface/lib/classes/tform_actions.inc.php

@@ -141,6 +141,8 @@ function onUpdate() {
 				$app->tform->datalogSave('UPDATE', $this->id, $this->oldDataRecord, $new_data_record);
 				unset($new_data_record);
 				unset($old_data_record);
+
+				$this->onAfterDatalogSave();
 			}
 
 			if($_REQUEST["next_tab"] == '') {
@@ -222,6 +224,7 @@ function onInsert() {
 				$new_data_record = $app->tform->getDataRecord($this->id);
 				$app->tform->datalogSave('INSERT', $this->id, array(), $new_data_record);
 				unset($new_data_record);
+				$this->onAfterDatalogSave(true);
 			}
 
 
@@ -264,21 +267,19 @@ function onInsertSave($sql) {
 	}
 
 	function onBeforeUpdate() {
-		global $app, $conf;
 	}
 
 	function onBeforeInsert() {
-		global $app, $conf;
 	}
 
 	function onAfterUpdate() {
-		global $app, $conf;
 	}
 
 	function onAfterInsert() {
-		global $app, $conf;
 	}
 
+	function onAfterDatalogSave($insert = false) {
+	}
 
 	/**
 	 * Function called on data insert or update error
@@ -297,7 +298,7 @@ function onError() {
 	 */
 	function onDelete() {
 		global $app, $conf, $list_def_file, $tform_def_file;
-		
+
 		// Check CSRF Token
 		$app->auth->csrf_token_check('GET');
 

interface/web/mail/spamfilter_policy_edit.php

@@ -49,7 +49,9 @@
 $app->load('tform_actions');
 
 class page_action extends tform_actions {
-	
+
+	private $record_has_changed = false;
+
 	function onShowNew() {
 		global $app;
 
@@ -87,38 +89,40 @@ function onSubmit() {
 
 		parent::onSubmit();
 	}
-	
+
 	function onAfterUpdate() {
-		global $app;
-		
-		$record_has_changed = false;
+		$this->record_has_changed = false;
 		foreach($this->dataRecord as $key => $val) {
 			if(isset($this->oldDataRecord[$key]) && @$this->oldDataRecord[$key] != $val) {
 				// Record has changed
-				$record_has_changed = true;
+				$this->record_has_changed = true;
 			}
 		}
+	}
 
-		if($record_has_changed){
+	function onAfterDatalogSave($insert = false) {
+		global $app;
+
+		if(!$insert && $this->record_has_changed){
 			$spamfilter_users = $app->db->queryAllRecords("SELECT * FROM spamfilter_users WHERE policy_id = ?", intval($this->id));
 
 			if(is_array($spamfilter_users) && !empty($spamfilter_users)){
 				foreach($spamfilter_users as $spamfilter_user){
 					$app->db->datalogUpdate('spamfilter_users', $spamfilter_user, 'id', $spamfilter_user["id"], true);
-					
+
 					// check if this is an email domain
 					if(substr($spamfilter_user['email'],0,1) == '@') {
 						$domain = substr($spamfilter_user['email'],1);
 						$forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE source LIKE ? OR destination LIKE ?", "%@" . $domain, "%@" . $domain);
-						
+
 						// Force-update aliases and forwards
 						if(is_array($forwardings)) {
 							foreach($forwardings as $rec) {
 								$app->db->datalogUpdate('mail_forwarding', array("source" => $rec['source']), 'forwarding_id', $rec['forwarding_id'],true);
 							}
 						}
 					}
-					
+
 				}
 			}
 		}

interface/web/sites/database_edit.php

@@ -211,7 +211,7 @@ function onSubmit() {
 					unset($global_config);
 					unset($dbname_prefix);
 				}
-				
+
 				//* ensure that quota value is not 0 when quota is set for client
 				if($client['limit_database_quota'] > 0 && isset($_POST["database_quota"]) && $_POST["database_quota"] == 0) {
 					$app->tform->errorMessage .= $app->tform->lng("limit_database_quota_not_0_txt")."<br>";
@@ -364,7 +364,11 @@ function onBeforeUpdate() {
 			$server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
 
 			// Add default remote_ips from Main Configuration.
-			$remote_ips = explode(",", $global_config['default_remote_dbserver']);
+			if(empty($global_config['default_remote_dbserver'])) {
+				$remote_ips = array();
+			} else {
+				$remote_ips = explode(",", $global_config['default_remote_dbserver']);
+			}
 			if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }
 
 			if($server_config['ip_address']!='') {
@@ -449,7 +453,12 @@ function onBeforeInsert() {
 			$server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
 
 			// Add default remote_ips from Main Configuration.
-			$remote_ips = explode(",", $global_config['default_remote_dbserver']);
+			if(empty($global_config['default_remote_dbserver'])) {
+				$remote_ips = array();
+			} else {
+				$remote_ips = explode(",", $global_config['default_remote_dbserver']);
+			}
+			
 			if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }
 
 			if($server_config['ip_address']!='') {