maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

validate ip address on installation

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2016-12-28 20:13:15 +01:00
parent c2a91ed623
commit 7a603596c5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
install/lib/class.FroxlorInstall.php
View File

@@ -177,10 +177,14 @@ class FroxlorInstall
} }
// check system-hostname to be a FQDN // check system-hostname to be a FQDN
if ($this->_validate_ip($this->_data['servername'], true) !== false) { if ($this->_validate_ip($this->_data['servername']) !== false) {
$this->_data['servername'] = ''; $this->_data['servername'] = '';
} }
if (empty($this->_data['serverip'] || $this->_validate_ip($this->_data['serverip']) == false)) {
return false;
}
if (isset($_POST['installstep']) && $_POST['installstep'] == '1' && $this->_data['admin_pass1'] == $this->_data['admin_pass2'] && $this->_data['admin_pass1'] != '' && $this->_data['admin_pass2'] != '' && $this->_data['mysql_unpriv_pass'] != '' && $this->_data['mysql_root_pass'] != '' && $this->_data['servername'] != '' && $this->_data['serverip'] != '' && $this->_data['httpuser'] != '' && $this->_data['httpgroup'] != '' && $this->_data['mysql_unpriv_user'] != $this->_data['mysql_root_user']) { if (isset($_POST['installstep']) && $_POST['installstep'] == '1' && $this->_data['admin_pass1'] == $this->_data['admin_pass2'] && $this->_data['admin_pass1'] != '' && $this->_data['admin_pass2'] != '' && $this->_data['mysql_unpriv_pass'] != '' && $this->_data['mysql_root_pass'] != '' && $this->_data['servername'] != '' && $this->_data['serverip'] != '' && $this->_data['httpuser'] != '' && $this->_data['httpgroup'] != '' && $this->_data['mysql_unpriv_user'] != $this->_data['mysql_root_user']) {
return true; return true;
} }
@@ -781,7 +785,7 @@ class FroxlorInstall
} }
$formdata .= $this->_getSectionItemString('servername', true, $style); $formdata .= $this->_getSectionItemString('servername', true, $style);
// serverip // serverip
if (! empty($_POST['installstep']) && $this->_data['serverip'] == '') { if (! empty($_POST['installstep']) && ($this->_data['serverip'] == '' || $this->_validate_ip($this->_data['serverip']) == false)) {
$style = 'color:red;'; $style = 'color:red;';
} else { } else {
$style = ''; $style = '';