Skip to content

Commit a0fd093

Browse files
author
A. Täffner
committed
Revert "new query style for server config - but still not working as expected..."
It broke the installer This reverts commit 07a7ae1. Conflicts: install/lib/installer_base.lib.php
1 parent 024da85 commit a0fd093

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

install/lib/installer_base.lib.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,11 +2333,12 @@ public function install_ispconfig() {
23332333
$proxy_server_enabled = ($conf['services']['proxy'])?1:0;
23342334
$firewall_server_enabled = ($conf['services']['firewall'])?1:0;
23352335
$xmpp_server_enabled = ($conf['services']['xmpp'])?1:0;
2336-
2337-
$sql = "UPDATE ?? SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ?, proxy_server = ?, firewall_server = ?, xmpp_server = ? WHERE server_id = ?";
2338-
$this->db->query($sql, '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']);
2336+
2337+
$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 = ?";
2338+
2339+
$this->db->query($sql, $conf['server_id']);
23392340
if($conf['mysql']['master_slave_setup'] == 'y') {
2340-
$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']);
2341+
$this->dbmaster->query($sql, $conf['server_id']);
23412342
}
23422343

23432344

0 commit comments

Comments
 (0)