Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
lolo888
ISPConfig 3
Commits
ed30c601
Commit
ed30c601
authored
Jul 25, 2011
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some warnings in the installer.
parent
c5d17d3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+1
-0
install/lib/update.lib.php
install/lib/update.lib.php
+2
-2
No files found.
install/lib/installer_base.lib.php
View file @
ed30c601
...
...
@@ -554,6 +554,7 @@ class installer_base {
$virtual_domains
=
"' '"
;
$content
=
str_replace
(
'{hostname}'
,
$conf
[
'hostname'
],
$content
);
if
(
!
isset
(
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]))
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]
=
''
$content
=
str_replace
(
'{default_language}'
,
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
],
$content
);
$content
=
str_replace
(
'{virtual_domains}'
,
$virtual_domains
,
$content
);
...
...
install/lib/update.lib.php
View file @
ed30c601
...
...
@@ -95,8 +95,8 @@ function updateDbAndIni() {
$conf
[
'services'
][
'file'
]
=
(
$tmp
[
'file_server'
]
==
1
)
?
true
:
false
;
$conf
[
'services'
][
'db'
]
=
(
$tmp
[
'db_server'
]
==
1
)
?
true
:
false
;
$conf
[
'services'
][
'vserver'
]
=
(
$tmp
[
'vserver_server'
]
==
1
)
?
true
:
false
;
$conf
[
'services'
][
'proxy'
]
=
(
$tmp
[
'proxy_server'
]
==
1
)
?
true
:
false
;
$conf
[
'services'
][
'firewall'
]
=
(
$tmp
[
'firewall_server'
]
==
1
)
?
true
:
false
;
$conf
[
'services'
][
'proxy'
]
=
(
isset
(
$tmp
[
'proxy_server'
])
&&
$tmp
[
'proxy_server'
]
==
1
)
?
true
:
false
;
$conf
[
'services'
][
'firewall'
]
=
(
isset
(
$tmp
[
'firewall_server'
])
&&
$tmp
[
'firewall_server'
]
==
1
)
?
true
:
false
;
$conf
[
'postfix'
][
'vmail_mailbox_base'
]
=
$ini_array
[
'mail'
][
'homedir_path'
];
...
...
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