From 2371a03f321d315365dec9e8c38e0a3453bbc351 Mon Sep 17 00:00:00 2001 From: Lwrless Date: Wed, 10 Nov 2021 15:02:20 +0800 Subject: [PATCH 1/2] * add owt settings, and remove useless group permissions, xuan task #43732. --- xuanxuan/module/common/ext/lang/en/xuanxuan.php | 7 +++++-- xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php | 7 +++++-- xuanxuan/module/group/ext/lang/en/xuanxuan.php | 5 ----- xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php | 5 ----- xuanxuan/module/im/ext/lang/en/xuanxuan.php | 5 ----- xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php | 5 ----- xuanxuan/module/setting/ext/lang/en/xuanxuan.php | 3 ++- xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php | 1 + 8 files changed, 13 insertions(+), 25 deletions(-) diff --git a/xuanxuan/module/common/ext/lang/en/xuanxuan.php b/xuanxuan/module/common/ext/lang/en/xuanxuan.php index a414c4f60c..09a906d824 100644 --- a/xuanxuan/module/common/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/common/ext/lang/en/xuanxuan.php @@ -1,19 +1,22 @@ xuanxuan = new stdclass(); -$lang->admin->menu->xuanxuan = array('link' => 'Desktop|admin|xuanxuan', 'subModule' => 'client,setting'); +$lang->admin->menu->xuanxuan = array('link' => 'Desktop|admin|xuanxuan', 'subModule' => 'client,setting,owt'); $lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menu->xuanxuan['subMenu'] = new stdclass(); $lang->admin->menu->xuanxuan['subMenu']->index = array('link' => 'Home|admin|xuanxuan'); $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => 'Parameter|setting|xuanxuan'); +$lang->admin->menu->xuanxuan['subMenu']->owt = array('link' => 'Conference|owt|admin'); $lang->admin->menu->xuanxuan['subMenu']->update = array('link' => 'Update|client|browse', 'subModule' => 'client'); $lang->admin->menu->xuanxuan['menuOrder'][0] = 'index'; $lang->admin->menu->xuanxuan['menuOrder'][5] = 'setting'; -$lang->admin->menu->xuanxuan['menuOrder'][10] = 'update'; +$lang->admin->menu->xuanxuan['menuOrder'][10] = 'owt'; +$lang->admin->menu->xuanxuan['menuOrder'][15] = 'update'; $lang->navGroup->im = 'admin'; $lang->navGroup->setting = 'admin'; +$lang->navGroup->owt = 'admin'; $lang->navGroup->client = 'admin'; $lang->confirmDelete = 'Do you want to delete it?'; diff --git a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php index b6303f7842..e1d8a48d88 100644 --- a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php @@ -1,19 +1,22 @@ xuanxuan = new stdclass(); -$lang->admin->menu->xuanxuan = array('link' => '客户端|admin|xuanxuan', 'subModule' => 'client,setting'); +$lang->admin->menu->xuanxuan = array('link' => '客户端|admin|xuanxuan', 'subModule' => 'client,setting,owt'); $lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menu->xuanxuan['subMenu'] = new stdclass(); $lang->admin->menu->xuanxuan['subMenu']->index = array('link' => '首页|admin|xuanxuan'); $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => '参数|setting|xuanxuan'); +$lang->admin->menu->xuanxuan['subMenu']->owt = array('link' => '音视频|owt|admin'); $lang->admin->menu->xuanxuan['subMenu']->update = array('link' => '更新|client|browse', 'subModule' => 'client'); $lang->admin->menu->xuanxuan['menuOrder'][0] = 'index'; $lang->admin->menu->xuanxuan['menuOrder'][5] = 'setting'; -$lang->admin->menu->xuanxuan['menuOrder'][10] = 'update'; +$lang->admin->menu->xuanxuan['menuOrder'][10] = 'owt'; +$lang->admin->menu->xuanxuan['menuOrder'][15] = 'update'; $lang->navGroup->im = 'admin'; $lang->navGroup->setting = 'admin'; +$lang->navGroup->owt = 'admin'; $lang->navGroup->client = 'admin'; $lang->confirmDelete = '您确定要执行删除操作吗？'; diff --git a/xuanxuan/module/group/ext/lang/en/xuanxuan.php b/xuanxuan/module/group/ext/lang/en/xuanxuan.php index 4bd6677579..a9895fa8df 100644 --- a/xuanxuan/module/group/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/group/ext/lang/en/xuanxuan.php @@ -8,11 +8,6 @@ $lang->resource->setting->xuanxuan = 'xuanxuan'; $lang->setting->methodOrder[26] = 'xuanxuan'; $lang->resource->im = new stdclass(); -$lang->resource->im->getChatUsers = 'getChatUsers'; -$lang->resource->im->getChatGroups = 'getChatGroups'; -$lang->resource->im->notifyMSG = 'notifyMSG'; -$lang->resource->im->sendNotification = 'sendNotification'; -$lang->resource->im->sendChatMessage = 'sendChatMessage'; $lang->resource->im->downloadXxdPackage = 'downloadXXD'; $lang->resource->client = new stdclass(); diff --git a/xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php index 4bd6677579..a9895fa8df 100644 --- a/xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php @@ -8,11 +8,6 @@ $lang->resource->setting->xuanxuan = 'xuanxuan'; $lang->setting->methodOrder[26] = 'xuanxuan'; $lang->resource->im = new stdclass(); -$lang->resource->im->getChatUsers = 'getChatUsers'; -$lang->resource->im->getChatGroups = 'getChatGroups'; -$lang->resource->im->notifyMSG = 'notifyMSG'; -$lang->resource->im->sendNotification = 'sendNotification'; -$lang->resource->im->sendChatMessage = 'sendChatMessage'; $lang->resource->im->downloadXxdPackage = 'downloadXXD'; $lang->resource->client = new stdclass(); diff --git a/xuanxuan/module/im/ext/lang/en/xuanxuan.php b/xuanxuan/module/im/ext/lang/en/xuanxuan.php index e1328f898d..957c9c0bfd 100644 --- a/xuanxuan/module/im/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/im/ext/lang/en/xuanxuan.php @@ -7,11 +7,6 @@ $lang->im->xxdServer = 'ZenTao Server'; $lang->im->downloadXXD = 'Download XXD'; $lang->im->zentaoIntegrate = 'ZenTao Integrated'; $lang->im->zentaoClient = 'ZenTao Desktop is added!'; -$lang->im->getChatUsers = 'Get Chat Users'; -$lang->im->getChatGroups = 'Get Chat Groups'; -$lang->im->notifyMSG = 'Notification'; -$lang->im->sendNotification = 'Push message to notification Center'; -$lang->im->sendChatMessage = 'Push messages to the discussion group'; $lang->im->createBug = 'Create Bug'; $lang->im->createDoc = 'Create Doc'; diff --git a/xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php index 3197a8210e..9fecf6b9fd 100644 --- a/xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/im/ext/lang/zh-cn/xuanxuan.php @@ -7,11 +7,6 @@ $lang->im->xxdServer = '禅道服务器'; $lang->im->downloadXXD = '下载喧喧服务端'; $lang->im->zentaoIntegrate = '禅道集成'; $lang->im->zentaoClient = '新增禅道客户端！'; -$lang->im->getChatUsers = '获取用户'; -$lang->im->getChatGroups = '获取讨论组'; -$lang->im->notifyMSG = '消息通知'; -$lang->im->sendNotification = '向通知中心推送通知消息'; -$lang->im->sendChatMessage = '向指定的讨论组推送通知消息'; $lang->im->createBug = '创建 Bug'; $lang->im->createDoc = '创建文档'; diff --git a/xuanxuan/module/setting/ext/lang/en/xuanxuan.php b/xuanxuan/module/setting/ext/lang/en/xuanxuan.php index 39e4051ab0..e6f68eb133 100644 --- a/xuanxuan/module/setting/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/setting/ext/lang/en/xuanxuan.php @@ -1,4 +1,5 @@ -setting->common = 'Settings'; $lang->setting->xuanxuan = 'Client'; +$lang->setting->owt = 'Conference'; $lang->setting->downloadXXD = 'Download XXD'; diff --git a/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php index f6289f4ea4..92a928baa2 100644 --- a/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php @@ -1,4 +1,5 @@ setting->common = '设置'; $lang->setting->xuanxuan = '客户端集成'; +$lang->setting->owt = '音视频'; $lang->setting->downloadXXD = '下载喧喧服务端'; From 2fcb053765fe7ce9a3af6aa498a0402a25d9a24d Mon Sep 17 00:00:00 2001 From: Lwrless Date: Fri, 19 Nov 2021 16:33:10 +0800 Subject: [PATCH 2/2] * remove owt related stuff, moved to zentaobiz. --- xuanxuan/module/common/ext/lang/en/xuanxuan.php | 7 ++----- xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php | 7 ++----- xuanxuan/module/setting/ext/lang/en/xuanxuan.php | 3 +-- xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php | 1 - 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xuanxuan/module/common/ext/lang/en/xuanxuan.php b/xuanxuan/module/common/ext/lang/en/xuanxuan.php index 09a906d824..a414c4f60c 100644 --- a/xuanxuan/module/common/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/common/ext/lang/en/xuanxuan.php @@ -1,22 +1,19 @@ xuanxuan = new stdclass(); -$lang->admin->menu->xuanxuan = array('link' => 'Desktop|admin|xuanxuan', 'subModule' => 'client,setting,owt'); +$lang->admin->menu->xuanxuan = array('link' => 'Desktop|admin|xuanxuan', 'subModule' => 'client,setting'); $lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menu->xuanxuan['subMenu'] = new stdclass(); $lang->admin->menu->xuanxuan['subMenu']->index = array('link' => 'Home|admin|xuanxuan'); $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => 'Parameter|setting|xuanxuan'); -$lang->admin->menu->xuanxuan['subMenu']->owt = array('link' => 'Conference|owt|admin'); $lang->admin->menu->xuanxuan['subMenu']->update = array('link' => 'Update|client|browse', 'subModule' => 'client'); $lang->admin->menu->xuanxuan['menuOrder'][0] = 'index'; $lang->admin->menu->xuanxuan['menuOrder'][5] = 'setting'; -$lang->admin->menu->xuanxuan['menuOrder'][10] = 'owt'; -$lang->admin->menu->xuanxuan['menuOrder'][15] = 'update'; +$lang->admin->menu->xuanxuan['menuOrder'][10] = 'update'; $lang->navGroup->im = 'admin'; $lang->navGroup->setting = 'admin'; -$lang->navGroup->owt = 'admin'; $lang->navGroup->client = 'admin'; $lang->confirmDelete = 'Do you want to delete it?'; diff --git a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php index e1d8a48d88..b6303f7842 100644 --- a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php @@ -1,22 +1,19 @@ xuanxuan = new stdclass(); -$lang->admin->menu->xuanxuan = array('link' => '客户端|admin|xuanxuan', 'subModule' => 'client,setting,owt'); +$lang->admin->menu->xuanxuan = array('link' => '客户端|admin|xuanxuan', 'subModule' => 'client,setting'); $lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menu->xuanxuan['subMenu'] = new stdclass(); $lang->admin->menu->xuanxuan['subMenu']->index = array('link' => '首页|admin|xuanxuan'); $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => '参数|setting|xuanxuan'); -$lang->admin->menu->xuanxuan['subMenu']->owt = array('link' => '音视频|owt|admin'); $lang->admin->menu->xuanxuan['subMenu']->update = array('link' => '更新|client|browse', 'subModule' => 'client'); $lang->admin->menu->xuanxuan['menuOrder'][0] = 'index'; $lang->admin->menu->xuanxuan['menuOrder'][5] = 'setting'; -$lang->admin->menu->xuanxuan['menuOrder'][10] = 'owt'; -$lang->admin->menu->xuanxuan['menuOrder'][15] = 'update'; +$lang->admin->menu->xuanxuan['menuOrder'][10] = 'update'; $lang->navGroup->im = 'admin'; $lang->navGroup->setting = 'admin'; -$lang->navGroup->owt = 'admin'; $lang->navGroup->client = 'admin'; $lang->confirmDelete = '您确定要执行删除操作吗？'; diff --git a/xuanxuan/module/setting/ext/lang/en/xuanxuan.php b/xuanxuan/module/setting/ext/lang/en/xuanxuan.php index e6f68eb133..39e4051ab0 100644 --- a/xuanxuan/module/setting/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/setting/ext/lang/en/xuanxuan.php @@ -1,5 +1,4 @@ -setting->common = 'Settings'; $lang->setting->xuanxuan = 'Client'; -$lang->setting->owt = 'Conference'; $lang->setting->downloadXXD = 'Download XXD'; diff --git a/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php index 92a928baa2..f6289f4ea4 100644 --- a/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php @@ -1,5 +1,4 @@ setting->common = '设置'; $lang->setting->xuanxuan = '客户端集成'; -$lang->setting->owt = '音视频'; $lang->setting->downloadXXD = '下载喧喧服务端';