--- fenglin/lib/client_addr.inc.php	2004/06/10 20:37:11	1.2
+++ fenglin/lib/client_addr.inc.php	2025/04/23 05:13:57	1.12
@@ -1,41 +1,11 @@
-<?
-
-function Client_Address()
+<?php
+	require_once "../lib/ip_mask.inc.php";
+?>
+<?php
+function client_addr(int $mask_level = 0) : string
 {
-	$proxy_ip = array(
-		"^61.129.42.22[01]$",
-		"^10.85.31.[0-9]{1,3}$",
-		"^192.168.176.57$"
-	);
+	$ip = (isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : "");
 
-	foreach($proxy_ip as $ip)
-	{
-		if (ereg($ip,$_SERVER["REMOTE_ADDR"]))
-		{
-			if (isset($_SERVER["HTTP_X_CLIENT_ADDR"]))
-			{
-				$client_addr = explode(",",$_SERVER["HTTP_X_CLIENT_ADDR"]);
-				for($i=count($_SERVER["HTTP_X_CLIENT_ADDR"])-1;$i>=0;$i--)
-				{
-					$proxy = false;
-					foreach($proxy_ip as $ip)
-					{
-						if (ereg($ip,$_SERVER["REMOTE_ADDR"]))
-							$proxy = true;
-					}
-					if (!$proxy)
-						return trim($client_addr[$i]);
-				}
-				return trim($client_addr[0]);
-			}
-			else
-			{
-				return $_SERVER["REMOTE_ADDR"];
-			}
-		}
-	}
-
-	return $_SERVER["REMOTE_ADDR"];
+	return ip_mask($ip, $mask_level, "%");
 }
-
 ?>