From 204cd00e3e670c007f417126aaeb201e12462849 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 29 Jan 2019 10:36:34 +0800
Subject: [PATCH]  * adjust for xuanxuan.

---
 module/upgrade/model.php                       | 2 ++
 xuanxuan/module/admin/ext/control/xuanxuan.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 0f9d53eaac..758df2c013 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -352,6 +352,8 @@ class upgradeModel extends model
             {
                 $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.3.0.sql';
                 $this->execSQL($xuanxuanSql);
+                $this->dao->update(TABLE_CONFIG)->set('value')->eq('off')->where('`key`')->eq('isHttps')->andWhere('`section`')->eq('xuanxuan')->andWhere('`value`')->eq('0')->exec();
+                $this->dao->update(TABLE_CONFIG)->set('value')->eq('on')->where('`key`')->eq('isHttps')->andWhere('`section`')->eq('xuanxuan')->andWhere('`value`')->eq('1')->exec();
             }
         }
 
diff --git a/xuanxuan/module/admin/ext/control/xuanxuan.php b/xuanxuan/module/admin/ext/control/xuanxuan.php
index 904aa09f7b..b143f60786 100644
--- a/xuanxuan/module/admin/ext/control/xuanxuan.php
+++ b/xuanxuan/module/admin/ext/control/xuanxuan.php
@@ -17,7 +17,7 @@ class admin extends control
 
             if(!is_numeric($setting->chatPort) or (int)$setting->chatPort <= 0 or (int)$setting->chatPort > 65535) $errors['chatPort'] = $this->lang->chat->xxdPortError;
             if(!is_numeric($setting->commonPort) or (int)$setting->commonPort <= 0 or (int)$setting->commonPort > 65535) $errors['commonPort'] = $this->lang->chat->xxdPortError;
-            if($setting->isHttps)
+            if($setting->isHttps == 'on')
             {
                 if(empty($setting->sslcrt)) $errors['sslcrt'] = $this->lang->chat->errorSSLCrt;
                 if(empty($setting->sslkey)) $errors['sslkey'] = $this->lang->chat->errorSSLKey;