From ee405d849b027618eec69425ed845afdc076b562 Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Wed, 6 May 2015 16:08:15 +0200 Subject: [PATCH] Prevent empty hostname during install --- install/install.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/install/install.php b/install/install.php index 447d79345..a8e2abc18 100644 --- a/install/install.php +++ b/install/install.php @@ -174,6 +174,18 @@ 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'); unset($tmp_out); +//** Prevent empty hostname +$conf['hostname']=trim($conf['hostname']); +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); +} + // 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.'); @@ -861,4 +873,4 @@ chmod($md5_filename,0700); echo "Installation completed.\n"; -?> \ No newline at end of file +?> -- GitLab