Commit a431f5c7 authored by Marius Burkard's avatar Marius Burkard

- fixed typos from cleanup and reverted a previous commit partly

parent f7291397
......@@ -583,14 +583,6 @@ if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '') sys
if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'restart').' &> /dev/null');
if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');
//** update server services in DB
$sql = "UPDATE ?? SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, proxy_server = ?, firewall_server = ? WHERE server_id = ?";
$inst->db->query($sql, $conf['mysql']['database'].'.server', ($conf['services']['mail'] ? 1 : 0), ($conf['services']['web'] ? 1 : 0), ($conf['services']['dns'] ? 1 : 0), ($conf['services']['file'] ? 1 : 0), ($conf['services']['db'] ? 1 : 0), ($conf['services']['proxy'] ? 1 : 0), ($conf['services']['firewall'] ? 1 : 0), $conf['server_id']);
if($conf['mysql']['master_slave_setup'] == 'y') {
$inst->dbmaster->query($sql, $conf['mysql']['master_database'].'.server', ($conf['services']['mail'] ? 1 : 0), ($conf['services']['web'] ? 1 : 0), ($conf['services']['dns'] ? 1 : 0), ($conf['services']['file'] ? 1 : 0), ($conf['services']['db'] ? 1 : 0), ($conf['services']['proxy'] ? 1 : 0), ($conf['services']['firewall'] ? 1 : 0), $conf['server_id']);
}
//* test tRNG
if($conf['tRNG']) tRNG();
......
......@@ -280,7 +280,7 @@ class installer_base {
// Delete ISPConfig user in the local database, in case that it exists
$this->db->query("DROP USER ?@?", $conf['mysql']['ispconfig_user'], $from_host);
$this->db->query("DROP DATABASE IF EXISTS ?", $conf['mysql']['database']);
$this->db->query("DROP DATABASE IF EXISTS ??", $conf['mysql']['database']);
//* Create the ISPConfig database user in the local database
$query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON ?? TO ?@? IDENTIFIED BY ?';
......@@ -2237,7 +2237,7 @@ class installer_base {
$proxy_server_enabled = ($conf['services']['proxy'])?1:0;
$firewall_server_enabled = ($conf['services']['firewall'])?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', proxy_server = '$proxy_server_enabled', firewall_server = '$firewall_server_enabled WHERE server_id = ?";
$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', proxy_server = '$proxy_server_enabled', firewall_server = '$firewall_server_enabled' WHERE server_id = ?";
$this->db->query($sql, $conf['server_id']);
if($conf['mysql']['master_slave_setup'] == 'y') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment