From e93c50951090052a9c46f662cb3d0495ba87205a Mon Sep 17 00:00:00 2001
From: popcorner <351633+popcorner@user.noreply.gitee.com>
Date: Tue, 17 Jan 2023 10:21:36 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20UCenter=20ipgetter=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=20PHP5=20=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: popcorner <351633+popcorner@user.noreply.gitee.com>
---
 upload/install/include/install_function.php | 2 +-
 upload/uc_client/model/base.php             | 2 +-
 upload/uc_server/install/func.inc.php       | 2 +-
 upload/uc_server/model/base.php             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/upload/install/include/install_function.php b/upload/install/include/install_function.php
index c23c73625..32b6dcab8 100644
--- a/upload/install/include/install_function.php
+++ b/upload/install/include/install_function.php
@@ -1678,7 +1678,7 @@ function uc_write_config($config, $file, $password) {
 	$config .= "define('UC_PPP', 20);\r\n";
 	$config .= "define('UC_ONLYREMOTEADDR', 1);\r\n";
 	$config .= "define('UC_IPGETTER', 'header');\r\n";
-	$config .= "define('UC_IPGETTER_HEADER', array('header' => 'HTTP_X_FORWARDED_FOR'));\r\n";
+	$config .= "// define('UC_IPGETTER_HEADER', serialize(array('header' => 'HTTP_X_FORWARDED_FOR')));\r\n";
 
 	file_put_contents($file, $config);
 }
diff --git a/upload/uc_client/model/base.php b/upload/uc_client/model/base.php
index d9b514c8c..377240100 100644
--- a/upload/uc_client/model/base.php
+++ b/upload/uc_client/model/base.php
@@ -57,7 +57,7 @@ class base {
 		if (!defined('UC_ONLYREMOTEADDR') || (defined('UC_ONLYREMOTEADDR') && !constant('UC_ONLYREMOTEADDR'))) {
 			require_once UC_ROOT.'./lib/ucip.class.php';
 			if(defined('UC_IPGETTER') && !empty(constant('UC_IPGETTER'))) {
-				$s = defined('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER'))) && is_array(constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER')))) ? constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER'))) : array();
+				$s = defined('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER'))) ? (is_string(constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER')))) ? unserialize(constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER')))) : constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER')))) : array();
 				$c = 'ucip_getter_'.strtolower(constant('UC_IPGETTER'));
 				require_once UC_ROOT.'./lib/'.$c.'.class.php';
 				$r = $c::get($s);
diff --git a/upload/uc_server/install/func.inc.php b/upload/uc_server/install/func.inc.php
index d41a0114d..6c6ea78ac 100644
--- a/upload/uc_server/install/func.inc.php
+++ b/upload/uc_server/install/func.inc.php
@@ -643,7 +643,7 @@ function config_edit() {
 	$config .= "define('UC_PPP', 20);\r\n";
 	$config .= "define('UC_ONLYREMOTEADDR', 1);\r\n";
 	$config .= "define('UC_IPGETTER', 'header');\r\n";
-	$config .= "define('UC_IPGETTER_HEADER', array('header' => 'HTTP_X_FORWARDED_FOR'));\r\n";
+	$config .= "// define('UC_IPGETTER_HEADER', serialize(array('header' => 'HTTP_X_FORWARDED_FOR')));\r\n";
 
 	file_put_contents(CONFIG, $config);
 }
diff --git a/upload/uc_server/model/base.php b/upload/uc_server/model/base.php
index 59ee3b61f..3cdba5f6b 100644
--- a/upload/uc_server/model/base.php
+++ b/upload/uc_server/model/base.php
@@ -50,7 +50,7 @@ class base {
 		if (!defined('UC_ONLYREMOTEADDR') || (defined('UC_ONLYREMOTEADDR') && !constant('UC_ONLYREMOTEADDR'))) {
 			require_once UC_ROOT.'./lib/ucip.class.php';
 			if(defined('UC_IPGETTER') && !empty(constant('UC_IPGETTER'))) {
-				$s = defined('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER'))) && is_array(constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER')))) ? constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER'))) : array();
+				$s = defined('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER'))) ? (is_string(constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER')))) ? unserialize(constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER')))) : constant('UC_IPGETTER_'.strtoupper(constant('UC_IPGETTER')))) : array();
 				$c = 'ucip_getter_'.strtolower(constant('UC_IPGETTER'));
 				require_once UC_ROOT.'./lib/'.$c.'.class.php';
 				$r = $c::get($s);
-- 
Gitee