From 9dbc3059e0c765e4e677f7c124631005de717d12 Mon Sep 17 00:00:00 2001
From: popcorner <351633+popcorner@user.noreply.gitee.com>
Date: Tue, 23 Feb 2021 23:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20=E4=BB=8E=E6=9C=AA?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=BF=87=E7=9A=84convertip=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/admincp/admincp_members.php | 2 +-
 upload/source/class/class_member.php      | 4 ++--
 upload/source/function/function_core.php  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/upload/source/admincp/admincp_members.php b/upload/source/admincp/admincp_members.php
index 44d4277ee..6d6c28848 100644
--- a/upload/source/admincp/admincp_members.php
+++ b/upload/source/admincp/admincp_members.php
@@ -2148,7 +2148,7 @@ EOF;
 				$ipbanned .= showtablerow('', array('class="td25"'), array(
 					"<input class=\"checkbox\" type=\"checkbox\" name=\"delete[$banned[id]]\" value=\"$banned[id]\" $disabled />",
 					$theip,
-					convertip($theip, "./"),
+					convertip($theip),
 					$banned[admin],
 					$banned[dateline],
 					"<input type=\"text\" class=\"txt\" size=\"10\" name=\"expirationnew[$banned[id]]\" value=\"$banned[expiration]\" $disabled />"
diff --git a/upload/source/class/class_member.php b/upload/source/class/class_member.php
index 95da5fa9a..d6ec24643 100644
--- a/upload/source/class/class_member.php
+++ b/upload/source/class/class_member.php
@@ -391,7 +391,7 @@ class register_ctl {
 		if($this->setting['regverify']) {
 			if($this->setting['areaverifywhite']) {
 				$location = $whitearea = '';
-				$location = trim(convertip($_G['clientip'], "./"));
+				$location = trim(convertip($_G['clientip']));
 				if($location) {
 					$whitearea = preg_quote(trim($this->setting['areaverifywhite']), '/');
 					$whitearea = str_replace(array("\\*"), array('.*'), $whitearea);
@@ -417,7 +417,7 @@ class register_ctl {
 		if($this->setting['regstatus'] == 2) {
 			if($this->setting['inviteconfig']['inviteareawhite']) {
 				$location = $whitearea = '';
-				$location = trim(convertip($_G['clientip'], "./"));
+				$location = trim(convertip($_G['clientip']));
 				if($location) {
 					$whitearea = preg_quote(trim($this->setting['inviteconfig']['inviteareawhite']), '/');
 					$whitearea = str_replace(array("\\*"), array('.*'), $whitearea);
diff --git a/upload/source/function/function_core.php b/upload/source/function/function_core.php
index 05fe24262..51f937c47 100644
--- a/upload/source/function/function_core.php
+++ b/upload/source/function/function_core.php
@@ -1814,7 +1814,7 @@ function periodscheck($periods, $showmessage = 1) {
 		if($_G['setting']['postignorearea']) {
 			$location = $whitearea = '';
 			require_once libfile('function/misc');
-			$location = trim(convertip($_G['clientip'], "./"));
+			$location = trim(convertip($_G['clientip']));
 			if($location) {
 				$whitearea = preg_quote(trim($_G['setting']['postignorearea']), '/');
 				$whitearea = str_replace(array("\\*"), array('.*'), $whitearea);
-- 
Gitee