diff --git a/admin/language/en-US/lang.php b/admin/language/en-US/lang.php
index 79e7726..b319c2b 100644
--- a/admin/language/en-US/lang.php
+++ b/admin/language/en-US/lang.php
@@ -1155,7 +1155,16 @@ $lang = array
'space_organization_set'=>' Organization storage setting ',
'space_organization_set_tip'=>' Sets the default organization space size. If left blank or 0, all system space is shared, if -1, no storage space is available ',
'space_group_set'=>' group storage space setting ',
- 'space_group_set_tip'=>' Set the default group space size. If left blank or 0, all system space is shared. If -1, no storage space is available. '
+ 'space_group_set_tip'=>' Set the default group space size. If left blank or 0, all system space is shared. If -1, no storage space is available. ',
+
+ 'open_qq_login'=>' Whether to open QQ login',
+ 'qq_app_id'=>' APP ID applied in QQ interconnection ',
+ 'qq_app_key'=>' Application APP KEY applied in QQ interconnection ',
+ 'whether_allow_direct'=>' whether direct use is allowed ',
+ 'user_must_binding'=>' User must be bound ',
+ 'user_must_binding_text'=>' User is not bound to a user, the system will automatically add a user to the system based on the QQ information and bind the user to the QQ. The default user name is QQ nickname. The email address and password are randomly generated. Users can login through QQ normal login or retrieve password ',
+ 'allow_direct_use'=>' allow direct use',
+ 'token_url'=>' callback address ',
);
diff --git a/admin/language/zh-cn/lang.php b/admin/language/zh-cn/lang.php
index 6239f7a..35e2c90 100644
--- a/admin/language/zh-cn/lang.php
+++ b/admin/language/zh-cn/lang.php
@@ -1162,7 +1162,16 @@ $lang = array
'space_organization_set'=>'机构存储空间设置',
'space_organization_set_tip'=>'设置机构默认空间大小，如果留空或为0则共享系统所有空间，为-1则没有存储空间',
'space_group_set'=>'群组存储空间设置',
- 'space_group_set_tip'=>'设置群组默认空间大小，如果留空或为0则共享系统所有空间，为-1则没有存储空间'
+ 'space_group_set_tip'=>'设置群组默认空间大小，如果留空或为0则共享系统所有空间，为-1则没有存储空间',
+
+ 'open_qq_login'=>'是否开启QQ登录',
+ 'qq_app_id'=>'在QQ互联申请的应用APP ID',
+ 'qq_app_key'=>'在QQ互联申请的应用APP KEY',
+ 'whether_allow_direct'=>'是否允许直接使用',
+ 'user_must_binding'=>'必须绑定用户',
+ 'user_must_binding_text'=>'用户不绑定用户，直接使用的话，系统将根据QQ的信息自动添加用户到系统并且和此QQ绑定。用户名默认使用QQ昵称；邮箱、密码随机生成。用户可以通过QQ登录正常登录或找回密码',
+ 'allow_direct_use'=>'允许直接使用',
+ 'token_url'=>'回调地址',
);
diff --git a/admin/setting/index.php b/admin/setting/index.php
index fc4669a..18ac264 100644
--- a/admin/setting/index.php
+++ b/admin/setting/index.php
@@ -81,6 +81,12 @@ if (!submitcheck('settingsubmit')) {
$navtitle = lang('loginSet').' - '.lang('appname');
$setting['strongpw'] = dunserialize($setting['strongpw']);
$setting['welcomemsgtitle'] = cutstr(trim(dhtmlspecialchars($setting['welcomemsgtitle'])), 75);
+ } elseif ($operation == 'notification') {
+ $navtitle = lang('Notification Settings').' - '.lang('appname');
+ } elseif ($operation == 'qywechat') {
+ $navtitle = lang('weinxin_company').' - '.lang('appname');
+ } elseif ($operation == 'denlu') {
+ $navtitle = lang('loginSet').' - '.lang('appname');
}elseif($operation == 'space'){//获取空间设置结果
$navtitle=lang('spaceSet').' - '.lang('appname');
$openarr=json_encode(array('orgids'=>$open));
@@ -91,6 +97,8 @@ if (!submitcheck('settingsubmit')) {
$perms = get_permsarray();//获取所有权限;
$permgroups = C::t('resources_permgroup')->fetch_all();
$navtitle=lang('permGroupSet').' - '.lang('appname');
+ }elseif ($operation == 'qqlogin') {
+ $navtitle = lang('qq_longin_set').' - '.lang('appname');
}elseif ($operation == 'datetime') {
$navtitle = lang('time_or_date').' - '.lang('appname');
$checktimeformat = array($setting['timeformat'] == 'H:i' ? 24 : 12 => 'checked');
diff --git a/admin/setting/template/left.htm b/admin/setting/template/left.htm
index 863cc64..2070881 100644
--- a/admin/setting/template/left.htm
+++ b/admin/setting/template/left.htm
@@ -2,7 +2,7 @@