From 9424577291c62a84a65fb004ae75adbd23e8c500 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Wed, 23 Mar 2022 11:22:27 +0800 Subject: [PATCH 1/2] * change client to chat, and remove xuan promotional message, task #51510. --- .../xuan/dev/ext/lang/en/xuanxuan.php | 18 +++++++++--------- .../xuan/dev/ext/lang/zh-cn/xuanxuan.php | 16 ++++++++-------- .../extension/xuan/im/ext/lang/en/xuanxuan.php | 5 ++--- .../xuan/im/ext/lang/zh-cn/xuanxuan.php | 5 ++--- .../xuan/message/ext/lang/en/xuanxuan.php | 2 +- .../xuan/message/ext/lang/zh-cn/xuanxuan.php | 2 +- .../xuan/setting/ext/lang/en/xuanxuan.php | 3 +-- .../xuan/setting/ext/lang/zh-cn/xuanxuan.php | 4 ++-- .../xuan/setting/ext/view/xuanxuan.html.php | 3 --- 9 files changed, 26 insertions(+), 32 deletions(-) diff --git a/xuanxuan/extension/xuan/dev/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/dev/ext/lang/en/xuanxuan.php index ce23a46f0f..f3eb7122d7 100644 --- a/xuanxuan/extension/xuan/dev/ext/lang/en/xuanxuan.php +++ b/xuanxuan/extension/xuan/dev/ext/lang/en/xuanxuan.php @@ -1,11 +1,11 @@ dev->groupList['xuanxuan']= 'Client'; +$lang->dev->groupList['xuanxuan']= 'Chat'; -$lang->dev->tableList['im_chatuser'] = 'Client Users'; -$lang->dev->tableList['im_message'] = 'Client Message'; -$lang->dev->tableList['im_messagestatus'] = 'Client Message Status'; -$lang->dev->tableList['im_chat'] = 'Client Chat'; -$lang->dev->tableList['im_client'] = 'Client Upgrade'; -$lang->dev->tableList['im_conference'] = 'Client Conference'; -$lang->dev->tableList['im_conferenceaction'] = 'Client Conference Action'; -$lang->dev->tableList['im_queue'] = 'Client Queue'; +$lang->dev->tableList['im_chatuser'] = 'Chat Users'; +$lang->dev->tableList['im_message'] = 'Chat Message'; +$lang->dev->tableList['im_messagestatus'] = 'Chat Message Status'; +$lang->dev->tableList['im_chat'] = 'Chats'; +$lang->dev->tableList['im_client'] = 'Chat Client Upgrade'; +$lang->dev->tableList['im_conference'] = 'Chat Conference'; +$lang->dev->tableList['im_conferenceaction'] = 'Chat Conference Action'; +$lang->dev->tableList['im_queue'] = 'Chat Push Queue'; diff --git a/xuanxuan/extension/xuan/dev/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/dev/ext/lang/zh-cn/xuanxuan.php index c76a34ec36..f7fee3ef79 100644 --- a/xuanxuan/extension/xuan/dev/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/dev/ext/lang/zh-cn/xuanxuan.php @@ -1,11 +1,11 @@ dev->groupList['xuanxuan']= '客户端'; +$lang->dev->groupList['xuanxuan']= '聊天'; -$lang->dev->tableList['im_chatuser'] = '客户端用户'; -$lang->dev->tableList['im_message'] = '客户端消息'; -$lang->dev->tableList['im_messagestatus'] = '客户端状态'; -$lang->dev->tableList['im_chat'] = '客户端会话'; -$lang->dev->tableList['im_client'] = '客户端版本更新'; +$lang->dev->tableList['im_chatuser'] = '聊天用户'; +$lang->dev->tableList['im_message'] = '聊天消息'; +$lang->dev->tableList['im_messagestatus'] = '聊天状态'; +$lang->dev->tableList['im_chat'] = '聊天会话'; +$lang->dev->tableList['im_client'] = '聊天版本更新'; $lang->dev->tableList['im_conference'] = '音视频会议'; -$lang->dev->tableList['im_conferenceaction'] = '会议action'; -$lang->dev->tableList['im_queue'] = '客户端推送'; +$lang->dev->tableList['im_conferenceaction'] = '会议动作'; +$lang->dev->tableList['im_queue'] = '聊天推送'; diff --git a/xuanxuan/extension/xuan/im/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/im/ext/lang/en/xuanxuan.php index e1328f898d..a6b95567f9 100644 --- a/xuanxuan/extension/xuan/im/ext/lang/en/xuanxuan.php +++ b/xuanxuan/extension/xuan/im/ext/lang/en/xuanxuan.php @@ -1,12 +1,12 @@ im->common = 'Desktop'; +$lang->im->common = 'Chat'; $lang->im->turnon = 'On'; $lang->im->help = 'Help'; $lang->im->settings = 'Settings'; $lang->im->xxdServer = 'ZenTao Server'; $lang->im->downloadXXD = 'Download XXD'; $lang->im->zentaoIntegrate = 'ZenTao Integrated'; -$lang->im->zentaoClient = 'ZenTao Desktop is added!'; +$lang->im->zentaoClient = 'ZenTao Desktop Client is added!'; $lang->im->getChatUsers = 'Get Chat Users'; $lang->im->getChatGroups = 'Get Chat Groups'; $lang->im->notifyMSG = 'Notification'; @@ -25,7 +25,6 @@ $lang->im->turnonList = array(); $lang->im->turnonList[1] = 'Enable'; $lang->im->turnonList[0] = 'Disable'; -$lang->im->info = "ZenTao Desktop is powered by Xuanxuan, a secure and open source Instant Messenger by Nature Easy Soft. It is a self-hosted and cross-platform tool with numerous plug-ins and robust features. In Xuanxuan, you can code your own plug-ins. Click HERE for more."; $lang->im->xxClientConfirm = 'Click Download ZenTao Desktop at the right bottom to download it!'; $lang->im->xxServerConfirm = 'Go to User dropmenu to download the ZenTao Desktop Server!'; diff --git a/xuanxuan/extension/xuan/im/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/im/ext/lang/zh-cn/xuanxuan.php index 3197a8210e..b821b40e23 100644 --- a/xuanxuan/extension/xuan/im/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/im/ext/lang/zh-cn/xuanxuan.php @@ -1,10 +1,10 @@ im->common = '客户端'; +$lang->im->common = '聊天'; $lang->im->turnon = '是否打开'; $lang->im->help = '使用说明'; $lang->im->settings = '服务器设置'; $lang->im->xxdServer = '禅道服务器'; -$lang->im->downloadXXD = '下载喧喧服务端'; +$lang->im->downloadXXD = '下载聊天服务端'; $lang->im->zentaoIntegrate = '禅道集成'; $lang->im->zentaoClient = '新增禅道客户端！'; $lang->im->getChatUsers = '获取用户'; @@ -25,7 +25,6 @@ $lang->im->turnonList = array(); $lang->im->turnonList[1] = '是'; $lang->im->turnonList[0] = '否'; -$lang->im->info = "禅道客户端由易软天创旗下另外一款免费、开源、安全的IM产品喧喧驱动，支持私有部署，跨平台操作，内置大量插件，功能丰富，在喧喧里，您甚至还可以为自己编写个性化的插件，点击查看。"; $lang->im->xxClientConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！点击界面右上角用户下拉菜单中下载禅道客户端。'; $lang->im->xxServerConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！进入后台-客户端进行下载配置。'; diff --git a/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php index 102a12133a..7fbcf17e93 100644 --- a/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php +++ b/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php @@ -1,5 +1,5 @@ message->typeList['xuanxuan'] = 'Client'; +$lang->message->typeList['xuanxuan'] = 'Chat'; $lang->message->sender = 'ZenTao'; diff --git a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php index b394f3801c..6666cd2421 100644 --- a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php @@ -1,5 +1,5 @@ message->typeList['xuanxuan'] = '客户端'; +$lang->message->typeList['xuanxuan'] = '聊天'; $lang->message->sender = '禅道项目管理'; diff --git a/xuanxuan/extension/xuan/setting/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/setting/ext/lang/en/xuanxuan.php index b70f36c6c9..4e4aded2e4 100644 --- a/xuanxuan/extension/xuan/setting/ext/lang/en/xuanxuan.php +++ b/xuanxuan/extension/xuan/setting/ext/lang/en/xuanxuan.php @@ -1,8 +1,7 @@ setting->common = 'Settings'; -$lang->setting->xuanxuan = 'Client'; +$lang->setting->xuanxuan = 'Chat'; $lang->setting->downloadXXD = 'Download XXD'; $lang->setting->langs['zh-cn'] = 'Simplified Chinese'; $lang->setting->langs['zh-tw'] = 'Traditional Chinese'; $lang->setting->langs['en'] = 'English'; - diff --git a/xuanxuan/extension/xuan/setting/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/setting/ext/lang/zh-cn/xuanxuan.php index de73c4ff45..4bec3c60f2 100644 --- a/xuanxuan/extension/xuan/setting/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/setting/ext/lang/zh-cn/xuanxuan.php @@ -1,7 +1,7 @@ setting->common = '设置'; -$lang->setting->xuanxuan = '客户端集成'; -$lang->setting->downloadXXD = '下载喧喧服务端'; +$lang->setting->xuanxuan = '聊天集成'; +$lang->setting->downloadXXD = '下载聊天服务端'; $lang->setting->langs['zh-cn'] = '简体'; $lang->setting->langs['zh-tw'] = '繁體'; $lang->setting->langs['en'] = 'English'; diff --git a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php index 2ddc26353a..b612a25dfc 100644 --- a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php +++ b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php @@ -146,9 +146,6 @@ - -
im->info;?>
- getModuleRoot() . 'common/view/footer.html.php';?> From 2365794124867c94ad8e4d458ee0c7f6daa1ab33 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Wed, 23 Mar 2022 13:35:33 +0800 Subject: [PATCH 2/2] * disable chat by default, task #51509. --- module/upgrade/model.php | 2 +- .../xuan/common/ext/model/hook/loadConfigFromDB.xuanxuan.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 62f61e14e6..93892462e5 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -3774,7 +3774,7 @@ class upgradeModel extends model $this->dao->update(TABLE_CONFIG)->set('module')->eq('common')->set('section')->eq('xuanxuan')->where('id')->eq($keyID)->exec(); $this->saveLogs($this->dao->get()); - $this->setting->setItem('system.common.xuanxuan.turnon', '1'); + $this->setting->setItem('system.common.xuanxuan.turnon', '0'); $this->setting->setItem('system.common.xxserver.noticed', '1'); } diff --git a/xuanxuan/extension/xuan/common/ext/model/hook/loadConfigFromDB.xuanxuan.php b/xuanxuan/extension/xuan/common/ext/model/hook/loadConfigFromDB.xuanxuan.php index 82e7770031..6e49cb585d 100644 --- a/xuanxuan/extension/xuan/common/ext/model/hook/loadConfigFromDB.xuanxuan.php +++ b/xuanxuan/extension/xuan/common/ext/model/hook/loadConfigFromDB.xuanxuan.php @@ -5,7 +5,7 @@ $xxConfig = array(); foreach($xxItems as $xxItem) $xxConfig[$xxItem->key] = $xxItem->value; if(empty($xxConfig['key'])) { - $this->setting->setItem('system.common.xuanxuan.turnon', 1); + $this->setting->setItem('system.common.xuanxuan.turnon', 0); $this->setting->setItem('system.common.xuanxuan.key', $this->setting->computeSN()); } if(!isset($xxConfig['chatPort'])) $this->setting->setItem('system.common.xuanxuan.chatPort', 11444);