From 2a05c8f83db0106a6a655f859806aa908e488427 Mon Sep 17 00:00:00 2001
From: Comsenz <10433182@qq.com>
Date: Tue, 1 Aug 2017 09:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utility/update.php | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/utility/update.php b/utility/update.php
index be18c37..eadad14 100644
--- a/utility/update.php
+++ b/utility/update.php
@@ -425,8 +425,8 @@ if($_GET['step'] == 'start') {
 		}
 
 		if(isset($settings['thumbsource']) && !$settings['sourcewidth'] && !$settings['sourceheight']) {
-			$newsettings['sourcewidth'] = $setting['thumbwidth'];
-			$newsettings['sourceheight'] = $setting['thumbheight'];
+			$newsettings['sourcewidth'] = $settings['thumbwidth'];
+			$newsettings['sourceheight'] = $settings['thumbheight'];
 		}
 
 		if(empty($settings['my_siteid']) && !empty($settings['connectsiteid'])) {
@@ -752,7 +752,7 @@ if($_GET['step'] == 'start') {
 				$newsettings['seccodestatus'] = $seccodecheck;
 			}
 		}
-		$seccodedata = dunserialize($setting['seccodedata']);
+		$seccodedata = dunserialize($settings['seccodedata']);
 		if(!$seccodedata['rule']) {
 			$seccodestatuss = sprintf('%05b', $seccodecheck);
 			$seccodedata['rule']['register']['allow'] = $seccodestatuss{4};
@@ -760,6 +760,7 @@ if($_GET['step'] == 'start') {
 			$seccodedata['rule']['post']['allow'] = $seccodestatuss{2};
 			$seccodedata['rule']['password']['allow'] = $seccodestatuss{1};
 			$seccodedata['rule']['card']['allow'] = $seccodestatuss{0};
+			$seccodedata['seccodedata']['type'] = intval($seccodedata['seccodedata']['type']);
 			$newsettings['seccodedata'] = serialize($seccodedata);
 		}
 		if(!isset($settings['collectionteamworkernum'])) {
@@ -1891,20 +1892,6 @@ if($_GET['step'] == 'start') {
 	show_msg("默认风格已恢复，进入下一步", "$theurl?step=cache");
 
 } elseif ($_GET['step'] == 'cache') {
-	$appService = Cloud::loadClass('Service_App');
-	try {
-		$cloudstatus = $appService->checkCloudStatus();
-	} catch (Exception $e) {
-	}
-	$result = false;
-	if($cloudstatus == 'cloud' && !$appService->getCloudAppStatus('search')) {
-		try{
-			$cloudAppService = Cloud::loadClass('Service_Client_Cloud');
-			$result = $cloudAppService->appOpen();
-		} catch(Exception $e) {
-		}
-	}
-
 
 	if($result == true) {
 		$opensoso = '<br><br>友情提示：<br>为更好的降低论坛搜索时的数据压力，本次升级已经帮本站开通纵横搜索服务。<br>你可以在 <a href=\\\'../admin.php?frames=yes&action=cloud&operation=search\\\' target=\\\'_blank\\\'>站点后台-&gt;应用-&gt;纵横搜索 进行管理</a>。';