v2.0.19-20230515

2025-08-10 08:51:49 +00:00 · 2023-05-15 10:23:08 +08:00
parent a6a3c66278
commit ed137fd839
11 changed files with 39 additions and 12 deletions
--- a/README.md
+++ b/README.md
@@ -21,7 +21,6 @@ TwoNav 是一款开源免费的书签（导航）管理程序，界面简洁，
 * 数据库: SQLite3 或 MySQL > 5.6.0

 ### 功能特色
-* 支持
 * 支持后台管理
 * 支持私有链接
 * 支持加密链接
--- a/system/api.php
+++ b/system/api.php
@@ -944,7 +944,7 @@ function write_site_setting(){
        'keywords'=>['empty'=>true],
        'description'=>['empty'=>true],
        'link_model'=>['v'=>['direct','Privacy','Privacy_js','Privacy_meta','301','302','Transition'],'msg'=>'链接模式参数错误'],
-        'main_link_priority'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'主链优先参数错误'],
+        'main_link_priority'=>['int'=>true,'min'=>0,'max'=>3,'msg'=>'主链优先参数错误'],
        'link_icon'=>['int'=>true,'min'=>0,'max'=>10,'msg'=>'链接图标参数错误'],
        'site_icon'=>['empty'=>true],
        'top_link'=>['int'=>true,'min'=>0,'max'=>20,'msg'=>'热门链接参数错误'],
--- a/system/click.php
+++ b/system/click.php
@@ -132,9 +132,9 @@ if($global_config['link_extend'] == 1 && check_purview('link_extend',1) && in_ar
 if(!empty($link['url_standby'])) {
    $link['url_standby'] = unserialize($link['url_standby']);
    //主链优先模式
-    if($site['main_link_priority'] == 1){
-        $code = get_http_code($link['url'],3); 
-        if(in_array(intval($code),[200,301,302]) ){ 
+    if(!empty($site['main_link_priority']) && $site['link_model'] != 'Transition'){
+        $code = get_http_code($link['url'],3,($site['main_link_priority'] == 1)); 
+        if(in_array(intval($code),[200,301,302,401]) ){ 
            $site['link_model'] =  $site['link_model'] == 'direct' ? '302' : $site['link_model'];
        }else{
            require $transit_path;
--- a/system/index.php
+++ b/system/index.php
@@ -164,7 +164,7 @@ function get_links($fid) {
        $click = false; $lock = false;
        
        //直连模式,但存在备用链接
-        if ($site['link_model'] == 'direct' && !empty($link['url_standby'])){
+        if ($site['link_model'] == 'direct' && $site['main_link_priority'] != '3' && !empty($link['url_standby'])){
            $click = true;
        }
        
--- a/system/public.php
+++ b/system/public.php
@@ -497,11 +497,11 @@ function Get_IP() {
 }

 //获取URL状态码
-function get_http_code($url,$TIMEOUT = 10) { 
+function get_http_code($url,$TIMEOUT = 10 ,$NOBODY = true) { 
    $curl = curl_init(); 
    curl_setopt($curl, CURLOPT_URL, $url);
    curl_setopt($curl, CURLOPT_HEADER, 1);
-    curl_setopt($curl, CURLOPT_NOBODY, true);
+    curl_setopt($curl, CURLOPT_NOBODY, $NOBODY);
    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
    curl_setopt($curl, CURLOPT_TIMEOUT, $TIMEOUT);
    curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36');
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.0.18-20230510
+v2.0.19-20230515
--- a/templates/admin/js/link.js
+++ b/templates/admin/js/link.js
@@ -40,13 +40,20 @@ layui.use(['form','upload','miniTab'], function () {
                    }
                    return false;
                }
-                layer.msg('添加成功！', {icon: 1,time: 600,
+                layer.msg('添加成功！', {icon: 1,time: 700,
 				    end: function() {
 				        if(_GET('source') == 'tpl'){ //第三方调用时刷新父页面
 				            parent.location.reload();
 				        }else if(_GET('source')=='link_list'){ // 链接列表调用
 				            parent.layui.table.reload('table');//刷新父页面的表格
 				            $('#close').click();//关闭子页面
+				        }else{
+				            if($("#continuity").is(":checked")){
+				                location.reload();
+				            }else{
+				                $('#close').click();
+				            }
+				            
 				        }
 				    }
                });
@@ -181,6 +188,10 @@ layui.use(['form','upload','miniTab'], function () {
        $("#reset").click();
        //加载预览图
        preview_icon(form_data.icon);
+    }else{
+        if(_GET('fid') > 0){
+            form.val('form',{"fid":_GET('fid')});
+        }
    }
    
 //layui>end
--- a/templates/admin/js/link_list.js
+++ b/templates/admin/js/link_list.js
@@ -143,7 +143,7 @@ layui.use(['form','table','dropdown','miniTab'], function () {
                    maxmin:false,
                    shadeClose: true,
                    area: ['100%', '100%'],
-                    content: './index.php?c=admin&page=link_add&source=link_list&u=' + u,
+                    content: './index.php?c=admin&page=link_add&source=link_list&u=' + u +"&fid=" + $('#fid').val(),
                });
            //做一个关闭时检查是否需要刷新数据?
            return;
--- a/templates/admin/page/SiteSetting.php
+++ b/templates/admin/page/SiteSetting.php
@@ -57,7 +57,9 @@
                <div class="layui-input-inline" >
                    <select name="main_link_priority" >
                        <option value="0" selected>关闭</option>
-                        <option value="1">开启</option>
+                        <option value="1">开启 (快速检测)</option>
+                        <option value="2">开启 (常规检测)</option>
+                        <option value="3">开启 (强制优先)</option>
                    </select>
                </div>
                <div class="layui-form-mid layui-word-aux">特定条件下生效,主链接可用则直接跳转反之进入过渡页,用法参照帮助文档</div>
--- a/templates/admin/page/link_list.php
+++ b/templates/admin/page/link_list.php
@@ -10,7 +10,10 @@
            <label class="layui-form-label " style="width:60px;padding-left: 5px;padding-right: 5px;">分类筛选:</label>
            <div class="layui-input-inline">
                <select id="fid" lay-filter="fid" name="categorys" lay-search>
+                    <option value="0" selected="">全部</option>
+                    <optgroup label="用户分类">
                    <?php echo_category(true); ?>
+                    </optgroup>
                </select>
            </div>
        </div>
--- 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.19-20230515</h4>
+            <ul>
+                <li>[修复] 链接列表分类筛选不能选择全部 (上个版本造成)</li>
+                <li>[新增] 主链优先功能,新增检测方法的选择 ( 常规检测比快速检测准,但相对会慢一点 )</li>
+                <li>[优化] 主链优先检测将401视为可用 ( 兼容需要BasicAuth认证的网页 )</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">