Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jozef Sroka
ISPConfig 3
Commits
024da851
Commit
024da851
authored
Sep 08, 2016
by
A. Täffner
Browse files
temp commit - will likely be reverted
parent
07a7ae1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
install/lib/installer_base.lib.php
View file @
024da851
...
...
@@ -2335,7 +2335,7 @@ Email Address []:
$xmpp_server_enabled
=
(
$conf
[
'services'
][
'xmpp'
])
?
1
:
0
;
$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'
]);
$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'
]);
if
(
$conf
[
'mysql'
][
'master_slave_setup'
]
==
'y'
)
{
$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'
]);
}
...
...
install/lib/mysql.lib.php
View file @
024da851
...
...
@@ -44,7 +44,7 @@ class db extends mysqli
private
$dbClientFlags
=
0
;
// MySQL Client falgs
/**#@-*/
public
$show_error_messages
=
fals
e
;
// false in server, true in interface
public
$show_error_messages
=
tru
e
;
// false in server, true in interface
/* old things - unused now ////
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment