diff --git a/xuanxuan/module/admin/ext/control/xuanxuan.php b/xuanxuan/module/admin/ext/control/xuanxuan.php index 088b0c2658..aa045bfb6a 100644 --- a/xuanxuan/module/admin/ext/control/xuanxuan.php +++ b/xuanxuan/module/admin/ext/control/xuanxuan.php @@ -17,6 +17,7 @@ class admin extends control $data = new stdclass(); $data->turnon = $this->post->turnon; $data->key = $this->post->key; + $data->server = $this->post->server; if($data) $this->loadModel('setting')->setItems('system.xuanxuan', $data); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); diff --git a/xuanxuan/module/admin/ext/view/xuanxuan.html.php b/xuanxuan/module/admin/ext/view/xuanxuan.html.php index c37d01ce93..030a6fdfae 100644 --- a/xuanxuan/module/admin/ext/view/xuanxuan.html.php +++ b/xuanxuan/module/admin/ext/view/xuanxuan.html.php @@ -22,27 +22,27 @@
- +
- - - - + + + + - + - +
chat->version;?> xuanxuan->version;?>
chat->turnon;?> chat->turnonList, $turnon);?>
chat->xxdServer;?>xuanxuan, 'server', ''), "class='form-control' placeholder={$lang->chat->xxdServerTip}");?>
chat->key;?>xuanxuan->key, "class='form-control'");?>xuanxuan->key, "class='form-control'");?> chat->createKey, "", 'onclick="createKey()"');?>
chat->downloadXXD, '', "class='btn btn-primary' data-toggle='modal'");?>
diff --git a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php index e68afb4913..671b3db28b 100644 --- a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php @@ -1,11 +1,22 @@ chat->common = 'Xuanxuan'; -$lang->chat->settings = 'Xuanxuan'; -$lang->chat->createKey = 'Create Key'; -$lang->chat->turnon = 'On'; -$lang->chat->key = 'Key'; -$lang->chat->version = 'Version'; +$lang->chat->common = 'Xuanxuan'; +$lang->chat->turnon = 'On'; +$lang->chat->downloadXXD = 'Download XXD' $lang->chat->turnonList = array(); $lang->chat->turnonList[1] = 'On'; $lang->chat->turnonList[0] = 'Off'; + +$lang->chat->status = 'Status'; +$lang->chat->xxdServer = 'XXD Server'; +$lang->chat->staff = 'Staff'; + +$lang->chat->statusList[1] = 'Enable'; +$lang->chat->statusList[0] = 'Disable'; + +$lang->chat->xxdServerTip = 'XXD server address contains protocol and host and port,such as https://127.0.0.1:11443'; +$lang->chat->xxdServerEmpty = 'XXD server address is empty.'; +$lang->chat->xxdSchemeError = 'Server address should started with http:// or https://.'; +$lang->chat->xxdPortError = 'Server address should contain valid port and the default is 11443.'; +$lang->chat->staffEmpty = 'Staff is not set.'; +$lang->chat->createChatFail = 'Create chat failed.'; diff --git a/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php index 5c28992e74..96197bd0f2 100644 --- a/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php @@ -1,11 +1,58 @@ chat->common = '喧喧'; -$lang->chat->settings = '喧喧集成'; -$lang->chat->createKey = '重新生成密钥'; -$lang->chat->turnon = '是否打开'; -$lang->chat->key = '密钥'; -$lang->chat->version = '版本'; +$lang->chat->common = '喧喧'; +$lang->chat->turnon = '是否打开'; +$lang->chat->downloadXXD = '下载喧喧服务端'; $lang->chat->turnonList = array(); $lang->chat->turnonList[1] = '是'; $lang->chat->turnonList[0] = '否'; + +$lang->chat->status = '状态'; +$lang->chat->xxdServer = 'XXD服务器'; +$lang->chat->downloadXXD = '下载喧喧服务端'; +$lang->chat->listenIP = '监听IP'; +$lang->chat->chatPort = '客户端通讯端口'; +$lang->chat->chatPort = '客户端通讯端口'; +$lang->chat->uploadFileSize = '上传文件大小'; +$lang->chat->downloadPackage = '下载完整包'; +$lang->chat->downloadConfig = '只下载配置文件'; + +$lang->chat->statusList[1] = '启用'; +$lang->chat->statusList[0] = '不启用'; + +$lang->chat->xxdServerTip = 'XXD服务器地址为完整的协议+地址+端口,示例:https://127.0.0.1:11443。'; +$lang->chat->xxdServerEmpty = 'XXD服务器地址为空。'; +$lang->chat->xxdSchemeError = '服务器地址应该以http://或https://开头。'; +$lang->chat->xxdPortError = '服务器地址应该包含有效的端口号,默认为11443。'; +$lang->chat->staffEmpty = '客服为空。'; +$lang->chat->createChatFail = '创建会话失败。'; + +$lang->chat->xxd = new stdclass(); +$lang->chat->xxd->os = '操作系统'; +$lang->chat->xxd->ip = '监听IP'; +$lang->chat->xxd->chatPort = '客户端通讯端口'; +$lang->chat->xxd->commonPort = '通用端口'; +$lang->chat->xxd->isHttps = '启用https'; +$lang->chat->xxd->uploadFileSize = '上传文件大小'; +$lang->chat->xxd->maxOnlineUser = '最大在线人数'; +$lang->chat->xxd->sslcrt = '证书内容'; +$lang->chat->xxd->sslkey = '证书私钥'; + +$lang->chat->httpsOptions[1] = '启用'; +$lang->chat->httpsOptions[0] = '不启用'; + +$lang->chat->placeholder->xxd = new stdclass(); +$lang->chat->placeholder->xxd->ip = '监听的服务器ip地址,没有特殊需要直接填写0.0.0.0'; +$lang->chat->placeholder->xxd->chatPort = '与聊天客户端通讯的端口'; +$lang->chat->placeholder->xxd->commonPort = '通用端口,该端口用于客户端登录时验证,以及文件上传下载使用'; +$lang->chat->placeholder->xxd->isHttps = '启用https'; +$lang->chat->placeholder->xxd->uploadFileSize = '上传文件的大小'; +$lang->chat->placeholder->xxd->maxOnlineUser = '最大在线人数'; +$lang->chat->placeholder->xxd->sslcrt = '请将证书内容复制到此处'; +$lang->chat->placeholder->xxd->sslkey = '请将证书密钥复制到此处'; + +$lang->chat->osList['win32'] = 'Windows 32位压缩包'; +$lang->chat->osList['win64'] = 'Windows 64位压缩包'; +$lang->chat->osList['linux32'] = 'Linux 32位压缩包'; +$lang->chat->osList['linux64'] = 'Linux 64位压缩包'; +$lang->chat->osList['mac'] = 'Mac 压缩包';