Merge branch 'stable-3.1'

Author: Marius Burkard

install/sql/incremental/upd_dev_collection.sql

@@ -61,3 +61,4 @@ ALTER TABLE `dns_rr` CHANGE `data` `data` TEXT NOT NULL;
 ALTER TABLE `web_database` CHANGE `database_quota` `database_quota` INT(11) NULL DEFAULT NULL;
 ALTER TABLE `web_domain` ADD `log_retention` INT NOT NULL DEFAULT '30' ;
 ALTER TABLE spamfilter_policy CHANGE spam_tag_level spam_tag_level DECIMAL(5,2) NULL DEFAULT NULL, CHANGE spam_tag2_level spam_tag2_level DECIMAL(5,2) NULL DEFAULT NULL, CHANGE spam_kill_level spam_kill_level DECIMAL(5,2) NULL DEFAULT NULL, CHANGE spam_dsn_cutoff_level spam_dsn_cutoff_level DECIMAL(5,2) NULL DEFAULT NULL, CHANGE spam_quarantine_cutoff_level spam_quarantine_cutoff_level DECIMAL(5,2) NULL DEFAULT NULL;
+UPDATE `web_database` as d LEFT JOIN `web_domain` as w ON (w.domain_id = d.parent_domain_id) SET d.parent_domain_id = 0 WHERE w.domain_id IS NULL AND d.parent_domain_id != 0;

interface/lib/classes/remote.d/admin.inc.php

@@ -150,6 +150,7 @@ public function system_config_get($session_id, $section, $key) {
 			} else {
 				if(isset($system_config_array[$section])) return $system_config_array[$section];
 				else return false;
+			}
 		} else {
 			throw new SoapFault('invalid_function_parameter', 'Invalid function parameter.');
 			return false;

interface/lib/classes/remote.d/server.inc.php

@@ -55,8 +55,8 @@ public function server_get_serverid_by_ip($session_id, $ipaddress)
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		$sql = "SELECT server_id FROM server_ip WHERE ip_address  = ? LIMIT 1";
-		$all = $app->db->queryAllRecords($sql, $ipaddress);
+		$sql = "SELECT server_id FROM server_ip WHERE ip_address  = ?";
+		$all = $app->db->queryOneRecord($sql, $ipaddress);
 		return $all;
 	}
 
@@ -163,7 +163,7 @@ public function server_config_set($session_id, $server_id, $section, $key, $valu
 				$server_config_array = $app->getconf->get_server_config($server_id);
 				$server_config_array[$section][$key] = $value;
 				$server_config_str = $app->ini_parser->get_ini_string($server_config_array);
-				$app->db->datalogUpdate('server', array("config" => $server_config_str), 'server_id', $server_id);
+				return $app->db->datalogUpdate('server', array("config" => $server_config_str), 'server_id', $server_id);
 			} else {
 				throw new SoapFault('invalid_function_parameter', 'Invalid function parameter.');
 				return false;
@@ -206,7 +206,7 @@ public function server_get_serverid_by_name($session_id, $server_name)
             return false;
 		}
 		if (!empty($session_id) && !empty($server_name)) {
-			$sql = "SELECT server_id FROM server WHERE server_name  = ? LIMIT 1";
+			$sql = "SELECT server_id FROM server WHERE server_name  = ?";
 			$all = $app->db->queryOneRecord($sql, $server_name);
 			return $all;
 		} else {
@@ -228,7 +228,7 @@ public function server_get_functions($session_id, $server_id)
             return false;
 		}
 		if (!empty($session_id) && !empty($server_id)) { 
-			$sql = "SELECT mail_server, web_server, dns_server, file_server, db_server, vserver_server, proxy_server, firewall_server, mirror_server_id FROM server WHERE server_id  = ? LIMIT 1 ";
+			$sql = "SELECT mail_server, web_server, dns_server, file_server, db_server, vserver_server, proxy_server, firewall_server, mirror_server_id FROM server WHERE server_id  = ?";
 			$all = $app->db->queryOneRecord($sql, $server_id);
 			return $all;
 		} else {

interface/web/dns/dns_dkim_edit.php

@@ -118,7 +118,7 @@ function onSubmit() {
 		if (!empty($this->dataRecord['data'])) {
 			$this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
 			$this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
-			$this->dataRecord['ttl']=60;
+//			$this->dataRecord['ttl']=60;
 		}
 		// Update the serial number  and timestamp of the RR record
 		$soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);

interface/web/sites/web_vhost_domain_del.php

@@ -120,8 +120,14 @@ function onBeforeDelete() {
 					}
 				}
 			}
+			
+			//* Remove parent_domain_id from databases
+			$records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE parent_domain_id = ?", $this->id);
+			foreach($records as $rec) {
+				$app->db->datalogUpdate('web_database', array('parent_domain_id' => 0), 'database_id', $rec['database_id']);
+			}
 		}
-
+		
 		//* Delete all web folders
 		$records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = ?", $this->id);
 		foreach($records as $rec) {

server/conf/sieve_filter.master

@@ -32,7 +32,7 @@ if header :contains "X-Spam-Flag" "YES" {
   stop;
 }
 vacation  :days 1
-  :subject "Out of office reply"
+  :subject "<tmpl_var name='autoresponder_subject'>"
   # :addresses ["test@test.int", "till@test.int"]
   <tmpl_var name='addresses'>
   "<tmpl_var name='autoresponder_text'>";