v2.1.18-20241105

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.9.13/layui.js';
-$layui['css'] = $libs.'/Layui/v2.9.13/css/layui.css';
+$layui['js']  = $libs.'/Layui/v2.9.18/layui.js';
+$layui['css'] = $libs.'/Layui/v2.9.18/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());

system/api_root.php

@@ -453,7 +453,7 @@ function other_services(){
         'method'   => $_GET['type'],
         'sys'      => $_POST['sys']
     ];
-    $overtime = !isset($global_config['Update_Overtime']) ? 3 : ($global_config['Update_Overtime'] < 3 || $global_config['Update_Overtime'] > 60 ? 3 : $global_config['Update_Overtime']);
+    $overtime = 30;
     // 判断操作类型
     if($_GET['type'] == 'query_key' || $_GET['type'] == 'save_key'){
         $Res = ccurl("http://service.twonav.cn/service.php",$overtime,true,$post);

system/firewall.php

@@ -21,7 +21,7 @@ foreach($_POST as $key =>$value){
         }
     }
     //拦截SQL注入
-    if($global_config['SQL_WAF'] == 1 ){
+    if(!isset($code) && $global_config['SQL_WAF'] == 1 ){
         if(preg_match("/\s+(or|xor|and)\s+(=|<|>|'|".'")/i',$value)){
             $code = 2101;
         }elseif(preg_match("/select.+(from|limit)/i",$value)){
@@ -43,5 +43,10 @@ foreach($_POST as $key =>$value){
         }
     }
     
-    if(!empty($code)){msgA(['code'=>$code,'msg'=>$code.':已拦截不合法参数！','key'=>$key,'Value'=>$value,'method'=>$method ]);}
+    if(!empty($code)){
+        $tips = $code <= 2100 ? 
+            '<br />如果您是站长,请前往系统设置关闭防XSS脚本<br />如果您是用户,请联系站长处理': 
+            '<br />如果您是站长,请前往系统设置关闭防SQL注入<br />如果您是用户,请联系站长处理';
+        msgA(['code'=>$code,'msg'=>$code.':已拦截不合法参数！'.$tips,'key'=>$key,'Value'=>$value,'method'=>$method ]);
+    }
 }

system/templates.php

@@ -121,7 +121,11 @@ if($config_type == 'user'){
     if(!check_purview('header',1)){$site['custom_header'] = '';}
     if(!check_purview('footer',1)){$site['custom_footer'] = '';}
     
-    //主页标题( 主标题 - 副标题 )
+    //主页标题(分类页面显示分类名-描述)
+    if(isset($_GET['cid']) && intval($_GET['cid']) > 0){
+        $teml_cd = get_db('user_categorys',['name','description'],['uid'=>UID,'cid'=>intval($_GET['cid'])]);
+        $site['title'] = $teml_cd['name']; $site['subtitle'] = $teml_cd['description']; 
+    }
     $site['Title']  =  $site['title'].(empty($site['subtitle'])?'':' - '.$site['subtitle']);
     
     //站点图标
@@ -167,22 +171,14 @@ function geticourl($icon,$link){
     }
     if ($site['link_icon'] == 'default'){
         return($GLOBALS['libs'].'/Other/default.ico');
-    }elseif ($icon ==20){
+    }elseif ($icon == 20){
         return('./index.php?c=icon&url='.base64_encode($link['real_url']));
-    }elseif ($icon ==21){
+    }elseif ($icon == 21){
         return('./ico/'.base64_encode($link['real_url']));
-    }elseif($icon ==2){ 
+    }elseif($icon == 2){ 
         return('https://favicon.png.pub/v1/'.base64_encode(get_url_host($link['real_url'],true,true)));
-    }elseif($icon ==4){
-        return('https://api.15777.cn/get.php?url='.$link['real_url']);
-    }elseif($icon ==5){
-        return('https://favicon.cccyun.cc/'.$link['real_url']);
-    }elseif($icon ==6){
-        return('https://api.iowen.cn/favicon/'.parse_url($link['real_url'])['host'].'.png');
-    }elseif($icon ==7){
-        return('https://toolb.cn/favicon/'.parse_url($link['real_url'])['host']);
-    }elseif($icon ==8){
-        return('https://apis.jxcxin.cn/api/Favicon?url='.$link['real_url']);
+    }elseif($icon == 6){
+        return('https://t3.gstatic.cn/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&size=128&url='.$link['real_url']);
     }else{
         return('./system/ico.php?text='.mb_strtoupper(mb_substr($link['title'], 0, 1)));
     }

system/version.txt

@@ -1 +1 @@
-v2.1.17-20240730
+v2.1.18-20241105

templates/admin/page/SiteSetting.php

@@ -72,11 +72,11 @@
                         <option value="0" selected>离线图标(首字图标)</option>
                         <option value="20" >本地服务</option>
                         <option value="21" >本地服务(伪静态)</option>
-                        <option value="2" >favicon.png.pub (小图标)</option>
-                        <option value="6" >api.iowen.cn</option>
+                        <option value="2" >第三方:favicon.png.pub (小图标)</option>
+                        <option value="6" >第三方:gstatic.cn (大图标)</option>
                     </select>
                 </div>
-                <div class="layui-form-mid layui-word-aux">所有API接口均由其他大佬提供!若有异常请尝试更换接口!</div>
+                <div class="layui-form-mid layui-word-aux">三方接口由其他站长提供!若有异常请尝试更换接口!建议使用本地服务!</div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">重复链接</label>

templates/admin/page/root/vip.php

@@ -15,7 +15,7 @@ if(!empty($Notice)){
         <h4 style = "margin-bottom:1em;"><font color="red">不要使用盗版/破解版,盗版无法升级却存在诸多问题,所造成的损失与本程序无关</font></h4>
         <blockquote class="layui-elem-quote layui-text" style="color:red" >
             <li> 如何激活授权: </li>
-            <li>1. 购买授权后将授权号(卡密)和邮箱填入下方并点击保存</li>
+            <li>1. 购买授权后将授权卡密和邮箱填入下方并点击保存</li>
             <li>2. 返回概要页面 > 刷新 > 更新系统 ( 不更新还是免费版 )</li>
             <li>3. 更新成功后就是授权版的系统了,可使用全部功能</li>
             <li>4. 禁止传播/破解授权版源代码,违者封授权并追责</li>
@@ -66,21 +66,11 @@ if(!empty($Notice)){
                 <input type="text" name="type_name" id ="type_name" value="<?php echo $subscribe['type_name'] ?? ''; ?>" autocomplete="off" placeholder="若未正确显示请点击保存设置" class="layui-input">
             </div>
         </div>
-<?php if(get_db('global_config','v',["k" => "sys_switch"]) == 'show' && $subscribe['type'] == '3'){ ?>
-        <div class="layui-form-item">
-            <label class="layui-form-label">版本切换</label>
-            <div class="layui-input-inline" >
-                <select name="sys" id="sys">
-                    <option value="biaozhun" selected>标准版</option>
-                    <option value="gaoji" >高级版</option>
-                </select>
-            </div>
-            <div class="layui-form-mid layui-word-aux">希望使用的系统版本 ( 下次更新时 )</div>
-        </div>
-<?php } ?>
+
         <div class="layui-btn-group">
             <button class="layui-btn layui-btn-normal" lay-submit lay-filter="save_key">保存</button>
             <button class="layui-btn layui-btn-danger" lay-submit lay-filter="buy_vip" data-url="<?php echo empty($data['pay_rul']) ?'':$data['pay_rul']?>" >购买授权</button>
+            <button class="layui-btn layui-btn-danger" lay-submit lay-filter="Modify_Domain" data-url="https://docs.twonav.cn/#/books/root-02?id=%e4%bf%ae%e6%94%b9%e5%9f%9f%e5%90%8d" >修改域名</button>
             <button class="layui-btn layui-bg-purple" type="button" id="validate" style="<?php echo empty($subscribe['order_id']) ? 'display:none;':''; ?>">正版验证</button>
         </div>
 
@@ -153,7 +143,12 @@ layui.use(['jquery','form'], function () {
             layer.msg('请求失败', {icon: 5});
         });
     });
-    
+    //修改域名
+    form.on('submit(Modify_Domain)', function(data){
+        let url = $(this).attr('data-url');
+        window.open($(this).attr('data-url'));
+        return false;
+    });
     //购买授权
     form.on('submit(buy_vip)', function(data){
         let url = $(this).attr('data-url');

templates/admin/page/updatelog.php

@@ -2,6 +2,23 @@
 <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.1.18-20241105</h4>
+            <ul>
+                <li>[升级] Layui组件由2.9.14升级到2.9.18</li>
+                <li>[升级] Medoo组件由2.1.8升级到2.1.12</li>
+                <li>[新增] 授权管理页面增加修改域名入口</li>
+                <li>[变更] 分类页面标题显示分类名称-分类描述</li>
+                <li>[修复] 默认登录模板输入密码处点击小眼睛未显示密码</li>
+                <li>[优化] 调高超时参数以兼顾网络较慢的环境</li>
+                <li>[优化] 默认登录模板检测到使用IE浏览器时弹出提示</li>
+                <li>[优化] 内置防火墙拦截时提示如何解决</li>
+                <li>[修复] 替换已失效的第三方图标接口</li>
+            </ul>
+        </div>
+    </li>
     <li class="layui-timeline-item">
         <i class="layui-icon layui-timeline-axis"></i>
         <div class="layui-timeline-content layui-text">

templates/login/default/index.php

@@ -13,10 +13,6 @@
     <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
     <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css?v=<?php echo SysVer; ?>">
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon">
-    <!--[if lt IE 9]>
-    <script src="<?php echo $libs?>/Other/html5.min.js"></script>
-    <script src="<?php echo $libs?>/Other/respond.min.js"></script>
-    <![endif]-->
 </head>
 <body>
 <div class="main-body">
@@ -59,6 +55,11 @@
 <script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>
 <script src = "<?php echo $layui['js']; ?>"></script>
 <script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
+<script>
+    if (/Trident/.test(navigator.userAgent) || /MSIE/.test(navigator.userAgent)) {
+        alert("当前浏览器版本过低，请使用Chrome浏览器或火狐浏览器等现代浏览器");
+    }
+</script>
 <script>
     layui.use(['form','jquery'], function () {
         var $ = layui.jquery,
@@ -68,10 +69,10 @@
         $('.bind-password').on('click', function () {
             if ($(this).hasClass('icon-5')) {
                 $(this).removeClass('icon-5');
-                $("input[name='Password']").attr('type', 'password');
+                $("input[name='password']").attr('type', 'password');
             } else {
                 $(this).addClass('icon-5');
-                $("input[name='Password']").attr('type', 'text');
+                $("input[name='password']").attr('type', 'text');
             }
         });
 

templates/login/default/info.json

@@ -2,7 +2,7 @@
 	"name":	"默认模板",
 	"description":	"默认",
 	"homepage":	"https://gitee.com/tznb/TwoNav",
-	"version":	"2.1.1",
-	"update":	"2023/12/20",
+	"version":	"2.1.2",
+	"update":	"2024/10/18",
 	"author":	"TwoNav"
 }