From f357b3816347a257e3120328091da35154e19d53 Mon Sep 17 00:00:00 2001
From: Comsenz <10433182@qq.com>
Date: Mon, 10 Jul 2017 10:18:45 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=A1=A5=E5=85=85X3.3=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E4=BA=91=E5=B9=B3=E5=8F=B0=E6=8F=92=E4=BB=B6=E9=99=8D?=
 =?UTF-8?q?=E7=BA=A7=E5=B7=A5=E5=85=B7"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4343a93279527c41d6ced1a3ef79f76a06618c86.
---
 utility/update.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/utility/update.php b/utility/update.php
index 58103dc..be18c37 100644
--- a/utility/update.php
+++ b/utility/update.php
@@ -1751,7 +1751,7 @@ if($_GET['step'] == 'start') {
 		}
 		show_msg("用户勋章数据升级完毕", "$theurl?step=data&op=$nextop");
 	} elseif($_GET['op'] == 'closeswitch') {
-		$nextop = 'clearCloud';
+		$nextop = 'end';
 		if($first_to_2_5) {
 			$newsettings = array();
 			$newsettings['strongpw'] = 0;
@@ -1759,21 +1759,6 @@ if($_GET['step'] == 'start') {
 			C::t('common_setting')->update_batch($newsettings);
 		}
 		show_msg("数据升级结束", "$theurl?step=data&op=$nextop");
-	} elseif($_GET['op'] == 'clearCloud') {
-		$nextop = 'end';
-		
-		$plugins = array('qqconnect', 'cloudstat', 'soso_smilies', 'security', 'pcmgr_url_safeguard', 'manyou', 'cloudcaptcha');
-		foreach($plugins as $pluginid) {			
-			$plugin = C::t('common_plugin')->fetch_by_identifier($pluginid);
-			if($plugin) {
-				$modules = unserialize($plugin['modules']);
-				$modules['system'] = 0;
-				$modules = serialize($modules);
-				C::t('common_plugin')->update($plugin['pluginid'], array('modules' => $modules));
-			}			
-		}
-		
-		show_msg("云平台插件已降为非系统级插件", "$theurl?step=data&op=$nextop");		
 	} else {
 
 		$deletevar = array('app', 'home');//config中需要删除的项目
@@ -1906,6 +1891,20 @@ 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>。';