Merge remote-tracking branch 'refs/remotes/origin/php8' into php8

This commit is contained in:
lgb
2024-01-23 10:32:54 +08:00
+4 -2
View File
@@ -49,7 +49,7 @@ function validip($ip)
else return false; else return false;
} }
function getip() { function getip($real = true) {
if (isset($_SERVER)) { if (isset($_SERVER)) {
if (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && validip($_SERVER['HTTP_X_FORWARDED_FOR'])) { if (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && validip($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
@@ -67,7 +67,9 @@ function getip() {
$ip = getenv('REMOTE_ADDR') ?? ''; $ip = getenv('REMOTE_ADDR') ?? '';
} }
} }
if ($real) {
return strstr($ip, ",", true);
}
return $ip; return $ip;
} }