--- fenglin/lib/client_addr.inc.php	2025/03/02 02:32:22	1.10
+++ fenglin/lib/client_addr.inc.php	2025/04/29 11:55:32	1.13
@@ -1,15 +1,9 @@
-<?
-require_once "common.inc.php";
+<?php
+	require_once "../lib/ip_mask.inc.php";
 
-function Client_Address($addr=null,$x_addr=null)
-{
-	if ($addr == null)
-		$addr = $_SERVER["REMOTE_ADDR"];
+	function client_addr(int $mask_level = 0) : string
+	{
+		$ip = (isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : "");
 
-	if ($x_addr == null && isset($_SERVER["HTTP_X_FORWARDED_FOR"]))
-		$x_addr = $_SERVER["HTTP_X_FORWARDED_FOR"];
-
-	return $_SERVER["REMOTE_ADDR"];
-}
-
-?>
+		return ip_mask($ip, $mask_level, "%");
+	}