Merge branch 'alexalouit/ispconfig3-master'

Marius Burkard · Marius Burkard · commit aabef8c5f95e · 2017-10-23T20:00:32.000+02:00
diff --git a/interface/lib/classes/remote.d/server.inc.php b/interface/lib/classes/remote.d/server.inc.php
@@ -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  = ?";
+			$sql = "SELECT mail_server, web_server, dns_server, file_server, db_server, vserver_server, proxy_server, firewall_server, xmpp_server, mirror_server_id FROM server WHERE server_id  = ?";
 			$all = $app->db->queryOneRecord($sql, $server_id);
 			return $all;
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public function server_get_functions($session_id, $server_id)`
`228`	`228`	`return false;`
`229`	`229`	`}`
`230`	`230`	`if (!empty($session_id) && !empty($server_id)) {`
`231`		`- $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 = ?";`
	`231`	`+ $sql = "SELECT mail_server, web_server, dns_server, file_server, db_server, vserver_server, proxy_server, firewall_server, xmpp_server, mirror_server_id FROM server WHERE server_id = ?";`
`232`	`232`	`$all = $app->db->queryOneRecord($sql, $server_id);`
`233`	`233`	`return $all;`
`234`	`234`	`} else {`