From 1733e995d607ac9c0b22e0954a469f196f6c091b Mon Sep 17 00:00:00 2001 From: "MI15\\Win" <10359480+tznb@user.noreply.gitee.com> Date: Wed, 7 Jun 2023 20:53:30 +0800 Subject: [PATCH] v2.0.25-20230607 --- system/UseFew/root_import_data.php | 4 +-- system/api_root.php | 5 ++-- system/version.txt | 2 +- templates/admin/js/link.js | 26 +++++++++++++------ templates/admin/page/add_link_tpl.php | 15 ++++++----- templates/admin/page/root/default_setting.php | 12 +++++++++ templates/admin/page/updatelog.php | 12 +++++++++ 7 files changed, 56 insertions(+), 20 deletions(-) diff --git a/system/UseFew/root_import_data.php b/system/UseFew/root_import_data.php index 6283ad2..7705a31 100644 --- a/system/UseFew/root_import_data.php +++ b/system/UseFew/root_import_data.php @@ -131,7 +131,7 @@ if($_POST['step'] == 2){ 'add_time'=>$data['add_time'] ?? time(), 'up_time'=>$data['up_time'] ?? time(), 'weight'=>0, - 'description'=>htmlspecialchars($data['description'],ENT_QUOTES), + 'description'=>htmlspecialchars($data['description'],ENT_QUOTES) ?? '', 'font_icon'=> strstr($data['Icon'],'fa') ? 'fa '.$data['Icon'] : 'fa fa-folder', 'icon'=>'' ] @@ -149,7 +149,7 @@ if($_POST['step'] == 2){ 'title' => $data['title'], 'url' => $data['url'], 'url_standby' => empty($data['url_standby']) ? '': [$data['url_standby']] , - 'description' => $data['description'], + 'description' => $data['description']?? '', 'add_time' => $data['add_time'] ?? time(), 'up_time' => $data['up_time'] ?? time(), 'click' => $data['click'] ?? 0, diff --git a/system/api_root.php b/system/api_root.php index 8fe374b..2cfba49 100644 --- a/system/api_root.php +++ b/system/api_root.php @@ -574,7 +574,7 @@ function write_default_settings(){ if(!is_subscribe('bool')){ msg(-1,'未检测到有效授权'); } - if( $_POST['KeyClear'] > $_POST['Session']){ + if(intval($_POST['Session']) > 0 && intval($_POST['KeyClear']) > intval($_POST['Session'])){ msg(-1,'Key清理时间不能大于登录保持时间'); } // 安全配置(登录配置) @@ -583,7 +583,8 @@ function write_default_settings(){ 'HttpOnly'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'HttpOnly参数错误'], 'KeySecurity'=>['int'=>true,'min'=>0,'max'=>2,'msg'=>'Key安全参数错误'], 'KeyClear'=>['int'=>true,'min'=>1,'max'=>60,'msg'=>'Key清理参数错误'], - 'api_model'=>['v'=>['security','compatible','compatible+open'],'msg'=>'API模式参数错误'] + 'api_model'=>['v'=>['security','compatible','compatible+open'],'msg'=>'API模式参数错误'], + 'login_page'=>['v'=>['admin','index','auto'],'msg'=>'登录成功参数错误'] ]; foreach ($datas as $key => $data){ if($data['int']){ diff --git a/system/version.txt b/system/version.txt index 29de6ee..dddd80d 100644 --- a/system/version.txt +++ b/system/version.txt @@ -1 +1 @@ -v2.0.24-20230606 \ No newline at end of file +v2.0.25-20230607 \ No newline at end of file diff --git a/templates/admin/js/link.js b/templates/admin/js/link.js index 06b38e2..f8848ee 100644 --- a/templates/admin/js/link.js +++ b/templates/admin/js/link.js @@ -3,12 +3,11 @@ var bak_link_id = 0; var page_sid = ''; var link_id = ''; var load_index; - -layui.use(['form','upload','miniTab'], function () { +var module = _GET('source') === 'tpl' ? ['form', 'upload'] : ['form', 'upload', 'miniTab']; +layui.use(module, function () { var $ = layui.jquery; var form = layui.form; var upload = layui.upload; - var miniTab = layui.miniTab; var edit_mode = _GET('page') == 'link_edit'; //是否编辑模式 //独立页面 if(top.location == self.location){ @@ -108,9 +107,18 @@ layui.use(['form','upload','miniTab'], function () { if(top.location == self.location){ layer.msg('已更新！', {icon: 1}); }else{ - parent.layui.table.reload('table');//刷新父页面的表格 - parent.layui.layer.msg('已更新！', {icon: 1}); - $('#close').click();//关闭子页面 + if(_GET('source') == 'tpl'){ //第三方调用时刷新父页面 + layer.msg('添加成功！', {icon: 1,time: 700, + end: function() { + parent.location.reload(); + $('#close').click();//关闭子页面 + } + }); + }else{ + parent.layui.table.reload('table');//刷新父页面的表格 + parent.layui.layer.msg('已更新！', {icon: 1}); + $('#close').click();//关闭子页面 + } } }else{ layer.msg(data.msg, {icon: 5}); @@ -132,7 +140,9 @@ layui.use(['form','upload','miniTab'], function () { window.close(); //关闭当前页面 }else{ parent.layer.close(parent.layer.getFrameIndex(window.name));//关闭当前页(内嵌窗口) - miniTab.deleteCurrentByIframe(); //关闭当前标签(标签窗口) + if(_GET('source') != 'tpl'){ + layui.miniTab.deleteCurrentByIframe(); //关闭当前标签(标签窗口) + } } }); @@ -228,4 +238,4 @@ function get_link_info() { } layer.close(load_index); }); -} \ No newline at end of file +} diff --git a/templates/admin/page/add_link_tpl.php b/templates/admin/page/add_link_tpl.php index cabf202..d5326a3 100644 --- a/templates/admin/page/add_link_tpl.php +++ b/templates/admin/page/add_link_tpl.php @@ -1,14 +1,15 @@ -
-
-
+
+
+
diff --git a/templates/admin/page/root/default_setting.php b/templates/admin/page/root/default_setting.php index 2d11c02..eaf0ad6 100644 --- a/templates/admin/page/root/default_setting.php +++ b/templates/admin/page/root/default_setting.php @@ -77,6 +77,18 @@ $LoginConfig = unserialize( get_db("global_config", "v", ["k" => "LoginConfig"])
部分主题和插件需设为开放模式!
+
+ +
+ +
+
自动识别:移动设备登录则进入主页,反之进入后台
+
+
站点设置
diff --git a/templates/admin/page/updatelog.php b/templates/admin/page/updatelog.php index 202c78c..f88b110 100644 --- a/templates/admin/page/updatelog.php +++ b/templates/admin/page/updatelog.php @@ -2,6 +2,18 @@
+
  • + +
    +

    v2.0.25-20230607

    +
      +
    • [修复] 默认设置>登录保持设为浏览器关闭时无法保存
      • +
    • [修复] 导入OneNav Extend 升级数据时,如果description存在Null值造成导入失败
      • +
    • [新增] 默认设置>可定义登录后进入后台还是主页 (注:此页面配置仅对新注册账号有效,不会修改现有用户的配置)
      • +
    • [优化] 前端主题WebStack-Hugo的适配性
      • +
    +
    +