Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Christian
ISPConfig 3
Commits
f7291397
Commit
f7291397
authored
Nov 14, 2018
by
Marius Burkard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- fixed data type passed to db query in installer
parent
1151f833
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
install/install.php
install/install.php
+3
-3
No files found.
install/install.php
View file @
f7291397
...
...
@@ -584,10 +584,10 @@ if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '') s
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 =
'
{
$conf
[
'services'
][
'mail'
]
}
', web_server = '
{
$conf
[
'services'
][
'web'
]
}
', dns_server = '
{
$conf
[
'services'
][
'dns'
]
}
', file_server = '
{
$conf
[
'services'
][
'file'
]
}
', db_server = '
{
$conf
[
'services'
][
'db'
]
}
', proxy_server = '
{
$conf
[
'services'
][
'proxy'
]
}
', firewall_server = '
$firewall_server_enabled
'
WHERE server_id = ?"
;
$inst
->
db
->
query
(
$sql
,
$conf
[
'mysql'
][
'database'
]
.
'.server'
,
$conf
[
'server_id'
]);
$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
[
'server_id'
]);
$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'
]);
}
...
...
Write
Preview
Markdown
is supported
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