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

various tiny improvements

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-07-09 09:39:26 +02:00
parent a7a971f444
commit 25fa9a8121
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/functions/validate/function.validate_ip.php
View File

@@ -46,7 +46,7 @@ function validate_ip($ip, $return_bool = false, $lng = 'invalidip') {
*
* @return mixed ip address on success, false on failure
*/
function validate_ip2($ip, $return_bool = false, $lng = 'invalidip') {
function validate_ip2($ip, $return_bool = false, $lng = 'invalidip', $allow_localhost = false) {
if ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)
|| filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
@@ -55,6 +55,11 @@ function validate_ip2($ip, $return_bool = false, $lng = 'invalidip') {
return $ip;
}
// special case where localhost ip is allowed (mysql-access-hosts for example)
if ($allow_localhost && $ip == '127.0.0.1') {
return $ip;
}
if ($return_bool) {
return false;
} else {