From 5681905c68ef36cfb36c44fab5e6fd8f163bdfdc Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 18 Mar 2020 14:39:02 +0800
Subject: [PATCH]  * finish task #6993.

---
 .../ext/model/class/xuanxuan.class.php        |  1 +
 .../misc/ext/control/ajaxsetclientconfig.php  |  2 ++
 .../misc/ext/control/downloadclient.php       | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/xuanxuan/module/message/ext/model/class/xuanxuan.class.php b/xuanxuan/module/message/ext/model/class/xuanxuan.class.php
index 4c8177fae9..723117c375 100644
--- a/xuanxuan/module/message/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/module/message/ext/model/class/xuanxuan.class.php
@@ -20,6 +20,7 @@ class xuanxuanMessage extends messageModel
                 $onlybody = isset($_GET['onlybody']) ? $_GET['onlybody'] : '';
                 unset($_GET['onlybody']);
                 $url = $server . helper::createLink($objectType, 'view', "id=$objectID", 'xhtml');
+                $url = "xxc:openInApp/zentao-integrated/" . urlencode($url);
 
                 $target = '';
                 if(!empty($object->assignedTo)) $target .= $object->assignedTo;
diff --git a/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php b/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php
index 96909d81f0..ae7ab7d0b7 100755
--- a/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php
+++ b/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php
@@ -23,6 +23,8 @@ class myMisc extends misc
         $loginInfo->ui->defaultUser = new stdclass();
         $loginInfo->ui->defaultUser->server  = common::getSysURL();;
         $loginInfo->ui->defaultUser->account = $this->app->user->account;
+        $loginInfo->ui->defaultUser->lock    = false;
+        $loginInfo->ui->defaultUser->ldap    = true;
         $loginInfo = json_encode($loginInfo);
 
         $loginFile = $clientDir . 'config.json';
diff --git a/xuanxuan/module/misc/ext/control/downloadclient.php b/xuanxuan/module/misc/ext/control/downloadclient.php
index 9fe18da434..4a9551e832 100755
--- a/xuanxuan/module/misc/ext/control/downloadclient.php
+++ b/xuanxuan/module/misc/ext/control/downloadclient.php
@@ -56,6 +56,26 @@ class myMisc extends misc
             if(strpos($agentOS, 'Mac') !== false)     $os = 'mac64';
 
             $this->view->os = $os;
+
+            $releasedInDB = $this->dao->select('*')->from(TABLE_IM_CLIENT)->where('version')->eq($this->config->xuanxuan->version)->andWhere('status')->eq('released')->fetch();
+            if($releasedInDB)
+            {
+                foreach(json_decode($releasedInDB->downloads) as $osKey => $link)
+                {
+                    if(empty($link))
+                    {
+                        $osKey = strtolower(str_replace('zip', '', $osKey));
+                        if(isset($this->lang->misc->client->osList[$osKey]))
+                        {
+                            unset($this->lang->misc->client->osList[$osKey]);
+                        }
+                        elseif(strpos($osKey, 'mac') === 0)
+                        {
+                            unset($this->lang->misc->client->osList['mac64']);
+                        }
+                    }
+                }
+            }
         }
 
         if($action == 'getPackage')