--- fenglin/lib/client_addr.inc.php	2004/06/20 19:49:02	1.3
+++ fenglin/lib/client_addr.inc.php	2005/03/12 08:29:35	1.7
@@ -1,27 +1,31 @@
 <?
+require_once "common.inc.php";
 
-function Client_Address()
+function Client_Address($addr=null,$x_addr=null)
 {
-	$proxy_ip = array(
-		"^61.129.42.22[01]$",
-		"^203.95.5.66$",
-		"^10.85.31.[0-9]{1,3}$",
-		"^192.168.176.57$"
-	);
+	global $SYS_proxy_ip;
+
+	$proxy_ip = $SYS_proxy_ip;
+
+	if ($addr == null)
+		$addr = $_SERVER["REMOTE_ADDR"];
+
+	if ($x_addr == null && isset($_SERVER["HTTP_X_FORWARDED_FOR"]))
+		$x_addr = $_SERVER["HTTP_X_FORWARDED_FOR"];
 
 	foreach($proxy_ip as $ip)
 	{
-		if (ereg($ip,$_SERVER["REMOTE_ADDR"]))
+		if (ereg($ip[0],$addr))
 		{
-			if (isset($_SERVER["HTTP_X_CLIENT_ADDR"]))
+			if ($x_addr != null)
 			{
-				$client_addr = explode(",",$_SERVER["HTTP_X_CLIENT_ADDR"]);
-				for($i=count($_SERVER["HTTP_X_CLIENT_ADDR"])-1;$i>=0;$i--)
+				$client_addr = explode(",",$x_addr);
+				for($i=count($client_addr)-1;$i>=0;$i--)
 				{
 					$proxy = false;
 					foreach($proxy_ip as $ip)
 					{
-						if (ereg($ip,$_SERVER["REMOTE_ADDR"]))
+						if (ereg($ip[0],$client_addr[$i]))
 							$proxy = true;
 					}
 					if (!$proxy)