From 81e8a96d6fdc5786ee14df1a40e642b6e71148a2 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 9 Feb 2023 09:59:24 +0800 Subject: [PATCH] * code for task #83740. --- module/admin/config.php | 2 +- .../xuan/admin/ext/lang/de/xuanxuan.php | 9 + .../xuan/admin/ext/lang/en/xuanxuan.php | 9 + .../xuan/admin/ext/lang/fr/xuanxuan.php | 9 + .../xuan/admin/ext/lang/zh-cn/xuanxuan.php | 11 +- .../xuan/common/ext/lang/de/xuanxuan.php | 17 -- .../xuan/common/ext/lang/en/xuanxuan.php | 17 -- .../xuan/common/ext/lang/fr/xuanxuan.php | 17 -- .../xuan/common/ext/lang/zh-cn/xuanxuan.php | 17 -- .../xuan/conference/ext/view/admin.html.php | 217 ++++++++++++++++++ 10 files changed, 255 insertions(+), 70 deletions(-) create mode 100644 xuanxuan/extension/xuan/conference/ext/view/admin.html.php diff --git a/module/admin/config.php b/module/admin/config.php index ef2cc82949..b930c1662d 100755 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -7,7 +7,7 @@ $config->admin->log->saveDays = 30; if(!isset($config->safe)) $config->safe = new stdclass(); if(!isset($config->safe->weak)) $config->safe->weak = '123456,password,12345,12345678,qwerty,123456789,1234,1234567,abc123,111111,123123'; -$config->admin->menuGroup['system'] = array('custom|mode', 'backup', 'cron', 'action|trash', 'admin|xuanxuan', 'setting|xuanxuan', 'admin|license', 'admin|checkweak', 'admin|resetpwdsetting', 'admin|safe', 'custom|timezone', 'search|buildindex', 'admin|tableengine', 'ldap', 'custom|libreoffice'); +$config->admin->menuGroup['system'] = array('custom|mode', 'backup', 'cron', 'action|trash', 'admin|xuanxuan', 'setting|xuanxuan', 'admin|license', 'admin|checkweak', 'admin|resetpwdsetting', 'admin|safe', 'custom|timezone', 'search|buildindex', 'admin|tableengine', 'ldap', 'custom|libreoffice', 'conference', 'client'); $config->admin->menuGroup['user'] = array('dept', 'company', 'user', 'group'); $config->admin->menuGroup['switch'] = array('admin|setmodule'); $config->admin->menuGroup['model'] = array('auditcl', 'stage', 'design', 'cmcl', 'reviewcl', 'custom|required', 'custom|set', 'custom|flow', 'custom|code', 'custom|estimate', 'subject', 'process'); diff --git a/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php index 332adc1cc0..1a35918f24 100644 --- a/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php +++ b/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php @@ -27,4 +27,13 @@ if($config->vision != 'lite') { $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting'); $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan'; + + $lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|'); + $lang->admin->menuList->system['tabMenu']['xuanxuan']['setting'] = array('link' => 'Parameter|setting|xuanxuan|'); + if($config->edition != 'open') + { + $lang->admin->menuList->system['tabMenu']['xuanxuan']['conference'] = array('link' => 'Conference|conference|admin|'); + $lang->navGroup->conference = 'admin'; + } + $lang->admin->menuList->system['tabMenu']['xuanxuan']['update'] = array('link' => 'Update|client|browse|', 'subModule' => 'client'); } diff --git a/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php index 332adc1cc0..1a35918f24 100644 --- a/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php +++ b/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php @@ -27,4 +27,13 @@ if($config->vision != 'lite') { $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting'); $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan'; + + $lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|'); + $lang->admin->menuList->system['tabMenu']['xuanxuan']['setting'] = array('link' => 'Parameter|setting|xuanxuan|'); + if($config->edition != 'open') + { + $lang->admin->menuList->system['tabMenu']['xuanxuan']['conference'] = array('link' => 'Conference|conference|admin|'); + $lang->navGroup->conference = 'admin'; + } + $lang->admin->menuList->system['tabMenu']['xuanxuan']['update'] = array('link' => 'Update|client|browse|', 'subModule' => 'client'); } diff --git a/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php index 332adc1cc0..1a35918f24 100644 --- a/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php +++ b/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php @@ -27,4 +27,13 @@ if($config->vision != 'lite') { $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting'); $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan'; + + $lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|'); + $lang->admin->menuList->system['tabMenu']['xuanxuan']['setting'] = array('link' => 'Parameter|setting|xuanxuan|'); + if($config->edition != 'open') + { + $lang->admin->menuList->system['tabMenu']['xuanxuan']['conference'] = array('link' => 'Conference|conference|admin|'); + $lang->navGroup->conference = 'admin'; + } + $lang->admin->menuList->system['tabMenu']['xuanxuan']['update'] = array('link' => 'Update|client|browse|', 'subModule' => 'client'); } diff --git a/xuanxuan/extension/xuan/admin/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/zh-cn/xuanxuan.php index ab4ae61356..e17b1a5dcc 100644 --- a/xuanxuan/extension/xuan/admin/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/admin/ext/lang/zh-cn/xuanxuan.php @@ -25,6 +25,15 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024; global $config; if($config->vision != 'lite') { - $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => '聊天|admin|xuanxuan|', 'subModule' => 'client,setting'); + $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => '聊天|admin|xuanxuan|', 'subModule' => 'client,setting,conference'); $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan'; + + $lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => '首页|admin|xuanxuan|'); + $lang->admin->menuList->system['tabMenu']['xuanxuan']['setting'] = array('link' => '参数|setting|xuanxuan|'); + if($config->edition != 'open') + { + $lang->admin->menuList->system['tabMenu']['xuanxuan']['conference'] = array('link' => '音视频|conference|admin|'); + $lang->navGroup->conference = 'admin'; + } + $lang->admin->menuList->system['tabMenu']['xuanxuan']['update'] = array('link' => '更新|client|browse|', 'subModule' => 'client'); } diff --git a/xuanxuan/extension/xuan/common/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/common/ext/lang/de/xuanxuan.php index f83f28956d..96b9269483 100644 --- a/xuanxuan/extension/xuan/common/ext/lang/de/xuanxuan.php +++ b/xuanxuan/extension/xuan/common/ext/lang/de/xuanxuan.php @@ -1,22 +1,5 @@ xuanxuan = new stdclass(); -//$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']->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'; - -global $config; -//if($config->edition != 'open') -//{ -// $lang->admin->menu->xuanxuan['subModule'] = 'client,setting,conference'; -// $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => 'Conference|conference|admin'); -// $lang->admin->menu->xuanxuan['menuOrder'][7] = 'conference'; -// $lang->navGroup->conference = 'admin'; -//} $lang->navGroup->im = 'admin'; $lang->navGroup->setting = 'admin'; diff --git a/xuanxuan/extension/xuan/common/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/common/ext/lang/en/xuanxuan.php index f83f28956d..96b9269483 100644 --- a/xuanxuan/extension/xuan/common/ext/lang/en/xuanxuan.php +++ b/xuanxuan/extension/xuan/common/ext/lang/en/xuanxuan.php @@ -1,22 +1,5 @@ xuanxuan = new stdclass(); -//$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']->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'; - -global $config; -//if($config->edition != 'open') -//{ -// $lang->admin->menu->xuanxuan['subModule'] = 'client,setting,conference'; -// $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => 'Conference|conference|admin'); -// $lang->admin->menu->xuanxuan['menuOrder'][7] = 'conference'; -// $lang->navGroup->conference = 'admin'; -//} $lang->navGroup->im = 'admin'; $lang->navGroup->setting = 'admin'; diff --git a/xuanxuan/extension/xuan/common/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/common/ext/lang/fr/xuanxuan.php index f83f28956d..96b9269483 100644 --- a/xuanxuan/extension/xuan/common/ext/lang/fr/xuanxuan.php +++ b/xuanxuan/extension/xuan/common/ext/lang/fr/xuanxuan.php @@ -1,22 +1,5 @@ xuanxuan = new stdclass(); -//$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']->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'; - -global $config; -//if($config->edition != 'open') -//{ -// $lang->admin->menu->xuanxuan['subModule'] = 'client,setting,conference'; -// $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => 'Conference|conference|admin'); -// $lang->admin->menu->xuanxuan['menuOrder'][7] = 'conference'; -// $lang->navGroup->conference = 'admin'; -//} $lang->navGroup->im = 'admin'; $lang->navGroup->setting = 'admin'; diff --git a/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php index 432af47cbf..c9646d571d 100644 --- a/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php @@ -1,22 +1,5 @@ xuanxuan = new stdclass(); -//$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']->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'; - -global $config; -//if($config->edition != 'open') -//{ -// $lang->admin->menu->xuanxuan['subModule'] = 'client,setting,conference'; -// $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => '音视频|conference|admin'); -// $lang->admin->menu->xuanxuan['menuOrder'][7] = 'conference'; -// $lang->navGroup->conference = 'admin'; -//} $lang->navGroup->im = 'admin'; $lang->navGroup->setting = 'admin'; diff --git a/xuanxuan/extension/xuan/conference/ext/view/admin.html.php b/xuanxuan/extension/xuan/conference/ext/view/admin.html.php new file mode 100644 index 0000000000..3d06c44ca1 --- /dev/null +++ b/xuanxuan/extension/xuan/conference/ext/view/admin.html.php @@ -0,0 +1,217 @@ + + * @package conference + * @version $Id$ + * @link https://xuanim.com + */ +?> +getModuleRoot() . 'common/view/header.html.php';?> +
+ +
+
+
'> +
+
+ conference->server?> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
conference->enabled;?> + +
+ +
+ +
+ > + +
+ +
conference->backend->type;?> + +
+ conference->backend->types, $backendType);?> + conference->backend->types, $backendType, 'disabled'); endif; ?> +
conference->backendTypeTip;?>
conference->serverAddr;?> + +
+ + conference->notset : $serverAddr; endif; ?> +
conference->serverAddrTip;?>
conference->https;?> + +
+ +
+ +
+ > + +
+ +
conference->apiPort;?> + +
+ min="1" max="65535" class="form-control"> + conference->notset : $apiPort; endif; ?> +
conference->apiPortTip : '';?>
conference->mgmtPort;?> + +
+ min="1" max="65535" class="form-control"> + conference->notset : $mgmtPort; endif; ?> +
conference->mgmtPortTip : '';?>
conference->rtcPort;?> + +
+ min="1" max="65535" class="form-control"> + conference->notset : $rtcPort; endif; ?> +
conference->rtcPortTip : '';?>
conference->serviceId;?> + +
+ + conference->notset : $serviceId; endif; ?> +
conference->serviceIdTip : '';?>
conference->serviceKey;?> + +
+ + conference->notset : $serviceKey; endif; ?> +
conference->serviceKeyTip : '';?>
+ + ' . $lang->edit;?> +
+
+
+
+
createLink("conference", 'admin', 'type=video');?>> +
+
+ conference->video?> +
+
+ + + + + + + + + + + + + + + +
conference->resolutionWidth;?> + min="320" max="1280" class="form-control"> + conference->resolutionWidthTip;?>
conference->resolutionHeight;?> + min="240" max="720" class="form-control"> + conference->resolutionHeightTip;?>
+ +
+
+
+
+
+ + +getModuleRoot() . 'common/view/footer.html.php';?>