From 45d1576ca305c2d417120575e6b956355d0e297f Mon Sep 17 00:00:00 2001
From: zoeee <341936031@qq.com>
Date: Mon, 28 Dec 2020 18:50:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=89=E5=AE=8C=E6=95=B4IP=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E4=B8=8D=E5=86=8D=E9=9C=80=E8=A6=81=E5=85=88?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4tiny=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/function/function_misc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/upload/source/function/function_misc.php b/upload/source/function/function_misc.php
index f99a012a4..b48257ab0 100644
--- a/upload/source/function/function_misc.php
+++ b/upload/source/function/function_misc.php
@@ -26,10 +26,10 @@ function convertip($ip) {
 		} else {
 			$tinyipfile = DISCUZ_ROOT.'./data/ipdata/tinyipdata.dat';
 			$fullipfile = DISCUZ_ROOT.'./data/ipdata/wry.dat';
-			if(@file_exists($tinyipfile)) {
-				$return = convertip_tiny($ip, $tinyipfile);
-			} elseif(@file_exists($fullipfile)) {
+			if(@file_exists($fullipfile)) {
 				$return = convertip_full($ip, $fullipfile);
+			} elseif(@file_exists($tinyipfile)) {
+				$return = convertip_tiny($ip, $tinyipfile);
 			}
 		}
 	}
-- 
Gitee


From fa36d9b979cb23bb3e4275b7a7fd20231642650d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B9=96=E4=B8=AD=E6=B2=89?= <zoe@zoeee.com>
Date: Mon, 28 Dec 2020 19:05:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=89=E5=AE=8C=E6=95=B4IP=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E4=B8=8D=E5=86=8D=E9=9C=80=E8=A6=81=E5=85=88?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4tiny=E5=BA=93=EF=BC=8C=E5=B9=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=80=89=E6=8B=A9=E8=B0=83=E7=94=A8tiny=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/function/function_misc.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/upload/source/function/function_misc.php b/upload/source/function/function_misc.php
index b48257ab0..307dd45c0 100644
--- a/upload/source/function/function_misc.php
+++ b/upload/source/function/function_misc.php
@@ -11,7 +11,7 @@ if(!defined('IN_DISCUZ')) {
 	exit('Access Denied');
 }
 
-function convertip($ip) {
+function convertip($ip, $file = 'full') {
 
 	$return = '';
 
@@ -26,10 +26,18 @@ function convertip($ip) {
 		} else {
 			$tinyipfile = DISCUZ_ROOT.'./data/ipdata/tinyipdata.dat';
 			$fullipfile = DISCUZ_ROOT.'./data/ipdata/wry.dat';
-			if(@file_exists($fullipfile)) {
-				$return = convertip_full($ip, $fullipfile);
-			} elseif(@file_exists($tinyipfile)) {
-				$return = convertip_tiny($ip, $tinyipfile);
+			if($file == 'full') {
+				if(@file_exists($fullipfile)) {
+					$return = convertip_full($ip, $fullipfile);
+				} elseif(@file_exists($tinyipfile)) {
+					$return = convertip_tiny($ip, $tinyipfile);
+				}
+			} elseif($file == 'tiny') {
+				if(@file_exists($tinyipfile)) {
+					$return = convertip_tiny($ip, $tinyipfile);
+				} elseif(@file_exists($fullipfile)) {
+					$return = convertip_full($ip, $fullipfile);
+				}
 			}
 		}
 	}
-- 
Gitee