v2.1.07-20231130

2025-08-10 08:51:49 +00:00 · 2023-12-01 00:14:39 +08:00
parent 01fdca800b
commit f2ce9c4eef
15 changed files with 447 additions and 19 deletions
--- a/index.php
+++ b/index.php
@@ -35,8 +35,8 @@ if($db_config['type'] == 'sqlite'){
 $global_config = unserialize( get_db("global_config", "v", ["k" => "o_config"]) ); //全局配置
 $c = Get('c');
 $libs = $global_config['Libs'];
-$layui['js']  = $libs.'/Layui/v2.8.17/layui.js';
-$layui['css'] = $libs.'/Layui/v2.8.17/css/layui.css';
+$layui['js']  = $libs.'/Layui/v2.9.0/layui.js';
+$layui['css'] = $libs.'/Layui/v2.9.0/css/layui.css';
 $global_config['static_link'] = isset($global_config['static_link']) ? $global_config['static_link'] : 0;
 define('libs',$global_config['Libs']);
 define('SysVer',Get_Version());
--- a/static/Layui/v2.9.0/css/layui.css
+++ b/static/Layui/v2.9.0/css/layui.css
--- a/static/Layui/v2.9.0/font/iconfont.eot
+++ b/static/Layui/v2.9.0/font/iconfont.eot
--- a/static/Layui/v2.9.0/font/iconfont.svg
+++ b/static/Layui/v2.9.0/font/iconfont.svg
--- a/static/Layui/v2.9.0/font/iconfont.ttf
+++ b/static/Layui/v2.9.0/font/iconfont.ttf
--- a/static/Layui/v2.9.0/font/iconfont.woff
+++ b/static/Layui/v2.9.0/font/iconfont.woff
--- a/static/Layui/v2.9.0/font/iconfont.woff2
+++ b/static/Layui/v2.9.0/font/iconfont.woff2
--- a/static/Layui/v2.9.0/layui.js
+++ b/static/Layui/v2.9.0/layui.js
--- a/system/ATool.php
+++ b/system/ATool.php
@@ -227,7 +227,7 @@ function echo_Atool(){
 <head>
    <meta charset="UTF-8">
    <title>ATool 工具箱</title>
-    <link rel="stylesheet" href="../static/Layui/v2.8.17/css/layui.css">
+    <link rel="stylesheet" href="../static/Layui/v2.9.0/css/layui.css">
    <style>
        html, body {min-width: 1200px;background-color: #fff;position: relative;}
        .page-wrapper {width: 1200px;margin: 0 auto;padding: 0 15px;}
@@ -279,7 +279,7 @@ function echo_Atool(){
        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="del_otp" title="移除OTP登录验证">删OTP</a>
    </div>
 </script>
-<script src="../static/Layui/v2.8.17/layui.js"></script>
+<script src="../static/Layui/v2.9.0/layui.js"></script>
 <script src="../static/jquery/jquery-3.6.0.min.js"></script>
 <script src="../static/jquery/jquery.md5.js"></script>
 <script src="../templates/admin/js/public.js?v=<?php echo time();?>"></script>
@@ -416,7 +416,7 @@ function echo_verify(){ ?>
 <head>
    <meta charset="UTF-8">
    <title>ATool 工具箱</title>
-    <link rel="stylesheet" href="../static/Layui/v2.8.17/css/layui.css">
+    <link rel="stylesheet" href="../static/Layui/v2.9.0/css/layui.css">
    <link rel="stylesheet" href="../static/Other/login.css">
 </head>
 <body>
@@ -441,7 +441,7 @@ function echo_verify(){ ?>
    </div>
 </div>
 <script src = "../static/jquery/jquery-3.6.0.min.js"></script>
-<script src = "../static/Layui/v2.8.17/layui.js"></script>
+<script src = "../static/Layui/v2.9.0/layui.js"></script>
 <script src = '../static/jquery/jquery.md5.js'></script>
 <script>
    layui.use(['form','jquery'], function () {
--- a/system/install.php
+++ b/system/install.php
@@ -4,8 +4,8 @@ if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Fou
 //初始化
 session_name('TwoNav_initial');
 session_start();
-$layui['js']  = './static/Layui/v2.8.17/layui.js';
-$layui['css'] = './static/Layui/v2.8.17/css/layui.css';
+$layui['js']  = './static/Layui/v2.9.0/layui.js';
+$layui['css'] = './static/Layui/v2.9.0/css/layui.css';

 //判断请求类型
 if($_SERVER['REQUEST_METHOD'] === 'POST'){
--- a/system/public.php
+++ b/system/public.php
@@ -503,15 +503,18 @@ function Get_IP() {
        $ip = getenv('HTTP_CLIENT_IP'); 
    }elseif(getenv('HTTP_X_FORWARDED_FOR')) { 
        $ip = getenv('HTTP_X_FORWARDED_FOR'); 
-    } elseif (getenv('HTTP_X_FORWARDED')) { 
+    }elseif (getenv('HTTP_X_FORWARDED')) { 
        $ip = getenv('HTTP_X_FORWARDED'); 
-    } elseif (getenv('HTTP_FORWARDED_FOR')) { 
+    }elseif (getenv('HTTP_FORWARDED_FOR')) { 
        $ip = getenv('HTTP_FORWARDED_FOR'); 
-    } elseif (getenv('HTTP_FORWARDED')) { 
+    }elseif (getenv('HTTP_FORWARDED')) { 
        $ip = getenv('HTTP_FORWARDED'); 
    }else{ 
        $ip = $_SERVER['REMOTE_ADDR']; 
-    } 
+    }
+    if(strpos($ip, ',') != false) {    
+        $ip = reset(explode(",", $ip));  
+    }
    return $ip; 
 }

--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.1.06-20231113
+v2.1.07-20231130
--- a/templates/admin/page/updatelog.php
+++ b/templates/admin/page/updatelog.php
@@ -5,7 +5,25 @@
    <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.1.06-20231113</h4>
+            <h4 class="layui-timeline-title">v2.1.07-20231130</h4>
+            <ul>
+                <li>[升级] Layui组件由2.8.17升级到2.9.0</li>
+                <li>[新增] 系统设置>限制相关>文章图片大小自定义,单位KB</li>
+                <li>[变更] 文章编辑器上传图片大小限制由5M改为默认不限制,如需限制请到系统设置中自定义</li>
+                <li>[变更] 文章编辑器单次上传图片数量由10改为100</li>
+                <li>[模板] WebStack-Hugo > 处于站内搜索时搜索图标可以被点击跳转的问题/新增页内标题自定义/公告信息</li>
+                <li>[模板] 新增主页模板:liuyike233 (简约型)</li>
+                <li>[模板] Snavigation在底部添加管理入口</li>
+                <li>[修复] 访问限制跳转到引导页时登录/注册连接错误的bug</li>
+                <li>[修复] 引导页未正确读取默认站点标题的bug</li>
+                <li>[变更] 部分环境获取请求IP遇到多个IP地址仅取首个</li>
+            </ul>
+        </div>
+    </li>
+    <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.1.06-20231114</h4>
            <ul>
                <li>[修复] 开启离线模式时概要页依旧获取在线数据,V0921</li>
                <li>[优化] 为部分操作添加处理中的效果( 防止网络极差的用户以为没点到而重复点击 )</li>
--- a/templates/guide/default/index.php
+++ b/templates/guide/default/index.php
@@ -2,9 +2,9 @@
 <html>
 <head>
    <meta charset="utf-8" />
-    <title><?php echo $site['Title'];?></title>
-    <meta name="keywords" content="<?php echo $site['keywords']; ?>">
-    <meta name="description" content="<?php echo $site['description']; ?>">
+    <title><?php echo $s_site['title'];?></title>
+    <meta name="keywords" content="<?php echo $s_site['keywords']; ?>">
+    <meta name="description" content="<?php echo $s_site['description']; ?>">
    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
    <link rel="stylesheet" href="<?php echo $theme_dir;?>/main.css" />
    <link rel="shortcut icon" href="<?php echo $favicon;?>">
--- a/templates/guide/default/info.json
+++ b/templates/guide/default/info.json
@@ -2,8 +2,8 @@
 	"name":	"默认模板",
 	"description":	"模板来自于html5up.net",
 	"homepage":	"https://gitee.com/tznb/TwoNav",
-	"version":	"2.1.0",
-	"update":	"2023/09/28",
+	"version":	"2.1.1",
+	"update":	"2023/11/27",
 	"author":	"TwoNav",
 	"config": {
        "title":"",