--- fenglin/lib/client_addr.inc.php	2004/06/10 20:37:11	1.2
+++ fenglin/lib/client_addr.inc.php	2025/03/02 02:32:22	1.10
@@ -1,39 +1,13 @@
 <?
+require_once "common.inc.php";
 
-function Client_Address()
+function Client_Address($addr=null,$x_addr=null)
 {
-	$proxy_ip = array(
-		"^61.129.42.22[01]$",
-		"^10.85.31.[0-9]{1,3}$",
-		"^192.168.176.57$"
-	);
+	if ($addr == null)
+		$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"];
-			}
-		}
-	}
+	if ($x_addr == null && isset($_SERVER["HTTP_X_FORWARDED_FOR"]))
+		$x_addr = $_SERVER["HTTP_X_FORWARDED_FOR"];
 
 	return $_SERVER["REMOTE_ADDR"];
 }