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
MK
ISPConfig 3
Commits
bb690d44
Commit
bb690d44
authored
May 07, 2015
by
Florian Schaal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated avoid the second use of query in install.php
parent
7eade0da
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
14 deletions
+9
-14
install/install.php
install/install.php
+9
-14
No files found.
install/install.php
View file @
bb690d44
...
...
@@ -171,21 +171,16 @@ $install_mode = $inst->simple_query('Installation mode', array('standard', 'expe
//** Get the hostname
$tmp_out
=
array
();
exec
(
'hostname -f'
,
$tmp_out
);
$conf
[
'hostname'
]
=
$inst
->
free_query
(
'Full qualified hostname (FQDN) of the server, eg server1.domain.tld '
,
@
$tmp_out
[
0
],
'hostname'
);
//** Prevent empty hostname
$conf
[
'hostname'
]
=
trim
(
@
$tmp_out
[
0
]);
$conf
[
'hostname'
]
=
$tmp_out
[
0
];
unset
(
$tmp_out
);
if
(
$conf
[
'hostname'
]
===
''
)
{
$check
=
false
;
do
{
swriteln
(
'Hostname may not be empty.'
);
$conf
[
'hostname'
]
=
$inst
->
free_query
(
'Full qualified hostname (FQDN) of the server, eg server1.domain.tld '
,
''
,
'hostname'
);
$conf
[
'hostname'
]
=
trim
(
$conf
[
'hostname'
]);
$check
=
@
(
$conf
[
'hostname'
]
!==
''
)
?
true
:
false
;
}
while
(
!
$check
);
}
//** Prevent empty hostname
$check
=
false
;
do
{
$conf
[
'hostname'
]
=
$inst
->
free_query
(
'Full qualified hostname (FQDN) of the server, eg server1.domain.tld '
,
$conf
[
'hostname'
],
'hostname'
);
$conf
[
'hostname'
]
=
trim
(
$conf
[
'hostname'
]);
$check
=
@
(
$conf
[
'hostname'
]
!==
''
)
?
true
:
false
;
if
(
!
$check
)
swriteln
(
'Hostname may not be empty.'
);
}
while
(
!
$check
);
// Check if the mysql functions are loaded in PHP
if
(
!
function_exists
(
'mysql_connect'
))
die
(
'No PHP MySQL functions available. Please ensure that the PHP MySQL module is loaded.'
);
...
...
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