Skip to content

Commit 80b6127

Browse files
author
A. Täffner
committed
added own query to set service config in DB - works!
1 parent a0fd093 commit 80b6127

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

install/lib/installer_base.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2334,7 +2334,7 @@ public function install_ispconfig() {
23342334
$firewall_server_enabled = ($conf['services']['firewall'])?1:0;
23352335
$xmpp_server_enabled = ($conf['services']['xmpp'])?1:0;
23362336

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 = ?";
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 = ?";
23382338

23392339
$this->db->query($sql, $conf['server_id']);
23402340
if($conf['mysql']['master_slave_setup'] == 'y') {

install/lib/mysql.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class db extends mysqli
4444
private $dbClientFlags = 0; // MySQL Client falgs
4545
/**#@-*/
4646

47-
public $show_error_messages = true; // false in server, true in interface
47+
public $show_error_messages = false; // false in server, true in interface
4848

4949

5050
/* old things - unused now ////

install/update.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
//** Check for current service config state and compare to our results
308308
if ($conf['mysql']['master_slave_setup'] == 'y') $current_svc_config = $inst->dbmaster->queryOneRecord("SELECT mail_server,web_server,dns_server,xmpp_server,firewall_server,vserver_server,db_server FROM ?? WHERE server_id=?", $conf['mysql']['master_database'] . '.server', $conf['server_id']);
309309
else $current_svc_config = $inst->db->queryOneRecord("SELECT mail_server,web_server,dns_server,xmpp_server,firewall_server,vserver_server,db_server FROM ?? WHERE server_id=?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
310-
$conf['postfix']['installed'] = check_service_config_state('mail_server', $conf['postfix']['installed']);
310+
$conf['services']['mail'] = check_service_config_state('mail_server', $conf['postfix']['installed']);
311311
$conf['services']['dns'] = check_service_config_state('dns_server', ($conf['powerdns']['installed'] || $conf['bind']['installed'] || $conf['mydns']['installed']));
312312
$conf['services']['web'] = check_service_config_state('web_server', ($conf['apache']['installed'] || $conf['nginx']['installed']));
313313
$conf['services']['xmpp'] = check_service_config_state('xmpp_server', $conf['xmpp']['installed']);
@@ -316,6 +316,13 @@
316316
$conf['services']['db'] = check_service_config_state('db_server', true); /* Will always offer as MySQL is of course installed on this host as it's a requirement for ISPC to work... */
317317
unset($current_svc_config);
318318

319+
//** Write new decisions into DB
320+
$sql = "UPDATE ?? SET mail_server = '{$conf['services']['mail']}', web_server = '{$conf['services']['web']}', dns_server = '{$conf['services']['dns']}', file_server = '{$conf['services']['file']}', db_server = '{$conf['services']['db']}', vserver_server = '{$conf['services']['vserver']}', proxy_server = '{$conf['services']['proxy']}', firewall_server = '$firewall_server_enabled', xmpp_server = '$xmpp_server_enabled' WHERE server_id = ?";
321+
$inst->db->query($sql, $conf['mysql']['database'].'.server', $conf['server_id']);
322+
if($conf['mysql']['master_slave_setup'] == 'y') {
323+
$inst->dbmaster->query($sql, $conf['mysql']['master_database'].'.server', $conf['server_id']);
324+
}
325+
319326
//** Is the ISPConfg Panel installed on this host? This might partially override user's preferences later.
320327
if($conf['apache']['installed'] == true){
321328
if(!is_file($conf['apache']['vhost_conf_dir'].'/ispconfig.vhost')) $inst->install_ispconfig_interface = false;

0 commit comments

Comments
 (0)