v2.0.25-20230607

2025-08-10 08:51:49 +00:00 · 2023-06-07 20:53:30 +08:00
parent 332cd313fb
commit 1733e995d6
7 changed files with 56 additions and 20 deletions
--- 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,
--- 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']){
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.0.24-20230606
+v2.0.25-20230607
--- 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);
    });
-}
+}
--- a/templates/admin/page/add_link_tpl.php
+++ b/templates/admin/page/add_link_tpl.php
@@ -1,14 +1,15 @@
 <?php $title='添加链接'; require 'header.php';  ?>
 <style>
-    .layui-textarea {min-height: 70px;}
    body {
-     margin: 0px 0px 0px 0px; 
-     background: bottom; 
-}
+        margin: 0px 0px 0px 0px; 
+        background: bottom; 
+    }
+    .layui-textarea {min-height: 70px;}
+    .layui-form-select dl {max-height: 190px;}
 </style>
-<div class="layuimini-container" style="height: 420px;">
-    <div class="layuimini-main" style=" margin-left: 0px; ">
-     <form class="layui-form layuimini-form">
+<div class="layuimini-container">
+    <div class="layuimini-main" style="margin-left: 0px;">
+     <form class="layui-form layuimini-form" style="padding-bottom: 20px;">
         
        <div class="layui-form-item">
            <label class="layui-form-label required" >URL</label>
--- 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"])
                <div class="layui-form-mid layui-word-aux">部分主题和插件需设为开放模式!</div>
            </div>
            
+            <div class="layui-form-item">
+                <label class="layui-form-label">登录后</label>
+                <div class="layui-input-inline" >
+                    <select name="login_page">
+                        <option value="admin" selected>进入后台</option>
+                        <option value="index">进入主页</option>
+                        <option value="auto">自动识别</option>
+                    </select>
+                </div>
+                <div class="layui-form-mid layui-word-aux">自动识别:移动设备登录则进入主页,反之进入后台</div>
+            </div>
+            
            <fieldset class="layui-elem-field layui-field-title"><legend>站点设置</legend></fieldset>
            <div class="layui-form-item">
                <label class="layui-form-label">主标题</label>
--- a/templates/admin/page/updatelog.php
+++ b/templates/admin/page/updatelog.php
@@ -2,6 +2,18 @@
 <body>
 <div class="layuimini-container">
 <div class="layuimini-main" style=" margin-left: 20px;">
+    <li class="layui-timeline-item">
+        <i class="layui-icon layui-timeline-axis"></i>
+        <div class="layui-timeline-content layui-text">
+            <h4 class="layui-timeline-title">v2.0.25-20230607</h4>
+            <ul>
+                <li>[修复] 默认设置>登录保持设为浏览器关闭时无法保存</li>
+                <li>[修复] 导入OneNav Extend 升级数据时,如果description存在Null值造成导入失败</li>
+                <li>[新增] 默认设置>可定义登录后进入后台还是主页 (注:此页面配置仅对新注册账号有效,不会修改现有用户的配置)</li>
+                <li>[优化] 前端主题WebStack-Hugo的适配性</li>
+            </ul>
+        </div>
+    </li>
    <li class="layui-timeline-item">
        <i class="layui-icon layui-timeline-axis"></i>
        <div class="layui-timeline-content layui-text">