From 07a7ae1f12d635b0d7bdd07df793194840d93591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=2E=20T=C3=A4ffner?= <darkalex@firesplash.de>
Date: Thu, 8 Sep 2016 17:17:05 +0200
Subject: [PATCH] new query style for server config - but still not working as
expected...
---
install/lib/installer_base.lib.php | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index ae01955828..b8b0416328 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2333,12 +2333,11 @@ Email Address []:
$proxy_server_enabled = ($conf['services']['proxy'])?1:0;
$firewall_server_enabled = ($conf['services']['firewall'])?1:0;
$xmpp_server_enabled = ($conf['services']['xmpp'])?1:0;
-
- $sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled', proxy_server = '$proxy_server_enabled', firewall_server = '$firewall_server_enabled', xmpp_server = '.$xmpp_server_enabled.' WHERE server_id = ?";
-
- $this->db->query($sql, $conf['server_id']);
+
+ $sql = "UPDATE ?? SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ?, proxy_server = ?, firewall_server = ?, xmpp_server = ? WHERE server_id = ?";
+ $this->db->query($sql, $conf['mysql']['database'].'server', $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $proxy_server_enabled, $firewall_server_enabled, $xmpp_server_enabled, $conf['server_id']);
if($conf['mysql']['master_slave_setup'] == 'y') {
- $this->dbmaster->query($sql, $conf['server_id']);
+ $this->dbmaster->query($sql, $conf['mysql']['master_database'].'server', $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $proxy_server_enabled, $firewall_server_enabled, $xmpp_server_enabled, $conf['server_id']);
}
--
GitLab