v2.1.12-20240308

.htaccess

@@ -2,11 +2,4 @@
 RewriteEngine On
 # 安全规则(必选)
 RewriteRule ^templates/.*\.(php|tar|gz|zip|info|log|json)$ - [F]
-RewriteRule ^data/.*\.(db|db3|php|sql|tar|gz|zip|info|log|json)$ - [F]
-# 重写规则(可选)
-RewriteRule '^login$' ./index.php?c=login [L] 
-RewriteRule '^admin$' ./index.php?c=admin [L]
-RewriteRule '^ico/(.+)' ./index.php?c=icon&url=$1 [L]
-RewriteRule '^([A-Za-z0-9]+)$' ./index.php?u=$1 [L]
-RewriteRule '^(.+)/click/([A-Za-z0-9]+)$' ./index.php?c=$2&id=$3&u=$1 [L]
-RewriteRule '^(.+)/click/(.+)' ./$3 [L]
+RewriteRule ^data/.*\.(db|db3|php|sql|tar|gz|zip|info|log|json)$ - [F]

README.md

@@ -1,23 +1,36 @@
-TwoNav 是一款开源免费的书签（导航）管理程序，界面简洁，安装简单，使用方便。TwoNav可帮助你将浏览器书签集中式管理，解决跨设备、跨平台、跨浏览器之间同步和访问困难问题，做到一处部署，随处访问。
+TwoNav 是一款开源的书签（导航）管理程序，界面简洁，安装简单，使用方便，基础功能免费。TwoNav可帮助你将浏览器书签集中式管理，解决跨设备、跨平台、跨浏览器之间同步和访问困难问题，做到一处部署，随处访问。
 
 - **演示站**: [http://two.lm21.top](http://two.lm21.top) 
 - **仅供体验,定期清理数据** 账号密码`admin`
 
-
 ### 相关文档
 * [安装教程](https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968668&doc_id=3767990) | [使用说明](https://gitee.com/tznb/TwoNav/wikis) | [下载TwoNav](https://gitee.com/tznb/TwoNav/releases)
 * [OneNav Extend 升级到 TwoNav](https://gitee.com/tznb/OneNav/wikis/pages?sort_id=7955135&doc_id=2439895)
 
+### 作者声明
+* 本程序没有二开版、除了下面的项目地址均为盗版。
+* 使用盗版软件存在法律风险且没有任何保障。
+* 未经许可禁止用于商业用途、转载请保留作品出处。
+
+### 项目由来
+```
+起初只是搭建一个自己的书签站、网上找了一圈看中了小z的OneNav。
+因功能无法满足我,开始基于ONeNav各种魔改、然后就有了OneNav Extend、这个名字还是小z给取的。
+后来和小z都开始收费后、由于用户容易搞混等各种原因、于是我重写代码并改名为TwoNav。
+其中一些OneNav的特色依旧是保留下来、并兼容OneNav的一些插件。
+```
+
 ### 项目地址
 - [https://gitee.com/tznb/TwoNav](https://gitee.com/tznb/TwoNav)
 - [https://github.com/tznb1/TwoNav](https://github.com/tznb1/TwoNav)
 
 ### 技术支持
-- QQ: 271152681
-- QQ群: 695720839
+- 技术支持QQ: 271152681
+- 授权版QQ群: 695720839
+- 免费版QQ群: 621815595
 
 ### 运行环境
-* PHP: 7.3 - 8.2 
+* PHP: 7.3 - 8.2
 * 数据库: SQLite3 或 MySQL > 5.6.0
 
 ### 功能特色

data/README.md

@@ -0,0 +1 @@
+用户数据目录,请勿随意删除!

data/temp/README.md

@@ -0,0 +1 @@
+临时目录,可删除

data/user/README.md

@@ -0,0 +1 @@
+用户数据目录,请勿随意删除!

index.php

@@ -15,9 +15,10 @@ if($db_config['type'] == 'sqlite'){
     }catch (Exception $e) {
         Amsg(-1,'载入数据库失败'.$db_config['path']); 
     }
-}elseif($db_config['type'] == 'mysql'){
+}elseif($db_config['type'] == 'mysql' || $db_config['type'] == 'mariadb' ){
     try {
-        $db = new Medoo\Medoo(['type' => 'mysql',
+        $db = new Medoo\Medoo([
+            'type' => $db_config['type'],
             'host' => $db_config['host'],
             'port' => $db_config['port'],
             'database' => $db_config['name'],
@@ -34,23 +35,19 @@ 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.10/layui.js';
-$layui['css'] = $libs.'/Layui/v2.8.10/css/layui.css';
+$layui['js']  = $libs.'/Layui/v2.9.7/layui.js';
+$layui['css'] = $libs.'/Layui/v2.9.7/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());
 define('Debug',$global_config['Debug'] == 1);
+define('static_link',$global_config['static_link'] > 0);
 
-if(!in_array($c,[$global_config["Register"],'ico','icon'])){
-    $u = Get('u');
-    if(empty($u) && $global_config['Sub_domain'] == 1 && is_subscribe('bool')){
-        $cut = explode('.',$_SERVER["HTTP_HOST"]);
-        if(count($cut) == 3){
-            $USER_DB = get_db("global_user", "*", ["User"=>reset($cut)]);
-            if(!empty($USER_DB) && check_purview('Sub_domain',1)){
-                $_COOKIE['Default_User'] = $USER_DB['User'];unset($cut);
-            }
-        }
+if(!in_array($c,[$global_config["Register"],'ico','icon','auth'])){
+    if($global_config['static_link'] > 0 && !empty($UUID)){
+        $_GET['u'] = $global_config['static_link'] == 2 ? get_db("global_user", "User", ["ID"=>$UUID]) : $UUID;
     }
+    $u = Get('u');
     $u = !empty($u)?$u:(!empty($_COOKIE['Default_User'])?$_COOKIE['Default_User']:(!empty($global_config['Default_User'])?$global_config['Default_User']:'admin'));//优先级:Get>Host>Cookie>默认用户>admin
     $USER_DB = get_db("global_user", "*", ["User"=>$u]);
     //没找到账号显示404
@@ -66,15 +63,20 @@ if(!in_array($c,[$global_config["Register"],'ico','icon'])){
 }
 
 session_name('TwoNavSID');
+if(defined('UID')){
+    define('is_login',is_login()); $is_login = is_login;
+}
+
 if(empty($c) || $c == 'index'){
+    $c = 'index';
     require "./system/index.php";//主页
 }elseif($c == $global_config["Register"]){
     require "./system/Register.php";//注册
 }elseif($c == $global_config['Login']  || $c == $USER_DB['Login']){
     require "./system/login.php";//登陆
-}elseif(in_array($c,['admin','click','api','ico','icon','verify'])){
+}elseif(in_array($c,['admin','click','api','ico','icon','verify','auth'])){
     require "./system/{$c}.php";
-}elseif(in_array($c,['apply','guestbook','article'])){
+}elseif(in_array($c,['apply','guestbook','article','sitemap'])){
     if($global_config['Maintenance'] != 0){Amsg(-1,'网站正在进行维护,请稍后再试!');}
     require "./system/expand/{$c}.php";
 }else{

rewrite.php

@@ -0,0 +1,47 @@
+<?php  //负责接管和处理Nginx伪静态规则
+
+define('URI',$_SERVER['REQUEST_URI']);
+
+//登录/管理/注册页面(不带html)
+if (URI === '/login' || URI === '/admin' || URI == '/register') {
+    $_GET['c'] = substr(URI, 1);
+//管理页面
+}elseif (preg_match('/^\/admin-([A-Za-z0-9]+)\.html?$/', URI, $matches)) {
+    $_GET['c'] = 'admin';
+    $UUID = $matches[1];
+//专属登录页面
+}elseif (preg_match('/^\/login-([A-Za-z0-9]+)-([A-Za-z0-9]+)\.html?$/', URI, $matches)) {
+    $UUID = $matches[1];
+    $_GET['c'] = $matches[2];
+//收录和留言
+}elseif (preg_match('/^\/(apply|guestbook)-([A-Za-z0-9]+)\.html?$/', URI, $matches)) {
+    $_GET['c'] = $matches[1];
+    $UUID = $matches[2];
+//本地图标
+}elseif(preg_match('/^\/ico\/(.+)$/', URI, $matches)){
+    $_GET['c'] = 'icon';
+    $_GET['url'] = $matches[1];
+//用户主页
+}elseif (preg_match('/^\/([A-Za-z0-9]+)\.html?$/', URI, $matches)) {
+    $UUID = $matches[1];
+//过渡/文章
+}elseif(preg_match('/^\/(click|article)-([A-Za-z0-9]+)-(\d+)\.html?$/', URI, $matches)) {
+    $_GET['c'] = $matches[1];
+    $UUID = $matches[2];
+    $_GET['id'] = $matches[3];
+//分类页面
+}elseif(preg_match('/^\/category-([A-Za-z0-9]+)-(\d+)\.html?$/', URI, $matches)) {
+    $_GET['c'] = 'index';
+    $UUID = $matches[1];
+    $_GET['oc'] = $matches[2];
+//站点地图
+}elseif(URI === '/sitemap.xml'){
+    $_GET['c'] = 'sitemap';
+//匹配失败
+}else{
+    header("HTTP/1.0 404 Not Found");
+    exit("404 Not Found.<br>".URI);
+}
+
+include 'index.php';
+exit;

system/ATool.php

@@ -97,6 +97,7 @@ if(!empty($_GET['type'])){
             msg(-1,'密码不能为空');
         }
         $RegTime = get_db('global_user','RegTime',['ID'=>$_POST['ID']]);
+        delete_db( "user_login_info", ["uid"=>$_POST['ID']] );
         update_db('global_user',['Password'=>Get_MD5_Password($_POST['new_pwd'],$RegTime)],["ID" => $_POST['ID'] ],[1,'修改成功']);
     }elseif($_GET['type'] == 'set_root'){
         update_db('global_user',['UserGroup'=>'root'],["ID" => $_POST['ID'] ],[1,'修改成功']);
@@ -165,6 +166,14 @@ if(!empty($_GET['type'])){
         update_db("user_login_info", ["user" => $_POST['new_user_name']], ["user" => $USER['User']]);
         update_db("user_log", ["user" => $_POST['new_user_name']], ["user" => $USER['User']]);
         update_db("global_user", ["User" => $_POST['new_user_name']], ["ID" => $_POST['ID']],[1,'操作成功']);
+    }elseif($_GET['type'] == 'del_otp'){
+        $user_data = get_db('global_user','*',['ID'=>$_POST['ID']]);
+        $LoginConfig = unserialize($user_data['LoginConfig']);
+        if(empty($LoginConfig['totp_key'])){
+            msgA(['code'=>-1,'msg'=>'当前账号未开启OTP双重验证']);
+        }
+        $LoginConfig['totp_key'] = '';
+        update_db("global_user", ["LoginConfig" => $LoginConfig], ["ID" => $_POST['ID']],[1,'操作成功']);
     }
     
     msgA(['code'=>-1,'msg'=>'请求类型错误']);
@@ -192,9 +201,10 @@ function Load_db(){
         }catch (Exception $e) {
             Amsg(-1,'载入数据库失败'.$db_config['path']); 
         }
-    }elseif($db_config['type'] == 'mysql'){
+    }elseif($db_config['type'] == 'mysql' || $db_config['type'] == 'mariadb'){
         try {
-            $db = new Medoo\Medoo(['type' => 'mysql',
+            $db = new Medoo\Medoo([
+                'type' => $db_config['type'],
                 'host' => $db_config['host'],
                 'port' => $db_config['port'],
                 'database' => $db_config['name'],
@@ -218,7 +228,7 @@ function echo_Atool(){
 <head>
     <meta charset="UTF-8">
     <title>ATool 工具箱</title>
-    <link rel="stylesheet" href="../static/Layui/v2.8.10/css/layui.css">
+    <link rel="stylesheet" href="../static/Layui/v2.9.7/css/layui.css">
     <style>
         html, body {min-width: 1200px;background-color: #fff;position: relative;}
         .page-wrapper {width: 1200px;margin: 0 auto;padding: 0 15px;}
@@ -267,9 +277,10 @@ function echo_Atool(){
         <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_pwd">改密码</a>
         <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_root">设站长</a>
         <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_user_name">改账号</a>
+        <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.10/layui.js"></script>
+<script src="../static/Layui/v2.9.7/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>
@@ -280,7 +291,7 @@ function echo_Atool(){
         var table = layui.table;
         var cols = [[
             {field:'ID',title:'ID',width:60,sort:true}
-            ,{title:'操作',toolbar:'#tablebar',width:175}
+            ,{title:'操作',toolbar:'#tablebar',width:220}
             ,{field:'User',title:'账号',minWidth:120,templet:function(d){
                 return '<a style="color:#3c78d8" title="打开用户主页" target="_blank" href="../?u='+d.User+'">'+d.User+'</a>'
             }}
@@ -359,6 +370,14 @@ function echo_Atool(){
                         }
                     });
                 });
+            }else if(obj.event == 'del_otp'){
+                $.post('./ATool.php?type=del_otp',{ID:data.ID},function(data,status){
+                    if(data.code == 1) {
+                        layer.msg(data.msg, {icon: 1});
+                    }else{
+                        layer.msg(data.msg, {icon: 5});
+                    }
+                });
             }
         });
         $('.set').click(function () {
@@ -398,7 +417,7 @@ function echo_verify(){ ?>
 <head>
     <meta charset="UTF-8">
     <title>ATool 工具箱</title>
-    <link rel="stylesheet" href="../static/Layui/v2.8.10/css/layui.css">
+    <link rel="stylesheet" href="../static/Layui/v2.9.7/css/layui.css">
     <link rel="stylesheet" href="../static/Other/login.css">
 </head>
 <body>
@@ -423,7 +442,7 @@ function echo_verify(){ ?>
     </div>
 </div>
 <script src = "../static/jquery/jquery-3.6.0.min.js"></script>
-<script src = "../static/Layui/v2.8.10/layui.js"></script>
+<script src = "../static/Layui/v2.9.7/layui.js"></script>
 <script src = '../static/jquery/jquery.md5.js'></script>
 <script>
     layui.use(['form','jquery'], function () {

system/Authenticator.php

@@ -37,7 +37,7 @@ class PHPGangsta_GoogleAuthenticator
         }
 
         $secretkey = $this->_base32Decode($secret);
-        $time = chr(0).chr(0).chr(0).chr(0).pack('N*', $timeSlice);
+        $time = chr(0). chr(0) .chr(0). chr(0) .pack('N*', $timeSlice);
         $hm = hash_hmac('SHA1', $time, $secretkey, true);
         $offset = ord(substr($hm, -1)) & 0x0F;
         $hashpart = substr($hm, $offset, 4);

system/MySQL/20230917.php

@@ -0,0 +1,18 @@
+<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
+// 检测是否已授权
+if(is_subscribe('bool')){
+    //读取授权信息,判断是否存在秘钥
+    $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); 
+    if(!isset($subscribe['public']) || empty($subscribe['public'])){
+        //尝试从服务器下载秘钥
+        $Res = ccurl("https://service.twonav.cn/api.php?fn=get_subscribe&order_id={$subscribe['order_id']}&email={$subscribe['email']}&domain={$subscribe['domain']}&mark=20230917",30,true);
+        $data = json_decode($Res["content"], true);
+        // 获取成功
+        if($data["code"] == 200){
+            $subscribe['public'] = $data['data']['public'];
+            $subscribe['type'] = $data['data']['type'];
+            $subscribe['type_name'] = $data['data']['type_name'];
+            write_global_config('s_subscribe',$subscribe,'订阅信息');
+        }
+    }
+}

system/Register.php

@@ -4,21 +4,10 @@ if($global_config['Maintenance'] != 0){Amsg(-1,'网站正在进行维护,请稍
 $global_templates = unserialize(get_db("global_config",'v', ["k" => "s_templates"]));
 //如果是Get请求则载入登录模板
 if($_SERVER['REQUEST_METHOD'] === 'GET'){
-    $t_name = $global_templates['register'];
-    $t_dir = "./templates/register/".$t_name; //模板目录
-    $t_path = "./templates/register/{$t_name}/index.php"; //模板路径
-    //如果不存在则使用默认模板
-    if(!file_exists($t_path)){
-        $t_name = 'default';
-        $t_dir ='./templates/register/default';
-        $t_path = './templates/register/default/index.php';
-        $global_templates['register'] = 'default';
-        update_db("global_config", ["v" => $global_templates], ["k"=>"s_templates"]);
-    }
-    $copyright = empty($global_config['copyright'])?'<a target="_blank" href="https://gitee.com/tznb/TwoNav">Copyright © TwoNav</a>':$global_config['copyright'];
-    $ICP = empty($global_config['ICP'])?'':'<a target="_blank" href="https://beian.miit.gov.cn">'.$global_config['ICP'].'</a>';
-    $reg_tips = get_db('global_config','v',['k'=>'reg_tips']);
-    require $t_path;
+    //通用数据初始化
+    require DIR."/system/templates.php";
+    $reg_tips = get_db('global_config','v',['k'=>'reg_tips']); //注册提示
+    require $index_path;
     exit;
 }
 
@@ -68,49 +57,6 @@ if(!preg_match('/^[A-Za-z0-9]{4,13}$/', $user)){
     msg(-1,'该账号已被站长保留!');
 }
 
-//读取邮件配置
-$mail_config = get_db("global_config","v",["k"=>"mail_config"]);
-if(!empty($mail_config)){
-    $mail_config = unserialize($mail_config);
-    if($mail_config['verify_email'] == 1 && $_GET['type'] == 'getcode'){
-        //判断是否频繁发送
-        $send_interval = intval($mail_config['send_interval']);
-        if($send_interval > 0 && has_db('user_log',['type'=>'send_email','ip'=>$IP,'time[>]'=>time() - $send_interval])){
-            msg(-1,'请勿频繁获取验证码');
-        }
-        $mail_config['addressee'] = $_POST['Email'];
-        $mail_config['Subject'] = '验证码';
-        $code = mt_rand(100000,999999);
-
-        if(!strstr($mail_config['verify_template'],'$code')){
-            $mail_config['verify_template'] = '您的验证:$code';
-        }
-        $mail_config['Body'] = empty($mail_config['verify_template']) ? '您的验证:'.$code:str_replace('$code', $code, $mail_config['verify_template']);
-        $mail_config['return']='bool';
-        if(send_email($mail_config)){
-            session_start();
-            $_SESSION["{$_POST['Email']}"]['code'] = "$code";
-            $_SESSION["{$_POST['Email']}"]['time'] = time();
-            insert_db("user_log", ["uid" => 0,"user"=>$user,"ip"=>$IP,"time"=>time(),"type" => 'send_email',"content"=>Get_Request_Content(),"description"=>"发送注册验证码:".$code.', 接收邮箱: '.$_POST['Email']]);
-            msg(1,'发送成功');
-        }else{
-            msg(-1,'发送失败');
-        }
-        exit;
-    }
-}
-//验证码效验
-if(!empty($mail_config['verify_email']) && $mail_config['verify_email'] == 1){
-    session_start();
-    if(empty($_POST['code'])){
-        msg(-1,'请输入验证码');
-    }elseif ($_POST['code'] != $_SESSION["{$_POST['Email']}"]['code']) {
-        msg(-1,'验证码错误'.$_SESSION["{$_POST['Email']}"]['code']);
-    }elseif($_SESSION["{$_POST['Email']}"]['time'] + 300  < time()){
-        msg(-1,'验证码已过期');
-    }
-    unset($_SESSION["{$_POST['Email']}"]);
-}
 //插入用户表和创建初始数据库
 $RegTime = time();
 $PassMD5 = Get_MD5_Password($pass,$RegTime);
@@ -126,7 +72,7 @@ if(!empty($regcode_info['u_group'])){
 }
 
 //读取用户组信息,如果用户组不存在则设为默认用户组
-if($UserGroup != 'default'){
+if(!in_array($UserGroup,['default','root','visitor'])){
     $Group = get_db('user_group','*',['code' => $UserGroup]);
     if(empty( $Group )){
         $UserGroup = 'default';

system/SQLite/20230917.php

@@ -0,0 +1,18 @@
+<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
+// 检测是否已授权
+if(is_subscribe('bool')){
+    //读取授权信息,判断是否存在秘钥
+    $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); 
+    if(!isset($subscribe['public']) || empty($subscribe['public'])){
+        //尝试从服务器下载秘钥
+        $Res = ccurl("https://service.twonav.cn/api.php?fn=get_subscribe&order_id={$subscribe['order_id']}&email={$subscribe['email']}&domain={$subscribe['domain']}&mark=20230917",30,true);
+        $data = json_decode($Res["content"], true);
+        // 获取成功
+        if($data["code"] == 200){
+            $subscribe['public'] = $data['data']['public'];
+            $subscribe['type'] = $data['data']['type'];
+            $subscribe['type_name'] = $data['data']['type_name'];
+            write_global_config('s_subscribe',$subscribe,'订阅信息');
+        }
+    }
+}

system/UseFew/Import_data.php

@@ -18,7 +18,7 @@ if($_GET['type'] == 'upload'){
 
     //取后缀并判断是否支持
     $suffix = strtolower(end(explode('.',$_FILES["file"]["name"])));
-    if(!preg_match('/^(db3|html)$/i',$suffix)){
+    if(!preg_match('/^(db3|html|itabdata)$/i',$suffix)){
         @unlink($_FILES["file"]["tmp_name"]);
         msg(-1,'文件格式不被支持!');
     }
@@ -384,6 +384,87 @@ if($_GET['type'] == 'upload'){
         }
     }
     msg(-1,'导入失败.');
+
+}elseif($_GET['type'] == 'itabdata'){
+    $temp_path = $_SESSION['upload_bookmark'][UID][$sid];
+    $content = file_get_contents($temp_path);
+    $data = json_decode($content, true);
+    if(!isset($data['navConfig']) || empty($data['navConfig'])){
+        msg(-1,'数据解析失败,请确认导入的是iTab备份的数据,且导出内容包含图标');
+    }
+    $time = time();
+    $success = 0; $fail = 0; $total = 0;$res = '';
+    $res='<table class="layui-table" lay-even><colgroup><col width="200"><col width="250"><col></colgroup><thead><tr><th>标题</th><th>URL</th><th>失败原因</th></tr></thead><tbody>';
+    foreach($data['navConfig'] as $key => $category){
+        if(!isset($category['children']) || empty($category['children'])){
+            continue; //分类下没数据则跳过
+        }
+        //分类名称不错在时创建
+        if(!has_db('user_categorys',['name'=>$category['name']]) ){
+            insert_db('user_categorys',[
+                'uid'=>UID,
+                'cid'=>get_maxid('category_id'),
+                'fid'=>0,
+                'pid'=>0,
+                'status'=>1,
+                'property'=>1,
+                'name'=>$category['name'],
+                'add_time'=>$time,
+                'up_time'=>$time,
+                'weight'=>0,
+                'description'=>'',
+                'font_icon'=>'fa fa-user',
+                'icon'=>''
+                ]
+            );
+        }
+        
+        // 读取分类ID
+        $category_id = get_db('user_categorys','cid',['uid'=>UID,'name'=>$category['name']]); 
+        if(empty($category_id)){
+            msg(-1,'意外结束:创建或读取分类信息失败!');
+        }
+        $total += count($category['children']);
+        //遍历链接
+        foreach($category['children'] as $link){
+            $id = get_db('user_links','id',['uid'=>UID,'url'=>$link['url'] ]);
+            if(!empty($id)){
+                $res=$res.'<tr><td>'.mb_substr($link['name'], 0, 30).'</td><td>'.mb_substr($link['url'], 0, 40).'</td><td>URL重复'.'</td></tr>';
+                $fail++;
+                continue;
+            }
+            if(empty($id) && strpos($link['url'], "http") === 0 ){
+                insert_db('user_links',[
+                    'uid'       =>  UID,
+                    'lid'       =>  get_maxid('link_id'),
+                    'fid'       =>  $category_id,
+                    'add_time'  =>  $time,
+                    'up_time'   =>  $time,
+                    'weight'    =>  0,
+                    'title'     =>  $link['name'] ,
+                    'url'       =>  $link['url'],
+                    'property'  =>  0,
+                    'icon'      =>  '', // "{$link['src']}",
+                    'status'    =>  1
+                ]);
+                $success++;
+            }else{
+                $res=$res.'<tr><td>'.mb_substr($link['name'], 0, 30).'</td><td>'.mb_substr($link['url'], 0, 40).'</td><td>'.$link['name'].' >> 不是链接'.'</td></tr>';
+                $fail++;
+            }
+        }
+    }
+    
+    $data = [
+        'code'      =>  1,
+        'msg'       =>  '总数：'.$total.' 成功：'.$success.' 失败：'.$fail,
+        'res'       =>  $res.'</tbody></table>',
+        'fail'      =>  $fail
+        ];
+    //删除文件和变量
+    unlink($temp_path);
+    unset($_SESSION['upload_bookmark'][UID][$sid]);
+    msgA($data);
 }elseif($_GET['type'] == 'data_empty'){
     //验证密码
     global $USER_DB;

system/UseFew/local_backup.php

@@ -4,355 +4,5 @@ if(!defined('DIR')){
     header("status: 404 Not Found");
     exit;
 }else{
-    if(!is_subscribe('bool')){
-        msg(-1,"未检测到有效授权,无法使用该功能!");
-    }
-    
-    if($_GET['type'] ==  'list'){
-        $backup_dir = DIR."/data/backup/".U."/"; //备份目录
-        $file_list = glob("{$backup_dir}*.info"); //扫描文件
-        $num = count($file_list); //取列表数
-        rsort($file_list,2); //按时间从大到小重排序
-        //备份文件数大于20个时删除旧数据
-        if( $num > 20 ) {
-            for ($i=$num; $i > 20; $i--) {
-                $path = pathinfo($file_list[$i-1]);
-                $path = $path['dirname'] .'/'. $path['filename'];
-                unlink($path.'.info');
-                unlink($path.'.db3');
-                unlink($path.'.tar');
-                array_pop($file_list);
-            }
-            $count = 20;
-        }else{
-            $count = $num;
-        }
-        
-        $data = [];
-        //遍历读入备份信息
-        foreach ($file_list as $key => $filePath) {
-            $file = pathinfo($filePath);
-            $info_file = @file_get_contents("{$file['dirname']}/{$file['filename']}.info");
-            $info = json_decode($info_file,true);
-            if($info != false){
-                array_push($data,$info);
-            }
-        }
-        msgA( ['code' => 1,'msg' => '','count' =>  $count,'data' =>  $data] );
-    }elseif($_GET['type'] == 'backup'){
-        //初始信息
-        $info['user_dir'] = DIR."/data/user/".U;
-        $info['backup_dir'] = DIR."/data/backup/".U; //备份目录
-        $info['file'] = SysVer . "_".date("ymdHis",time())."_".Get_Rand_Str(5);
-        $info['file_db'] = $info['backup_dir'] .'/'. $info['file'].'.db3';
-        $info['file_info'] = $info['backup_dir'] .'/'. $info['file'].'.info';
-        $info['file_gz'] = $info['backup_dir'] .'/'. $info['file'].'.tar';
-        $info['table_arr'] = ['user_config','user_categorys','user_links','user_pwd_group','user_apply','user_share','user_article_list'];
-        $info['lock'] = DIR.'/data/user/'.U.'/lock.'.UID;
-        if (!extension_loaded('phar')) {
-            msg(-1,'不支持phar扩展');
-        }elseif(!is_dir($info['backup_dir']) && !mkdir($info['backup_dir'],0755,true) ){
-            msg(-1,'创建backup目录失败');
-        }elseif(!is_file($info['lock']) && !file_put_contents($info['lock'],'TwoNav')){
-            msg(-1,'创建lock文件失败');
-        }
-        
-        //打包用户文件
-        try {
-            $phar = new PharData($info['file_gz']);
-            $phar->buildFromDirectory($info['user_dir']);
-        } catch (Exception $e) {
-            msg(-1,'打包用户数据发生异常>'.$e->getMessage());
-        }
-        //创建数据
-        try {
-            $MyDB = new Medoo\Medoo(['type'=>'sqlite','database'=>$info['file_db']]);
-            $MyDB->query('CREATE TABLE IF NOT EXISTS "backup" ("id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"name" TEXT,"data" TEXT,CONSTRAINT "id" UNIQUE ("id" ASC));')->fetchAll();
-            $MyDB->insert('backup',['name'=>'ver','data'=>SysVer]); //记系统版本
-            $MyDB->insert('backup',['name'=>'backup_time','data'=>time()]); //记备份时间
-            $MyDB->insert('backup',['name'=>'database_type','data'=>$GLOBALS['db_config']['type']]); //数据库类型
-        }catch (Exception $e) {
-            Amsg(-1,'创建备份数据库失败'); 
-        }
-        
-        //开始备份数据
-        $table_info = [];
-        foreach($info['table_arr'] as $table_name){
-            $count = count_db($table_name,['uid'=>UID]); //总条数
-            $limit = 100; //每页数量
-            $pages= ceil($count/$limit); //总页数
-            //分页逐条处理
-            for ($page=1; $page<=$pages; $page++) {
-                $where['uid'] = UID;
-                $where['LIMIT'] = [($page - 1) * $limit,$limit];
-                $datas = select_db($table_name,'*',$where);
-                foreach($datas as $data){
-                    try {
-                        if(isset($data['id'])){
-                            unset($data['id']);
-                        }
-                        $MyDB->insert('backup',['name'=>$table_name,'data'=>$data]);
-                    }catch (Exception $e) {
-                        Amsg(-1,'插入数据时发生异常'); 
-                    }
-                } 
-            }
-            $table_info[$table_name] = ['count'=>$count,'pages'=>$pages];
-        }
-        
-        //备份信息
-        $info['info'] = [
-            "name" => $info['file'],
-            "db_size" => filesize($info['file_db']),
-            "db_md5" => md5_file($info['file_db']),
-            "tar_size" => filesize($info['file_gz']),
-            "tar_md5" => md5_file($info['file_gz']),
-            "backup_time" => time(),
-            "version" => SysVer,
-            "desc" => "{$_POST['desc']}"
-            ]; 
-        $info['info'] = array_merge($table_info,$info['info']);
-        $info['info'] = json_encode($info['info']);
-        //写到文件
-        if(file_put_contents($info['file_info'], $info['info']) === false){
-            msg(-1,'写备份信息失败');
-        }
-        msg(1,'备份成功');
-    //删除备份
-    }elseif($_GET['type'] == 'del'){
-        $path = DIR."/data/backup/".U."/".$_POST['name'];
-        if( !preg_match_all('/^v\d+\.\d+\.\d+-\d{8}_\d{12}_[A-Za-z0-9]{5}$/',$_POST['name']) ) {
-            msg(-1,'数据库名称不合法');
-        }elseif(!is_file($path.'.info')){
-            msg(-1,'备份不存在');
-        }elseif(!extension_loaded('phar')) {
-            msg(-1,'不支持phar扩展');
-        }
-        try {
-            unlink($path.'.info');
-            unlink($path.'.db3');
-            unlink($path.'.tar');
-            msg(1,'备份数据库已被删除');
-        } catch (\Throwable $th) {
-            msg(-1,"删除失败，请检查目录权限");
-        }
-    //回滚备份
-    }elseif($_GET['type'] == 'restore'){
-        try {
-            global $db;
-            header('Content-Type:application/json; charset=utf-8');
-            //使用事务来处理
-            $db->action(function($db) {
-                //检测是否符合回滚要求
-                $path = DIR."/data/backup/".U."/".$_POST['name'];
-                if( !preg_match_all('/^v\d+\.\d+\.\d+-\d{8}_\d{12}_[A-Za-z0-9]{5}$/',$_POST['name']) ) {
-                    msg(-1,'数据库名称不合法');
-                }
-                $info_file = @file_get_contents($path.'.info');
-                $info = json_decode($info_file,true);
-                if($info == false){
-                    msg(-1,'读取备份信息失败');
-                }elseif($info['db_md5'] != md5_file($path.'.db3')){
-                    msg(-1,'db3文件效验失败');
-                }elseif($info['tar_md5'] != md5_file($path.'.tar')){
-                    msg(-1,'tar文件效验失败');
-                }
-                
-                //载入数据库
-                try {
-                    $MyDB = new Medoo\Medoo(['type'=>'sqlite','database'=>$path.'.db3']);
-                }catch (Exception $e) {
-                    msg(-1,'载入备份数据库失败');
-                    return false;
-                }
-                
-                //遍历删除用户数据
-                $info['table_arr'] = ['user_config','user_categorys','user_links','user_pwd_group','user_apply','user_share','user_article_list'];
-                foreach($info['table_arr'] as $table_name){
-                    
-                    //删除数据
-                    delete_db($table_name,['uid'=>UID]);
-                    
-                    //确保数据已删除
-                    if($db->has($table_name,['uid'=>UID])){
-                        msg(-1,'del ' . $table_name . ' fail');
-                    }
-                    
-                    //读取条数,分页逐条导入
-                    $count = $MyDB->count('backup',['name'=>$table_name]); //总条数
-                    $limit = 100; //每页数量
-                    $pages= ceil($count/$limit); //总页数
-                    for ($page=1; $page<=$pages; $page++) {
-                        $where['name'] = $table_name;
-                        $where['LIMIT'] = [($page - 1) * $limit,$limit];
-                        $datas = $MyDB->select('backup','data',$where);
-                        foreach($datas as $key => $data){
-                            $data = unserialize($data);
-                            //处理null
-                            foreach ($data as $key => $value) {
-                                if ($value === null) {
-                                    $data[$key] = ''; 
-                                }
-                            }
-                            
-                            if(isset($data['id'])){
-                                unset($data['id']);
-                            }
-                            $data['uid'] = UID;
-                            insert_db($table_name,$data);
-                        }
-                    }
-                    
-                    //确保数据已导入
-                    if($count != count_db($table_name,['uid'=>UID])){
-                        msg(-1,'restore ' . $table_name . ' fail');
-                    }
-                }
-
-                //删除用户目录
-                $user_dir = DIR."/data/user/".U;
-                if(is_dir($user_dir) && !deldir($user_dir)){
-                    msg(-1,'删除用户目录失败');
-                }
-                //创建用户目录
-                if(!is_dir($user_dir) && !mkdir($user_dir,0755,true)){
-                    msg(-1,'创建用户目录失败');
-                }
-                //回滚用户目录
-                try {
-                    $phar = new PharData($path.'.tar');
-                    $phar->extractTo($user_dir, null, true);
-                } catch (Exception $e) {
-                    msg(-1,'回滚用户数据失败');
-                }
-                //返回信息,直接msg会导致回滚
-                header('Content-Type:application/json; charset=utf-8');
-                echo(json_encode(['code'=>1,'msg'=>'回滚成功']));
-            });
-        } catch (\Throwable $th) {
-            msg(-1,"回滚失败");
-        }
-    //导出密码验证
-    }elseif($_GET['type'] == 'create'){
-        global $USER_DB;
-        $pwd = Get_MD5_Password($_POST['pwd'],$USER_DB["RegTime"]) === $USER_DB["Password"];
-        if(!$pwd){
-            msg(-1,'密码错误');
-        }elseif(empty($_POST['name'])){
-            msg(-1,'文件名不能为空');
-        }elseif(!extension_loaded('phar')) {
-            msg(-1,'不支持phar扩展');
-        }
-
-        $path = DIR."/data/backup/".U."/".$_POST['name'];
-        if(!is_file($path.'.info')){
-            msg(-1,'info文件不存在');
-        }elseif(!is_file($path.'.db3')){
-            msg(-1,'db3文件不存在');
-        }elseif(!is_file($path.'.tar')){
-            msg(-1,'tar文件不存在');
-        }
-        
-        session_start();
-        $key = md5(uniqid().Get_Rand_Str(8));
-        try {
-            $temp_dir = DIR."/data/temp/{$key}";
-            if(!is_dir($temp_dir) && !mkdir($temp_dir,0755,true)){
-                msg(-1,'创建临时目录失败');
-            }
-            copy($path.'.info',"{$temp_dir}/{$_POST['name']}.info");
-            copy($path.'.db3',"{$temp_dir}/{$_POST['name']}.db3");
-            copy($path.'.tar',"{$temp_dir}/{$_POST['name']}.tar");
-            $backup_path = "{$temp_dir}/TwoNav_{$_POST['name']}.tar";
-            $phar = new PharData($backup_path);
-            $phar->buildFromDirectory($temp_dir);
-            $phar->compress(Phar::GZ);
-            $backup_path .= ".gz";
-            if(!is_file($backup_path)){
-                msg(-1,'打包数据失败');
-            }
-        } catch (Exception $e) {
-            msg(-1,'压缩数据异常');
-        }
-        $_SESSION['download'][$key] = $backup_path;
-        msgA(['code'=>1,'msg'=>'success','key'=>$key]);
-    //下载备份数据
-    }elseif($_GET['type'] == 'download'){
-        session_start();
-        if(empty($_GET['key']) || !isset($_SESSION['download'][$_GET['key']])){
-            msg(-1,'Key不存在,请重新导出');
-        }
-        $path = $_SESSION['download'][$_GET['key']];
-        if(!is_file($path)){
-            msg(-1,'文件不存在,请重新导出');
-        }
-        
-        $filename = pathinfo($path,PATHINFO_BASENAME);
-        header("Cache-Control: public");
-        header("Content-Description: File Transfer");
-        header('Content-disposition: attachment; filename='.$filename); //文件名
-        header("Content-Type: application/octet-stream"); 
-        header("Content-Transfer-Encoding: binary"); //告诉浏览器，这是二进制文件
-        header('Content-Length: '. filesize($path)); //告诉浏览器，文件大小
-        readfile($path); //返回文件
-        unlink ($path);//删除临时文件
-        unset($_SESSION['download'][$_GET['key']]); //删除Key
-        deldir(DIR."/data/temp/{$_GET['key']}"); //删除临时目录
-    //导入
-    }elseif($_GET['type'] == 'local_import'){
-        if (!extension_loaded('phar')) {
-            msg(-1,'不支持phar扩展');
-        }
-        $key = md5(uniqid().Get_Rand_Str(8));
-        $temp_dir = DIR."/data/temp/{$key}";
-        if(!is_dir($temp_dir) && !mkdir($temp_dir,0755,true)){
-            msg(-1,'创建临时目录失败');
-        }
-        //解压数据
-        try {
-            copy($_FILES['file']['tmp_name'],"{$temp_dir}/{$_FILES['file']['name']}");
-            $phar = new PharData("{$temp_dir}/{$_FILES['file']['name']}");
-            $phar->extractTo($temp_dir, null, true);
-            unlink("{$temp_dir}/{$_FILES['file']['name']}");
-        } catch (Exception $e) {
-            deldir($temp_dir);
-            msg(-1,'解压数据失败');
-        }
-        //获取备份信息
-        $file = glob("{$temp_dir}/*.info");
-        if(count($file) != 1){
-            deldir($temp_dir);
-            msg(-1,'读取备份信息失败');
-        }
-        $file = pathinfo($file[0]);
-        $info = @file_get_contents("{$temp_dir}/{$file['basename']}");
-        $info = json_decode($info,true);
-        if($info == false){
-            deldir($temp_dir);
-            msg(-1,'解析备份信息失败');
-        }elseif($info['db_md5'] != md5_file("{$temp_dir}/{$info['name']}.db3")){
-            deldir($temp_dir);
-            msg(-1,'db3文件效验失败'.$info['db_md5']);
-        }elseif($info['tar_md5'] != md5_file("{$temp_dir}/{$info['name']}.tar")){
-            deldir($temp_dir);
-            msg(-1,'tar文件效验失败');
-        }
-        //检查目录
-        if(!Check_Path(DIR."/data/backup/".U)){
-            msg(-1,'创建backup目录失败,请检查权限');
-        }
-        //复制到用户数据
-        try {
-            $backup_dir = DIR."/data/backup/".U."/";
-            copy("{$temp_dir}/{$info['name']}.info","{$backup_dir}{$info['name']}.info");
-            copy("{$temp_dir}/{$info['name']}.db3", "{$backup_dir}{$info['name']}.db3");
-            copy("{$temp_dir}/{$info['name']}.tar", "{$backup_dir}{$info['name']}.tar");
-            deldir($temp_dir);
-            msg(1,'导入成功');
-        } catch (Exception $e) {
-            deldir($temp_dir);
-            msg(-1,'复制数据失败,请检查目录权限');
-        }
-        //结束
-    }
+    msg_tip();
 }

system/admin.php

@@ -4,14 +4,15 @@ $page = trim($_GET['page']); //获取请求参数
 $Ver = !Debug?SysVer:SysVer.'.'.time(); //版本
 $LoginConfig = unserialize($USER_DB['LoginConfig']); //登录配置
 define('offline',$global_config['offline'] == 1); //是否离线模式
-define('is_login',is_login()); //是否已登录
 //未登录,载入登录提示页
 if(!is_login){
     require(DIR.'/templates/admin/page/LoginPrompt.php');
     exit;
 }//已登录,检查是否需要验证二级密码
 elseif(!empty($LoginConfig['Password2']) && !Check_Password2($LoginConfig)){
-    require DIR.'/templates/admin/other/verify_pwd2.php';
+    $c = 'verify';$_GET['c'] = 'pwd2';
+    require DIR."/system/templates.php";
+    require $index_path;
     exit;
 }
 
@@ -64,10 +65,15 @@ if($page == 'config_home'){
     $theme_config = empty($theme_config['config']) ? []:$theme_config['config'];
     
     //读取用户主题配置
-    if(!in_array($_GET['fn'],['home','login','register','transit','guide','article'])){
+    if(!in_array($_GET['fn'],['home','login','register','transit','guide','article','verify','guestbook','apply'])){
         msg(-1,"参数错误");
     }
-    $theme_config_db = get_db('user_config','v',['t'=>'theme_'.$_GET['fn'],'k'=>$theme,'uid'=>UID]);
+    if(in_array($_GET['fn'],['guide','register'])){
+        $theme_config_db = get_db('global_config','v',['k'=>"theme_{$_GET['fn']}_{$theme}"]);
+    }else{
+        $theme_config_db = get_db('user_config','v',['t'=>'theme_'.$_GET['fn'],'k'=>$theme,'uid'=>UID]);
+    }
+    
     $theme_config_db = unserialize($theme_config_db);
     
     //如果不为空则合并数据
@@ -82,160 +88,6 @@ if($page == 'config_home'){
     exit;
 }
 
-//主题设置页面
-if( $page == 'theme_home' || $page == 'theme_login' || $page == 'theme_transit' || $page == 'theme_register' || $page == 'theme_guide' || $page == 'theme_article') {
-    if(!check_purview('theme_in',1)){
-        require(DIR.'/templates/admin/page/404.php');
-        exit;
-    }
-    $fn = str_replace('theme_','',$page);
-    $dirs = get_dir_list(DIR.'/templates/'.$fn);
-    
-    foreach ($dirs as $dir) {
-        $path = DIR.'/templates/'.$fn.'/'.$dir; //目录完整路径
-        //没有信息文件则跳过
-        if(!is_file($path.'/info.json') ) {continue;}
-        //读取主题信息
-        $themes[$dir]['info'] = json_decode(@file_get_contents($path.'/info.json'),true);
-        //是否支持配置
-        $themes[$dir]['info']['config'] = is_file($path.'/config.php') ? '1':'0';
-        //预览图优先顺序:png>jpg>info>default
-        if(is_file($path.'/screenshot.jpg')){
-            $themes[$dir]['info']['screenshot'] = "./templates/$fn/$dir/screenshot.jpg";
-        }elseif(is_file($path.'/screenshot.png')){
-            $themes[$dir]['info']['screenshot'] = "./templates/$fn/$dir/screenshot.png";
-        }elseif(empty($themes[$dir]['info']['screenshot'])){ 
-            $themes[$dir]['info']['screenshot'] = "./templates/admin/static/42ed3ef2c4a50f6d.png";
-        }
-    }
-    
-    //获取当前主题
-    require "./system/templates.php";
-
-    //在线主题处理
-    if ( !$global_config['offline'] && $USER_DB['UserGroup'] === 'root'){ 
-        
-        if(preg_match('/^v.+-(\d{8})$/i',SysVer,$matches)){
-            $sysver = intval( $matches[1] );//取版本中的日期
-        }else{
-            exit("获取程序版本异常");
-        }
-        
-        //读取缓存
-        $template = get_db('global_config','v',['k'=>$page.'_cache']);
-        if(!empty($template)){
-            $data = json_decode($template, true);
-        }
-        
-        //没有缓存 或 禁止缓存 或 缓存过时
-        if(empty($template) ||   $_GET['cache'] === 'no'  || time() -  $data["time"] > 1800 ){ 
-            $urls = [
-                "lm21" => "https://update.lm21.top/TwoNav/{$fn}_template.json",
-                "gitee" => "https://gitee.com/tznb/twonav_updata/raw/master/{$fn}_template.json"
-            ];
-            $Source = $global_config['Update_Source'] ?? '';
-            if (!empty($Source) && isset($urls[$Source])) {
-                $urls = [$Source => $urls[$Source]];
-            }
-        }else{
-            $cache = true;
-        }
-        //读取超时参数
-        $overtime = !isset($global_config['Update_Overtime']) ? 3 : ($global_config['Update_Overtime'] < 3 || $global_config['Update_Overtime'] > 60 ? 3 : $global_config['Update_Overtime']);
-        //远程获取
-        foreach($urls as $key => $url){ 
-            $Res = ccurl($url,$overtime);
-            $data = json_decode($Res["content"], true);
-            if($data["code"] == 200 ){ //如果获取成功
-                $data["time"] = time(); //记录当前时间
-                write_global_config($page.'_cache',json_encode($data),$fn.'_模板缓存');
-                break; //跳出循环.
-            } 
-        }
-        //解析
-        foreach($data["data"] as $key){
-            $path = DIR.'/templates/'.$fn.'/'.$key["dir"];
-            if( is_dir($path) ) {  //本地存在
-                $value = $key["dir"];
-                //检查是否可以更新
-                $update = str_replace('/','',$themes[$value]['info']['update']); //本地主题版本
-                $update_new = str_replace('/','',$key["update"]); //远程主题版本
-                if( $sysver >= intval($key["low"])  && $sysver <= intval($key["high"]) &&  $update < $update_new ){
-                    $themes[$value]['info']['up'] = '1';
-                }
-            }else{
-                //判断是否适配当前系统版本
-                if( $sysver >= intval($key["low"])  && $sysver <= intval($key["high"]) ){
-                    $value = $key["dir"];
-                    $themes[$value]['info'] = json_decode(json_encode($key),true);
-                }
-            }
-        }
-        //来源策略 (用于Gitee作为图床反防盗链)
-        if(!empty($data['referrer'])){
-            define('referrer',$data['referrer']);
-        }
-    }
-}
-
-
-//菜单接口
-if ($page == 'menu') {
-    $menu = [];
-    if(check_purview('site_info',1)){
-        array_push($menu,['title'=>'站点设置','href'=>'SiteSetting','icon'=>'fa fa-cog']);
-    }
-    if(check_purview('theme_in',1)){
-        array_push($menu,['title'=>'主题设置','href'=>'theme_home','icon'=>'fa fa-magic']);
-    }
-    array_push($menu,
-        ['title'=>'分类管理','href'=>'category_list','icon'=>'fa fa-list-ul'],
-        ['title'=>'加密管理','href'=>'pwd_group','icon'=>'fa fa-lock'],
-        ['title'=>'链接管理','icon'=>'fa fa-folder-open-o','href'=>'','child'=>
-          [
-            ['title'=>'链接列表','href'=>'link_list','icon'=>'fa fa-link'],
-            ['title'=>'添加链接','href'=>'link_add','icon'=>'fa fa-plus-square-o'],
-            ['title'=>'书签分享','href'=>'share','icon'=>'fa fa-external-link'],
-            ['title'=>'导出导入','href'=>'data_control','icon'=>'fa fa-retweet'],
-          ]
-        ]);
-    
-    //扩展功能
-    $extend = [];
-    if($global_config['apply'] == 1 && check_purview('apply',1)){
-        array_push($extend,['title'=>'收录管理','href'=>'expand/apply-admin','icon'=>'fa fa-pencil']);
-    }
-    if($global_config['guestbook'] == 1 && check_purview('guestbook',1)){ 
-        array_push($extend,['title'=>'留言管理','href'=>'expand/guestbook-admin','icon'=>'fa fa-commenting-o']);
-    }
-    if($global_config['article'] == 1 && check_purview('article',1)){ 
-        array_push($extend,['title'=>'文章管理','href'=>'expand/article-list','icon'=>'fa fa-file-text-o']);
-    }
-    if(!empty($extend)){
-        $extend = ['title'=>'扩展功能','icon'=>'fa fa-folder-open-o','href'=>'','child'=> $extend];
-        array_push($menu,$extend);
-    }
-
-    //如果是管理员则追加菜单
-    if($USER_DB['UserGroup'] == 'root'){
-        array_push($menu,
-        ['title'=>'网站管理','icon'=>'fa fa-wrench','href'=>'','child'=>
-          [
-            ['title'=>'系统设置','href'=>'root/sys_setting','icon'=>'fa fa-gears'],
-            ['title'=>'授权管理','href'=>'root/vip','icon'=>'fa fa-diamond'],
-            //['title'=>'默认设置','href'=>'root/default_setting','icon'=>'fa fa-heart-o'],
-            ['title'=>'用户管理','href'=>'root/user_control','icon'=>'fa fa-user'],
-            ['title'=>'用户分组','href'=>'root/users_control','icon'=>'fa fa-users'],
-            ['title'=>'注册管理','href'=>'root/reg_control','icon'=>'fa fa-user-plus'],
-            ['title'=>'站长工具','href'=>'root/tool','icon'=>'fa fa-exclamation-triangle'],
-          ]
-        ]);
-    }
-    $init = array( 'homeInfo'=>['title'=>'概要','href'=>'home'],'logoInfo'=>['title'=>'TwoNav','image'=>'./templates/admin/img/logo.png','href'=>'./?u='.U],'menuInfo'=>$menu);
-    header('Content-Type:application/json; charset=utf-8');
-    exit(json_encode($init));
-}
-
 //不带参数是载入框架
 if(empty($page)){
     $site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));

system/api.php

@@ -47,7 +47,7 @@ if(in_array($api_model,['compatible','compatible+open']) && in_array($method,$co
 }
 
 //站长相关方法名
-$root = ['write_subscribe','write_sys_settings','write_default_settings','read_user_list','write_user_info','read_purview_list','read_users_list','write_users','read_regcode_list','write_regcode','other_upsys','read_log','other_root'];
+$root = ['write_subscribe','write_sys_settings','write_default_settings','read_user_list','write_user_info','read_purview_list','read_users_list','write_users','read_regcode_list','write_regcode','other_upsys','read_log','other_root','other_services'];
 if(in_array($method,$root)){
     require('api_root.php');
 //非站长接口则判断是否加载防火墙
@@ -378,7 +378,7 @@ function write_link(){
         //检测链接是否合法
         check_link($fid,$title,$url,$_POST['url_standby']); 
         //检查链接是否已存在
-        if(get_db('user_links','lid',['uid'=>UID ,"url" => $url])){
+        if(empty(get_db('user_config','v',['uid'=>UID ,'t'=>'config','k'=>'repeat_url'])) && has_db('user_links',['uid'=>UID ,"url" => $url])){
             msg(-1,'链接已存在!');
         }
         //描述长度检测
@@ -441,6 +441,16 @@ function write_link(){
         }
         //插入数据库
         insert_db('user_links',$data);
+        //读取站点地图配置并判断是否需要更新
+        $sitemap_config = unserialize( get_db("global_config", "v", ["k" => "sitemap_config"]));
+        if(isset($sitemap_config['zhudong']) && $sitemap_config['zhudong'] == '1'){
+            $sitemap_path = DIR . "/data/user/{$u}/sitemap.php";
+            require DIR .'/system/expand/sitemap_create.php';
+            if(is_Update_Sitemap($sitemap_config,$sitemap_path)){
+                create_sitemap($sitemap_config,$sitemap_path,$u);
+            }
+        }
+        
         msgA(['code'=>1,'msg'=>'添加成功','id'=>$lid]);
     //上传图标
     }elseif($_GET['type'] === 'upload_images'){
@@ -516,36 +526,7 @@ function write_link(){
         }
     //扩展上传图片
     }elseif($_GET['type'] == 'extend_up_img'){
-        //权限检测
-        if(!check_purview('Upload_icon',1)){
-            msg(-1,'您的用户组无权限上传图片');
-        }elseif(empty($_FILES["file"]) || $_FILES["file"]["error"] > 0){
-            msg(-1,'文件上传失败');
-        }
-        
-        //取后缀并判断是否支持
-        $suffix = strtolower(end(explode('.',$_FILES["file"]["name"])));
-        if(!preg_match('/^(jpg|jpeg|png|ico|bmp|svg)$/',$suffix)){
-            @unlink($_FILES["file"]["tmp_name"]);
-            msg(-1,'文件格式不被支持!');
-        }
-        //限制文件大小
-        if(filesize($_FILES["file"]["tmp_name"]) > 1 * 1024 * 1024){
-            msg(-1,'文件大小超限');
-        }
-        //文件临时路径
-        $path = DIR . "/data/user/{$u}/upload";
-        //检测目录,不存在则创建!
-        if(!Check_Path($path)){
-            msg(-1,'创建upload目录失败,请检查权限');
-        }
-        $tmp_name = 'LE_'.uniqid().'.'.$suffix;
-        //移动文件
-        if(!move_uploaded_file($_FILES["file"]["tmp_name"],"{$path}/{$tmp_name}")) {
-            msg(-1,'上传失败,请检查目录权限');
-        }else{
-            msgA(['code'=>1,'msg'=>'上传成功','url'=>"./data/user/".U.'/upload/'.$tmp_name]);
-        }
+        msg_tip();
             
     //删除图标
     }elseif($_GET['type'] === 'del_images'){
@@ -600,7 +581,9 @@ function write_link(){
             msg(-1,'关键字长度不能大于'.$length_limit['l_key'].'个字节');
         }
         //检查链接是否已存在
-        if(has_db('user_links',['uid'=>UID ,'lid[!]'=>$lid, "url" => $url])){msg(-1,'链接已存在!');}
+        if(empty(get_db('user_config','v',['uid'=>UID ,'t'=>'config','k'=>'repeat_url'])) && has_db('user_links',['uid'=>UID ,'lid[!]'=>$lid, "url" => $url])){
+             msg(-1,'链接已存在!');
+        }
         //检查链接ID是否存在
         if(!has_db('user_links',['uid'=>UID ,'lid'=>$lid])){msg(-1,'链接ID不存在!');}
 
@@ -680,10 +663,6 @@ function write_link(){
             update_db('user_links',['weight'=>$key[1]],['uid'=>UID,'lid'=>$key[0]]);
         }
         msg(1,'保存成功');
-        
-        msg(-1,'未支持');
-    
-
     //私有切换
     }elseif($_GET['type'] === 'property_sw' ){
         update_db('user_links',['property'=>intval($_POST['property']) ],['uid'=>UID,'lid'=>intval($_POST['lid']) ],[1,'保存成功']);
@@ -738,195 +717,15 @@ function write_link(){
         update_db('user_links',['fid'=>$fid],['uid'=>UID ,"lid" => json_decode($_POST['lid']) ],[1,'设置成功']);
     //检测是否满足要求
     }elseif($_GET['type'] === 'msg_pull_check'){
-        if($global_config['offline']){
-            msg(-1,"离线模式不可用");
-        } 
-        if(!is_subscribe('bool')){
-            msg(-1,"未检测到有效授权,无法使用该功能!");
-        }
-        if(intval($_POST['icon']) > 0){
-            if(!check_purview('icon_pull',1)){
-                msg(-1,'您所在的用户组,无法使用网站图标获取功能');
-            }
-            $path = DIR ."/data/user/".U."/favicon";
-            if(!Check_Path($path)){
-                msg(-1,'创建目录失败,请检查目录权限');
-            }
-            $config = unserialize( get_db("global_config", "v", ["k" => "icon_config"])) ?? [];
-            if($config['o_switch'] == '0'){
-                msg(-1,'相关服务处于关闭状态,请联系站长开启');
-            }
-        }
-        session_start();
-        $key = md5(uniqid().Get_Rand_Str(8));
-        $_SESSION['msg_pull']["$key"] = true;
-        msgA(['code'=>1,'msg'=>'success','key'=>$key]);
+        msg_tip();
     }elseif($_GET['type'] === 'msg_pull'){
-        session_start();
-        $key = $_POST['key'];
-        if(empty($key) || !$_SESSION['msg_pull']["$key"]){
-            msg(-1,'key验证失败,请重试!');
-        }elseif(empty($_POST['link_id'])){
-            msg(-1,'链接ID不能为空');
-        }
-        //读取信息
-        $link = get_db('user_links','*',['uid'=>UID ,'lid'=>$_POST['link_id'] ]);
-        //检查链接
-        if(empty($link)){
-            msg(-1,'链接ID不存在');
-        }elseif(!preg_match("/^(http:\/\/|https:\/\/).*/",$link['url'])){
-            msg(-1,'只支持识别http/https协议的链接!');
-        }elseif( !filter_var($link['url'], FILTER_VALIDATE_URL) ) {
-             msg(-1,'URL无效!');
-        }
-        
-        //是否获取站点信息
-        if( ( intval($_POST['title']) + intval($_POST['keywords']) + intval($_POST['description']) ) > 0 ){
-            //读取长度限制配置
-            $length_limit = unserialize(get_db("global_config","v",["k"=>"length_limit"]));
-            //获取网站标题
-            $c = curl_init(); 
-            curl_setopt($c, CURLOPT_URL, $link['url']); 
-            curl_setopt($c, CURLOPT_RETURNTRANSFER, 1); 
-            curl_setopt($c, CURLOPT_SSL_VERIFYPEER, false);
-            curl_setopt($c, CURLOPT_SSL_VERIFYHOST, false);
-            curl_setopt($c, 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');
-            curl_setopt($c, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($c , CURLOPT_TIMEOUT, 10);
-            $data = curl_exec($c); 
-            curl_close($c); 
-            require (DIR .'/system/get_page_info.php');
-            $info = get_page_info($data);
-            $new = [];
-            if(intval($_POST['title']) > 0 && !empty($info['site_title'])){
-                $new['title'] = $info['site_title'];
-                if($length_limit['l_name'] > 0 && strlen($new['title']) > $length_limit['l_name'] ){
-                    $new['title'] = mb_substr($new['title'], 0, $length_limit['l_name'], 'utf-8');
-                }
-            }
-            if(intval($_POST['keywords']) > 0 && !empty($info['site_keywords'])){
-                $new['keywords'] = (empty($link['keywords']) || $_POST['keywords'] == '2') ? $info['site_keywords'] : $link['keywords'];
-                if($length_limit['l_key'] > 0 && strlen($new['keywords']) > $length_limit['l_key'] ){
-                    $new['keywords'] = mb_substr($new['keywords'], 0, $length_limit['l_key'], 'utf-8');
-                }
-            }
-            if(intval($_POST['description']) > 0 && !empty($info['site_description'])){
-                $new['description'] = (empty($link['description']) || $_POST['description'] == '2') ? $info['site_description'] : $link['description'];
-                if($length_limit['l_desc'] > 0 && strlen($new['description']) > $length_limit['l_desc'] ){
-                    $new['description'] = mb_substr($new['description'], 0, $length_limit['l_desc'], 'utf-8');
-                }
-            }
-            if(empty($new)){
-                $r['info'] = 'fail';
-            }else{
-                update_db('user_links',$new,['uid'=>UID ,"lid" => $link['lid'] ]);
-                $r['info'] = 'success';
-            }
-        }
-        
-        //是否获取图标
-        if(intval($_POST['icon']) > 0){
-            //检查跳过已存在图标的链接
-            if($_POST['icon'] == '1' && !empty($link['icon'])){
-                $r['icon'] = 'skip';
-            }
-            $api = Get_Index_URL().'?c=icon&url='.base64_encode($link['url']);
-            $res = ccurl($api,30,true);
-            $data = get_db('global_icon','*',['url_md5'=>md5($link['url'])]);
-            if(empty($data)){
-                $r['icon'] = 'fail';
-            }
-            $new_path = "./data/user/".U.'/favicon/'.$data['file_name'];
-            if(copy("./data/icon/{$data['file_name']}",$new_path)){
-                update_db('user_links',['icon'=>$new_path],['uid'=>UID ,"lid" => $link['lid'] ]);
-                $r['icon'] = 'success';
-            }else{
-                $r['icon'] = 'fail';
-            }
-        }
-        
-        msg(1,$r);
+        msg_tip();
     //图标拉取
     }elseif($_GET['type'] === 'icon_pull'){
-        if($global_config['offline']){
-            msg(-1,"离线模式不可用");
-        } 
-        if(!is_subscribe('bool')){
-            msg(-1,"未检测到有效授权,无法使用该功能!");
-        }
-        if(!check_purview('icon_pull',1)){
-            msg(-1,'无权限');
-        }
-        $link = get_db('user_links','*',['uid'=>UID,'lid'=>$_POST['id']]);
-        if(empty($link)){
-            msg(-1,'请求的链接id不存在');
-        }
-        $path = DIR ."/data/user/".U."/favicon";
-        if(!Check_Path($path)){
-            msg(-1,'创建目录失败,请检查权限');
-        }
-        //检查配置
-        $config = unserialize( get_db("global_config", "v", ["k" => "icon_config"])) ?? [];
-        if($config['o_switch'] == '0'){
-            msg(-1,'相关服务处于关闭状态,请联系站长开启');
-        }
-        
-        //跳过存在图标的链接
-        if(empty($_POST['cover']) && !empty($link['icon'])){
-            msg(1,'skip');
-        }
-
-        $api = Get_Index_URL().'?c=icon&url='.base64_encode($link['url']);
-        $res = ccurl($api,30,true);
-        $data = get_db('global_icon','*',['url_md5'=>md5($link['url'])]);
-        if(empty($data)){
-            msg(1,'fail');
-        }
-        $new_path = "./data/user/".U.'/favicon/'.$data['file_name'];
-        if(copy("./data/icon/{$data['file_name']}",$new_path)){
-            update_db('user_links',['icon'=>$new_path],['uid'=>UID ,"lid" => $_POST['id'] ],[1,'success']);
-        }
-        msg(1,'fail');
+        msg_tip();
 
     }elseif($_GET['type'] == 'extend_list'){
-        if($GLOBALS['global_config']['link_extend'] != 1 ||!check_purview('link_extend',1)){
-            msg(-1,'无权限');
-        }
-        $lists = json_decode($_POST['list'],true);
-        
-        $weight = [];
-        foreach ($lists as  $data ){
-            if(empty($data['weight']) || !preg_match('/^\d$/', $data['weight'])){
-                msgA( ['code' => -1,'msg' => '序号错误,请输入正整数'] );
-            }
-            if(empty($data['title']) || check_xss($data['title'])){
-                msgA( ['code' => -1,'msg' => '标题不能为空'] );
-            }
-            if(empty($data['name']) || check_xss($data['name']) || !preg_match('/^[A-Za-z0-9]{3,18}$/',$data['name'])){
-                msgA( ['code' => -1,'msg' => '字段名错误,请输入长度3-18的字母/数字'] );
-            }
-            if(!in_array($data['type'],['text','textarea','up_img'])){
-                msgA( ['code' => -1,'msg' => '类型错误'] );
-            }
-        }
-        if(is_Duplicated($lists,'weight')){
-            msg(-1,'序号不能重复');
-        }elseif(is_Duplicated($lists,'title')){
-            msg(-1,'标题不能重复');
-        }elseif(is_Duplicated($lists,'name')){
-            msg(-1,'字段名不能重复');
-        }
-        
-        $datas = [];
-        foreach ($lists as $key => $data ){
-            array_push($datas,['title'=>$data['title'],'name'=>$data['name'],'weight'=>$data['weight'],'type'=>$data['type'],'default'=> "{$data['default']}",'tip'=>$data['tip']]);
-        }
-        //根据序号排序
-        usort($datas, function($a, $b) {
-            return $a['weight'] - $b['weight'];
-        });
-        write_user_config('s_extend_list',$datas,'config','链接扩展字段');
-        msgA( ['code' => 1,'msg' => '保存成功','datas'=>$datas] );
+        msg_tip();
     }
 
     msg(-1,'操作类型错误');
@@ -943,6 +742,7 @@ function write_security_setting(){
     }
     
     $datas = [
+        'admin_inlet'=>['v'=>['display','hide','condition1'],'msg'=>'管理入口参数错误'],
         'Session'=>['int'=>true,'min'=>0,'max'=>360,'msg'=>'登录保持参数错误'],
         'HttpOnly'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'HttpOnly参数错误'],
         'KeySecurity'=>['int'=>true,'min'=>0,'max'=>2,'msg'=>'Key安全参数错误'],
@@ -985,145 +785,18 @@ function write_security_setting(){
 
 //写收录配置
 function write_apply(){ 
-    global $global_config;
-    if($global_config['apply'] != 1){
-        msg(-1,'管理员禁止了此功能!');
-    }
-    if($_GET['type'] == 'set'){
-        $s['apply']   = intval($_POST['apply']);   // 功能选项0.关闭 1.需要审核  2.无需审核
-        $s['Notice']  = $_POST['Notice']??'';  // 公告
-        $s['submit_limit'] = intval($_POST['submit_limit']); //提交限制
-        $s['iconurl'] = $_POST['iconurl'];
-        $s['description'] = $_POST['description'];
-        $s['email'] = $_POST['email'];
-        
-        if($s['apply'] < 0 || $s['apply'] > 2 ){ 
-            msg(-1,'参数错误!');
-        }elseif(strlen($s['Notice']) > 512){
-            msg(-1,'公告长度超限!');
-        }if(empty($_POST['submit_limit']) || !preg_match("/^\d*$/",$_POST['submit_limit'])){
-            msg(-1,'提交限制必须为正整数!');
-        }
-        
-        write_user_config('apply',$s,'config','收录配置');
-        msg(1,'保存成功');
-    }elseif($_GET['type'] == '2'){ //通过
-        $id = intval($_POST['id']); 
-        $link =  get_db("user_apply","*",["uid"=>UID,"id"=> $id ]);
-        if(empty($id)){
-            msg(-1,'id错误');
-        }elseif(empty($link['category_id'])){
-            msg(-1,'分类id错误');
-        }elseif(empty($link['title'])){
-            msg(-1,'标题不能为空');
-        }elseif(empty($link['url'])){
-            msg(-1,'链接不能为空');
-        }elseif($link['state'] != 0){
-            msg(-1,'此申请信息不是待审核状态!');
-        }elseif(!empty(get_db('user_links','*',['uid'=>UID,'url'=>$link['url']]))){
-            msg(-1,'链接已存在');
-        }
-        check_link($link['category_id'],$link['title'],$link['url'],''); //检测链接是否合法
-        $lid = get_maxid('link_id');
-        $data = [
-            'lid'           =>  $lid,
-            'uid'           =>  UID,
-            'fid'           =>  $link['category_id'],
-            'title'         =>  $link['title'],
-            'url'           =>  $link['url'],
-            'description'   =>  $link['description'],
-            'add_time'      =>  time(),
-            'up_time'       =>  time(),
-            'icon'          =>  $link['iconurl']
-            ];
-        insert_db('user_links',$data);//插入链接
-        update_db('user_apply',['state'=>1],['uid'=>UID,'id'=>$id]);//更新状态
-        msg(1,'操作成功');
-    }elseif($_GET['type'] == '3'){ //拒绝
-        update_db('user_apply',['state'=>2],['uid'=>UID,'id'=>intval($_POST['id'])],[1,'操作成功']);//更新状态
-    }elseif($_GET['type'] == '4'){ //删除
-        delete_db('user_apply',['uid'=>UID,'id'=>intval($_POST['id'])],[1,'操作成功']); 
-    }elseif($_GET['type'] == 'empty'){ //清空
-        delete_db('user_apply',['uid'=>UID],[1,'操作成功']); //删除
-    }elseif($_GET['type'] == 'edit'){ //编辑
-        $id = intval($_POST['id']); 
-        $link =  get_db("user_apply","*",["uid"=>UID,"id"=> $id]);
-        if(empty($id)){
-            msg(-1,'id错误');
-        }elseif(empty($link)){
-            msg(-1,'未找到数据');
-        }
-        $category_id = intval($_POST['edit_category']); 
-        $category_name = get_db("user_categorys","name",["uid"=>UID,"cid"=> $category_id ]);
-        if(empty($category_name)){
-            msg(-1,'未找到分类');
-        }
-
-        $data = [
-            'category_id'   =>  $category_id,
-            'category_name' =>  $category_name,
-            'title'         =>  htmlspecialchars($_POST['title'],ENT_QUOTES),
-            'url'           =>  $_POST['url'],
-            'description'   =>  htmlspecialchars($_POST['description'],ENT_QUOTES),
-            'iconurl'       =>  $_POST['iconurl']
-            ];
-        update_db('user_apply',$data,['uid'=>UID,'id'=>intval($_POST['id'])]);
-        msg(1,'修改成功');
-    }
-    msg(-1,'不支持的操作类型');
+    msg_tip();
 }
 //读收录列表
 function read_apply_list(){
-    $page   = empty(intval($_REQUEST['page'])) ? 1 : intval($_REQUEST['page']);
-    $limit  = empty(intval($_REQUEST['limit'])) ? 50 : intval($_REQUEST['limit']);
-    $offset = ($page - 1) * $limit; //起始行号
-    $where["uid"] = UID;
-
-    //统计条数
-    $count = count_db('user_apply',$where);
-    //权重排序(数字小的排前面)
-    $where['ORDER']['id'] = 'DESC';
-    //分页
-    $where['LIMIT'] = [$offset,$limit];
-    //查询
-    $datas = select_db('user_apply','*',$where);
-    msgA(['code'=>1,'msg'=>'获取成功','count'=>$count,'data'=>$datas]);
+    msg_tip();
 }
 
 //写站点设置
 function write_site_setting(){ 
     //图标上传
     if(!empty($_FILES["file"])){
-        check_purview('Upload_icon',2);
-        if ($_FILES["file"]["error"] > 0){
-            msg(-1,'文件上传失败,error:'.$_FILES["file"]["error"]);
-        }
-        //获取文件名后缀
-        $suffix = strtolower(end(explode('.',$_FILES["file"]["name"])));
-        if(!preg_match('/^(jpg|jpeg|png|bmp|gif|ico|svg)$/',$suffix)){
-            @unlink($_FILES["file"]["tmp_name"]);
-            msg(-1,'文件上传失败,文件格式不被支持!');
-        }
-        //文件路径
-        $path = 'data/user/'.U.'/favicon/favicon.'.$suffix;
-        //检查并创建目录
-        if(!Check_Path(dirname($path))){
-            msg(-1,'创建目录失败,请检查权限');
-        }
-        $site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
-        //存在旧图标则先删除
-        if(!empty($site['site_icon_file']) && is_file($site['site_icon_file'])){
-            @unlink($site['site_icon_file']);
-        }
-        //转移临时文件
-        if(move_uploaded_file($_FILES["file"]["tmp_name"],$path)) {
-            
-            $site['site_icon_file'] = 'data/user/'.U.'/favicon/favicon.'.$suffix; //储存路径
-            $site['site_icon'] = './'.$site['site_icon_file']; //前端请求路径
-            update_db("user_config", ["v" =>$site], ['uid'=>UID,'k'=>'s_site'],[1,'上传成功']); 
-        }else{
-            msg(-1,'上传失败,请检查目录权限');
-        }
+        msg_tip();
     }
     check_purview('site_info',2);
     if(!empty($_POST['custom_header']) && !check_purview('header',1)){
@@ -1141,6 +814,7 @@ function write_site_setting(){
         'link_model'=>['v'=>['direct','Privacy','Privacy_js','Privacy_meta','301','302','Transition'],'msg'=>'链接模式参数错误'],
         'main_link_priority'=>['int'=>true,'min'=>0,'max'=>3,'msg'=>'主链优先参数错误'],
         'link_icon'=>['int'=>true,'min'=>0,'max'=>30,'msg'=>'链接图标参数错误'],
+        'repeat_url'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'重复链接参数错误'],
         'site_icon'=>['empty'=>true],
         'top_link'=>['int'=>true,'min'=>0,'max'=>100,'msg'=>'热门链接参数错误'],
         'new_link'=>['int'=>true,'min'=>0,'max'=>100,'msg'=>'最新链接参数错误'],
@@ -1166,6 +840,7 @@ function write_site_setting(){
         @unlink($site['site_icon_file']);
         $s_site['site_icon_file'] = '';
     }
+    write_user_config('repeat_url',$_POST['repeat_url'],'config','重复链接');
     update_db("user_config",["v"=>$s_site],["k"=>'s_site',"uid"=>UID],[1,'保存成功']);
 }
 //写过渡页配置
@@ -1175,20 +850,21 @@ function write_transit_setting(){
         'admin_stay_time'=>['int'=>true,'min'=>0,'max'=>60,'msg'=>'管理员停留时间范围0-60'],
         'default_keywords'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'默认关键字参数错误']
         ];
-    
-    foreach ($datas as $key => $data){
-        if($data['int']){
-            $s[$key] = ($_POST[$key] >= $data['min'] && $_POST[$key] <= $data['max'])?intval($_POST[$key]):msg(-1,$data['msg']);
-        }elseif(isset($data['v'])){
-            $s[$key] = in_array($_POST[$key],$data['v']) ? $_POST[$key]:msg(-1,$data['msg']);
-        }else{
-            $s[$key] = $data['empty']?$_POST[$key]:(!empty($_POST[$key])?$_POST[$key]:msg(-1,$data['msg']));
-        }
-    }
+    $s = Post_data_filter($datas);
     write_user_config('s_transition_page',$s,'config','过渡页配置');
     msg(1,"保存成功！");
 }
 
+//写验证页配置
+function write_verify_page(){ 
+    $datas = [
+        'link_tip'=>['empty'=>true],
+        'share_tip'=>['empty'=>true]
+        ];
+    $s = Post_data_filter($datas);
+    write_user_config('s_verify_page',$s,'config','验证页配置');
+    msg(1,"保存成功！");
+}
 
 //修改密码
 function write_user_password(){
@@ -1326,112 +1002,152 @@ function read_pwd_group_list(){
 }
 //写加密分组 考虑要不要限制特殊字符
 function write_pwd_group(){
-    check_purview('link_pwd',2);
-    if($_GET['type'] === 'del'){
-        //判断有没有被使用
-        if(!empty(get_db('user_links','id',['uid'=>UID,'pid'=>intval($_POST['pid'])]))){
-            msg(-1,'正在被链接使用,无法删除!');
-        }else if(!empty(get_db('user_categorys','id',['uid'=>UID,'pid'=>intval($_POST['pid'])]))){
-            msg(-1,'正在被分类使用,无法删除!');
-        }
-        
-        delete_db('user_pwd_group',['uid'=>UID,'pid'=>intval($_POST['pid'])],[1,'删除成功']);
-    }elseif($_GET['type'] == 'add'){
-        //$pid = intval(max_db('user_pwd_group','pid',['uid'=>UID])) +1; 
-        $pid = get_maxid('pwd_group_id');
-        insert_db('user_pwd_group',['name' => $_POST['name'],'password' =>$_POST['password'],'description'=>$_POST['description'],'uid'=>UID,'pid'=>$pid],[1,'操作成功']);
-    }elseif($_GET['type'] === 'edit'){
-        update_db('user_pwd_group',['name' => $_POST['name'],'password' =>$_POST['password'],'description'=>$_POST['description']],['uid'=>UID,'pid'=>intval($_POST['pid'])],[1,'操作成功']);
-    }
-    msgA(['code' => 1 ,'msg'=> '1111']);
+    msg_tip();
 }
 
 
 //检测链接是否有效
 function other_testing_link(){
+    msg_tip();
+}
+
+//读主题信息
+function read_theme(){
     global $global_config;
-    if ( $global_config['offline'] == '1'){ msg(-1,"离线模式无法使用此功能"); }
-    $code = get_http_code($_POST['url']);
-    if($code != 200 && $code != 302 && $code != 301){
-        $code = ccurl($_POST['url'],30)['code'];
+    global $USER_DB;
+    // 检查权限
+    if(!check_purview('theme_in',1)){
+        msg(-1,'无权限');
     }
-    msgA(['code' => 0 ,'StatusCode'=> $code]);
+    
+    $check_dirs = ['home','login','transit','register','guide','article','apply','verify','guestbook'];
+    $request_dir = $_GET['dir'];
+    if(in_array($request_dir,$check_dirs)){
+        if(in_array($request_dir,['register','guide']) && $USER_DB['UserGroup'] != 'root' ){
+            msg(-1,'管理此模板需管理员权限');
+        }
+    }else{
+        msg(-1,'dir参数错误');
+    }
+    $son_dirs = get_dir_list(DIR.'/templates/'.$request_dir);
+    
+    foreach ($son_dirs as $son_dir) {
+        $path = DIR.'/templates/'.$request_dir.'/'.$son_dir; //目录完整路径
+        //没有信息文件则跳过
+        if(!is_file($path.'/info.json') ) {continue;}
+        //读取主题信息
+        $themes[$son_dir] = json_decode(@file_get_contents($path.'/info.json'),true);
+        //是否支持配置
+        $themes[$son_dir]['config'] = is_file($path.'/config.php') ? '1':'0';
+        //预览图优先顺序:png>jpg>info>default
+        if(is_file($path.'/screenshot.jpg')){
+            $themes[$son_dir]['screenshot'] = "./templates/$request_dir/$son_dir/screenshot.jpg";
+        }elseif(is_file($path.'/screenshot.png')){
+            $themes[$son_dir]['screenshot'] = "./templates/$request_dir/$son_dir/screenshot.png";
+        }elseif(empty($themes[$son_dir]['screenshot'])){ 
+            $themes[$son_dir]['screenshot'] = "./templates/admin/static/42ed3ef2c4a50f6d.png";
+        }
+    }
+    
+    function filter($arr){
+        foreach($arr as $key => $data){
+            $new[$key]['name'] = $data['name'] ?? 'null';
+            $new[$key]['description']= $data['description'] ?? 'null';
+            $new[$key]['homepage']= $data['homepage'] ?? 'null';
+            $new[$key]['version']= $data['version'] ?? 'null';
+            $new[$key]['update']= $data['update'] ?? 'null';
+            $new[$key]['author']= $data['author'] ?? 'null';
+            $new[$key]['screenshot']= $data['screenshot'] ?? 'null';
+            $new[$key]['config'] = $data['config'] ?? '0';
+            $new[$key]['state'] = $data['up'] == 1 ? 'up' : (empty($data['dir']) ? 'local' : 'dw');
+        }
+        return $new;
+    }
+
+    //在线主题处理
+    if ( !$global_config['offline'] && $USER_DB['UserGroup'] === 'root'){ 
+        $sysver = get_SysVer();
+        //读取缓存
+        $page = 'theme_'.$request_dir;
+        $template = get_db('global_config','v',['k'=>$page.'_cache']);
+        if(!empty($template)){
+            $data = json_decode($template, true);
+        }
+        
+        //没有缓存 或 禁止缓存 或 缓存过时
+        if(empty($template) ||   $_GET['cache'] === 'no'  || time() -  $data["time"] > 1800 ){ 
+            $urls = ["gitee" => "http://tznb.gitee.io/twonav_resource/{$request_dir}_template.json"];
+            $Source = $global_config['Update_Source'] ?? '';
+            if (!empty($Source) && isset($urls[$Source])) {
+                $urls = [$Source => $urls[$Source]];
+            }
+        }else{
+            $cache = true;
+        }
+        //读取超时参数
+        $overtime = !isset($global_config['Update_Overtime']) ? 3 : ($global_config['Update_Overtime'] < 3 || $global_config['Update_Overtime'] > 60 ? 3 : $global_config['Update_Overtime']);
+        //远程获取
+        foreach($urls as $key => $url){
+            $Res = ccurl($url,$overtime);
+            $data = json_decode($Res["content"], true);
+            if($data["code"] == 200 ){ //如果获取成功
+                $data["time"] = time(); //记录当前时间
+                write_global_config($page.'_cache',json_encode($data),$request_dir.'_模板缓存');
+                break; //跳出循环.
+            } 
+        }
+        //解析
+        foreach($data["data"] as $key){
+            $path = DIR.'/templates/'.$request_dir.'/'.$key["dir"];
+            if( is_dir($path) ) {  //本地存在
+                $value = $key["dir"];
+                //检查是否可以更新
+                $update = str_replace('/','',$themes[$value]['update']); //本地主题版本
+                $update_new = str_replace('/','',$key["update"]); //远程主题版本
+                if( $sysver >= intval($key["low"])  && $sysver <= intval($key["high"]) &&  $update < $update_new ){
+                    $themes[$value]['up'] = '1';
+                }
+            }else{
+                //判断是否适配当前系统版本
+                if( $sysver >= intval($key["low"])  && $sysver <= intval($key["high"]) ){
+                    $value = $key["dir"];
+                    $themes[$value] = json_decode(json_encode($key),true);
+                }
+            }
+        }
+    }
+    
+    //取正在使用的模板
+    if(in_array($request_dir,['register','guide'])){
+        $global_templates = unserialize(get_db("global_config",'v', ["k" => "s_templates"]));
+        $current[$request_dir] = $global_templates[$request_dir] ?? 'default';
+    }else{
+        $s_templates = unserialize(get_db("user_config", "v", ["uid"=>UID,"k"=>"s_templates"]));
+        if($request_dir == 'home'){
+            $current['home_pad'] = $s_templates['home_pad'] ?? 'default';
+            $current['home_pc'] = $s_templates['home_pc'] ?? 'default';
+        }else{
+            $current[$request_dir] = $s_templates[$request_dir] ?? 'default';
+        }
+    }
+
+    
+    $themes = filter($themes);
+    msgA(['code'=>1,'data'=>$themes,'current'=>$current,'referrer'=>($data['referrer'] ?? '')]);
+}
+function msg_tip(){
+    if(is_subscribe()){
+        msg(-1,'请前往概要页面更新系统,未提示更新则尝试刷新页面<br />更新后即可解锁全部功能,如有疑问请联系客服');
+    }
+    msg(-1,'免费版不支持此功能<br /> <a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank" style="color: #1e9fff;">点击此处前往购买页面</a>');
 }
 
 //主题下载/更新/删除
 function write_theme(){
     global $global_config;
-    $fn = $_POST['fn'];if($_GET['type'] != 'config' && !in_array($fn,['home','login','transit','register','guide','article'])){msg(-1,'fn参数错误');}
+    $fn = $_POST['fn'];if($_GET['type'] != 'config' && !in_array($fn,['home','login','transit','register','guide','article','verify','guestbook','apply'])){msg(-1,'fn参数错误');}
     if($_GET['type'] == 'download'){
-        is_root();
-        if($global_config['offline']){msg(-1,"离线模式禁止下载主题!");} //离线模式
-        if(!is_subscribe('bool')){msg(-1,"未检测到有效授权,无法使用该功能!");}
-        $dir = $_POST['dir'];
-        $name = $_POST['name'];
-        if(preg_match('/^v.+-(\d{8})$/i',SysVer,$matches)){
-            $sysver = intval( $matches[1] );
-        }else{
-            msg(-1,"获取程序版本异常");
-        }
-        if(!is_writable('./templates')){
-            msg(-1,"检测到模板目录不可写<br />请检查templates目录权限<br />宝塔面板请注意所有者为www<br />其他疑问请联系技术支持");
-        }
-        //从数据库查找主题信息
-        $template = get_db('global_config','v',['k'=> 'theme_'.$fn.'_cache']);
-        if(empty($template)){
-            msg(-1,'-1,未找到数据');
-        }else{
-            $data = json_decode($template, true); //转为数组
-            foreach($data["data"] as $key){
-                if( $key['dir'] === $dir && $sysver >= intval($key["low"])  && $sysver <= intval($key["high"])){
-                    $file = $key['dir'].".tar.gz";
-                    $filePath = DIR."/data/temp/{$file}";
-                    break; //找到跳出
-                }
-            }
-            if(empty($file)){
-                msg(-1,'-2,未找到数据');
-            }
-        }
-        
-        //下载主题包
-        if(!is_dir('./data/temp')) mkdir('./data/temp',0755,true) or msg(-1,'下载失败,创建临时[/data/temp]目录失败');
-        if(!is_writable('./data/temp')){
-            msg(-1,"检测到临时目录不可写<br />请检查data/temp目录权限<br />宝塔面板请注意所有者为www<br />其他疑问请联系技术支持");
-        }
-        $data = $key;
-        foreach($data['url'] as $url){
-            if(downFile( $url , $file , DIR.'/data/temp/')){
-                $file_md5 = md5_file($filePath);
-                if($file_md5 === $data['md5']){
-                    $downok = true;
-                    break;//下载成功,跳出循环!
-                }else{
-                    unlink($filePath);
-                }
-            }
-        }
-        //判断下载结果
-        if(!$downok || !file_exists($filePath)){
-            msg(-1,'-1,下载失败');
-        }elseif($file_md5 != $data['md5']){
-            msgA(['code'=>-1,'msg'=> '效验压缩包异常','Correct_md5'=> $data['md5'],'file_md5'=>$file_md5]);
-        }
-        //解压主题包
-        try {
-            $phar = new PharData($filePath);
-            $phar->extractTo(DIR.'/templates/'.$fn, null, true); //路径 要解压的文件 是否覆盖
-            unlink($filePath);//删除文件
-        } catch (Exception $e) {
-            msg(-1,'解压主题包失败');
-        }
-        //检查结果并返回
-        if(file_exists(DIR."/templates/$fn/".$data['dir']."/info.json")){
-            msgA(['code'=>1,'msg'=> '下载成功']);
-        }else{
-            msgA(['code'=>-1,'msg'=> '解压后未找到主题信息','url'=> $url,'file_md5'=>$file_md5]);
-        }
-        
+        msg_tip();
     //删除主题
     }elseif($_GET['type'] == 'del'){
         is_root();
@@ -1466,6 +1182,11 @@ function write_theme(){
         
         //读取用户模板配置
         require DIR."/system/templates.php";
+        if($fn == 'register' || $fn == 'guide'){
+            $global_templates[$fn] = $name;
+            update_db('global_config',['v'=>$global_templates],['k'=>'s_templates'],[1,'操作成功']);
+        }
+        
         //判断设置的类型
         if($fn == 'home'){
             if( $type == 'PC/Pad'){
@@ -1478,21 +1199,19 @@ function write_theme(){
             }else{
                 msg(-1,'参数错误');
             }
-        }elseif($fn == 'login'){
-            $s_templates['login'] = $name;
-        }elseif($fn == 'transit'){
-            $s_templates['transit'] = $name;
-        }elseif($fn == 'article'){
-            $s_templates['article'] = $name;
-        }elseif($fn == 'register'){
-            $global_templates['register'] = $name;
-            update_db('global_config',['v'=>$global_templates],['k'=>'s_templates'],[1,'注册模板设置成功']);
-        }elseif($fn == 'guide'){
-            $global_templates['guide'] = $name;
-            update_db('global_config',['v'=>$global_templates],['k'=>'s_templates'],[1,'引导页模板设置成功']);
+        }else{
+            $s_templates[$fn] = $name;
+            if($fn == 'transit'){
+                $site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
+                if($site['link_model'] != 'Transition'){
+                    $site['link_model'] = 'Transition';
+                    update_db("user_config",["v"=>$site],["k"=>'s_site',"uid"=>UID]);
+                    $msg = ',已同步链接模式为过渡页面';
+                }
+            }
         }
         //更新数据
-        update_db('user_config',['v'=>$s_templates],['uid'=>UID,'k'=>'s_templates'],[1,'设置成功']);
+        update_db('user_config',['v'=>$s_templates],['uid'=>UID,'k'=>'s_templates'],[1,"设置成功{$msg}"]);
         
     //配置主题信息
     }elseif($_GET['type'] == 'config'){
@@ -1508,11 +1227,15 @@ function write_theme(){
             msg(-1,"获取模板类型错误");
         }
         $fn = empty($GET['fn']) ? $_GET['template_type'] : $GET['fn'];
-        if(!in_array($fn,['home','login','register','transit','guide','article'])){
+        if(!in_array($fn,['home','login','transit','register','guide','article','verify','guestbook','apply'])){
             msg(-1,"参数错误");
         }
         //0420 END
-        write_user_config($_GET['t'],$_POST,'theme_' . $fn,'主题配置');
+        if(in_array($fn,['guide','register'])){
+            write_global_config("theme_{$fn}_{$_GET['t']}",$_POST,'主题配置');
+        }else{
+            write_user_config($_GET['t'],$_POST,'theme_' . $fn,'主题配置');
+        }
         msg(1,"保存成功！");
     }
 }
@@ -1704,6 +1427,9 @@ function read_data(){
         msgA( ['code'=>1,'data'=>[$category_count,$link_count,$index_count,$click_count] ]);
     //连通测试
     }elseif($_GET['type'] == 'connectivity_test'){
+        if($GLOBALS['global_config']['offline'] == '1'){
+            msg(1,'您已开启离线模式,无法使用该功能!');
+        }
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $_POST['url']);
         curl_setopt($ch, CURLOPT_TIMEOUT, 10);
@@ -1748,7 +1474,8 @@ function read_data(){
             $log .= "SQLite：".(is_writable($db_config['path'])?'数据库读写正常':'数据库只读(请将权限设为755)')."\n";
         }elseif($db_config['type'] == 'mysql'){
             $log .= "MySQL：".$db->info ()['version']."\n";
-            
+        }elseif($db_config['type'] == 'mariadb'){
+            $log .= "MariaDB：".$db->info ()['version']."\n";
         }
         
         $path = './data/test_'.time().'.txt';
@@ -1783,6 +1510,8 @@ function read_data(){
         $log .= in_array("Phar",$ext) ? "" : "Phar：不支持 (在线更新/主题下载)\n";
         $log .= in_array("hash",$ext) ? "" : "hash：不支持 (书签分享/生成注册码)\n";
         $log .= in_array("session",$ext) ? "" : "session：不支持 (影响较大)\n";
+        $log .= in_array("intl",$ext) ? "" : "intl：不支持 (使用中文域名时可能会导致异常)\n";
+        $log .= $GLOBALS['global_config']['offline'] == '1' ? "离线模式：已开启,会导致无法更新系统/下载主题模板等\n" : "";
         $log .= "可用模块：".implode("&#12288;",$ext)."\n";
         $updatadb_logs = select_db('updatadb_logs','file_name',['file_name[!]'=>'install.sql']);
         $log .= "数据库更新记录:".(empty($updatadb_logs)?'无':"\n".implode("\n",$updatadb_logs))."\n";
@@ -1820,6 +1549,74 @@ function read_data(){
         
         $data = ['dates'=>$dates,'day_data'=>$day_data];
         msgA(['code'=>1,'data'=>$data]);
+    }elseif($_GET['type'] == 'tongji_ip_list'){
+        $days = isset($_GET['date']) && !empty($_GET['date']) ? $_GET['date'] : 7;
+        $dates = [];
+        for ($i = 0; $i < $days; $i++) {
+            $date = date('Ymd', strtotime("-$i days"));
+            $dates[] = $date;
+        }
+        $dates = array_reverse($dates);
+        $day_data = [];
+        foreach ($dates as $date) {
+            $list = select_db('user_count','e',['uid'=>UID,'k'=>$date,'t'=>'access_ip']);
+            $day_data[$date] = empty($list) ? [] : $list ;
+        }
+        msgA(['code'=>1,'data'=>$day_data]);
+    }elseif($_GET['type'] == 'menu'){
+        global $global_config;
+        $menu = [];
+        if(check_purview('site_info',1)){
+            array_push($menu,['title'=>'站点设置','href'=>'SiteSetting','icon'=>'fa fa-cog']);
+        }
+        if(check_purview('theme_in',1)){
+            array_push($menu,['title'=>'主题管理','href'=>'theme','icon'=>'fa fa-magic']);
+        }
+        array_push($menu,
+            ['title'=>'分类管理','href'=>'category_list','icon'=>'fa fa-list-ul'],
+            ['title'=>'加密管理','href'=>'pwd_group','icon'=>'fa fa-lock'],
+            ['title'=>'链接管理','icon'=>'fa fa-folder-open-o','href'=>'','child'=>
+              [
+                ['title'=>'链接列表','href'=>'link_list','icon'=>'fa fa-link'],
+                ['title'=>'添加链接','href'=>'link_add','icon'=>'fa fa-plus-square-o'],
+                ['title'=>'书签分享','href'=>'share','icon'=>'fa fa-external-link'],
+                ['title'=>'导出导入','href'=>'data_control','icon'=>'fa fa-retweet'],
+              ]
+            ]);
+        
+        //扩展功能
+        $extend = [];
+        //if($global_config['apply'] == 1 && check_purview('apply',1)){
+            array_push($extend,['title'=>'收录管理','href'=>'expand/apply-admin','icon'=>'fa fa-pencil']);
+        //}
+        //if($global_config['guestbook'] == 1 && check_purview('guestbook',1)){ 
+            array_push($extend,['title'=>'留言管理','href'=>'expand/guestbook-admin','icon'=>'fa fa-commenting-o']);
+        //}
+        //if($global_config['article'] > 0 && check_purview('article',1)){ 
+            array_push($extend,['title'=>'文章管理','href'=>'expand/article-list','icon'=>'fa fa-file-text-o']);
+        //}
+        if(!empty($extend)){
+            $extend = ['title'=>'扩展功能','icon'=>'fa fa-folder-open-o','href'=>'','child'=> $extend];
+            array_push($menu,$extend);
+        }
+        
+        //如果是管理员则追加菜单
+        if($USER_DB['UserGroup'] == 'root'){
+            array_push($menu,
+            ['title'=>'网站管理','icon'=>'fa fa-wrench','href'=>'','child'=>
+              [
+                ['title'=>'系统设置','href'=>'root/sys_setting','icon'=>'fa fa-gears'],
+                ['title'=>'授权管理','href'=>'root/vip','icon'=>'fa fa-diamond'],
+                ['title'=>'用户管理','href'=>'root/user_control','icon'=>'fa fa-user'],
+                ['title'=>'用户分组','href'=>'root/users_control','icon'=>'fa fa-users'],
+                ['title'=>'注册管理','href'=>'root/reg_control','icon'=>'fa fa-user-plus'],
+                ['title'=>'站长工具','href'=>'root/tool','icon'=>'fa fa-exclamation-triangle'],
+              ]
+            ]);
+        }
+        $logo_url = static_link ? get_surl('{UUID}.html'):"./?u={$USER_DB['User']}";
+        $init = array( 'homeInfo'=>['title'=>'概要','href'=>'home'],'logoInfo'=>['title'=>'TwoNav','image'=>'./templates/admin/img/logo.png','href'=>$logo_url],'menuInfo'=>$menu);
+        msgA($init);
     }
 }
 
@@ -1838,7 +1635,10 @@ function write_article(){
     require DIR . '/system/api_article.php';
     exit;
 }
-
+//百度推送
+function other_baidu_push(){
+    msg(-1,'未检测到有效授权,无法使用该功能');
+}
 //获取链接信息
 function other_get_link_info(){
     global $global_config;
@@ -1849,9 +1649,8 @@ function other_get_link_info(){
         msg(-1010,'URL不能为空!');
     }elseif(!preg_match("/^(http:\/\/|https:\/\/).*/",$url)){
         msg(-1010,'只支持识别http/https协议的链接!');
-    }elseif( !filter_var($url, FILTER_VALIDATE_URL) ) {
-         msg(-1010,'URL无效!');
     }
+    $url = process_url_idn($url);
     //获取网站标题 (HTML/JS跳转无法识别)
     $c = curl_init(); 
     curl_setopt($c, CURLOPT_URL, $url); 
@@ -1871,3 +1670,17 @@ function other_get_link_info(){
     $link['description'] = $info['site_description'];
     msgA(['code'=>1,'data'=>$link]);
 }
+
+//POST数据过滤
+function Post_data_filter($datas){
+    foreach ($datas as $key => $data){
+        if($data['int']){
+            $s[$key] = ($_POST[$key] >= $data['min'] && $_POST[$key] <= $data['max'])?intval($_POST[$key]):msg(-1,$data['msg']);
+        }elseif(isset($data['v'])){
+            $s[$key] = in_array($_POST[$key],$data['v']) ? $_POST[$key]:msg(-1,$data['msg']);
+        }else{
+            $s[$key] = $data['empty']?$_POST[$key]:(!empty($_POST[$key])?$_POST[$key]:msg(-1,$data['msg']));
+        }
+    }
+    return $s;
+}

system/api_article.php

@@ -3,220 +3,18 @@
 $type = htmlspecialchars(trim($_GET['type']),ENT_QUOTES); 
 
 if (function_exists($type) ) {
-    if($GLOBALS['global_config']['article'] != 1 || !check_purview('article',1)){
-        msg(-1,'无权限');
+    if($GLOBALS['global_config']['article'] < 1 || !check_purview('article',1)){
+        msg_tip();
     }
     $type();
 }else{
     Amsg(-1,'请求类型错误 >> '.$type);
 }
 
-//上传图片
-function uploadImage(){
-    global $u;
-    //权限检测
-    if(!check_purview('article_image',1)){
-        msgA(['errno'=>-1,'message'=>'您的用户组无权限上传图片']);
-    }elseif(empty($_FILES["file"]) || $_FILES["file"]["error"] > 0){
-        msgA(['errno'=>-1,'message'=>'文件上传失败']);
-    }
-    
-    //取后缀并判断是否支持
-    $suffix = strtolower(end(explode('.',$_FILES["file"]["name"])));
-    if(!preg_match('/^(jpg|png|gif|bmp|jpeg|svg|webp)$/',$suffix)){
-        @unlink($_FILES["file"]["tmp_name"]);
-        msgA(['errno'=>-1,'message'=>'文件格式不被支持']);
-    }
-    //限制文件大小
-    if(filesize($_FILES["file"]["tmp_name"]) > 5 * 1024 * 1024){
-        msgA(['errno'=>-1,'message'=>'文件大小超限']);
-    }
-    //文件临时路径
-    $ym = date("Ym");
-    $path = DIR . "/data/user/{$u}/upload/{$ym}/";
-    //检测目录,不存在则创建!
-    if(!Check_Path($path)){
-        msgA(['errno'=>-1,'message'=>'创建upload目录失败,请检查权限']);
-    }
-    $tmp_name = 'AI_'.uniqid().'.'.$suffix;
-    //移动文件
-    if(!move_uploaded_file($_FILES["file"]["tmp_name"],"{$path}/{$tmp_name}")) {
-        msgA(['errno'=>-1,'message'=>'上传失败,请检查目录权限']);
-    }else{
-        msgA(['errno'=>0,'data'=>['url'=>"./data/user/{$u}/upload/{$ym}/$tmp_name",'alt'=>$_FILES["file"]["name"],'href'=>''],'message'=>'上传成功']);
-    }
-}
-//删除图片
-function deleteImage(){
-    global $u;
-    if(empty($_POST['path'])){
-        msg(-1,'请求参数错误');
-    }
-    $path = $_POST['path'];
-    $pattern = "/^\.\/data\/user\/{$u}\/upload\/\d{6}\/AI_[A-Za-z0-9_]+\.(jpg|png|gif|bmp|jpeg|svg|webp)$/i";
-    if(preg_match($pattern,$path) && is_file($path)){
-        @unlink($path);
-    }else{
-        msg(-1,'请求参数错误');
-    }
-    //需考虑编辑文章删除封面时未点击保存的情况
-    if(is_file($path)){
-        msg(-1,'删除失败');
-    }else{
-        msg(1,'删除成功');
-    }
-}
-//上传视频
-function uploadVideo(){
-    msgA(['errno'=>-1,'message'=>'未开放']);
-    global $u;
-    //权限检测
-    if(!check_purview('article_image',1)){
-        msgA(['errno'=>-1,'message'=>'您的用户组无权限上传视频']);
-    }elseif(empty($_FILES["file"]) || $_FILES["file"]["error"] > 0){
-        msgA(['errno'=>-1,'message'=>'文件上传失败']);
-    }
-    
-    //取后缀并判断是否支持
-    $suffix = strtolower(end(explode('.',$_FILES["file"]["name"])));
-    if(!preg_match('/^(avi|mp4|wma|rmvb|rm|flash|3gp|flv)$/',$suffix)){
-        @unlink($_FILES["file"]["tmp_name"]);
-        msgA(['errno'=>-1,'message'=>'文件格式不被支持']);
-    }
-    //限制文件大小
-    if(filesize($_FILES["file"]["tmp_name"]) > 20 * 1024 * 1024){
-        msgA(['errno'=>-1,'message'=>'文件大小超限']);
-    }
-    //文件临时路径
-    $ym = date("Ym");
-    $path = DIR . "/data/user/{$u}/upload/{$ym}/";
-    //检测目录,不存在则创建!
-    if(!Check_Path($path)){
-        msgA(['errno'=>-1,'message'=>'创建upload目录失败,请检查权限']);
-    }
-    $tmp_name = 'AV_'.uniqid().'.'.$suffix;
-    //移动文件
-    if(!move_uploaded_file($_FILES["file"]["tmp_name"],"{$path}/{$tmp_name}")) {
-        msgA(['errno'=>-1,'message'=>'上传失败,请检查目录权限']);
-    }else{
-        msgA(['errno'=>0,'data'=>['url'=>"./data/user/{$u}/upload/{$ym}/$tmp_name",'alt'=>$_FILES["file"]["name"],'href'=>''],'message'=>'上传成功']);
-    }
-}
-
 //获取文章列表
 function article_list(){
-    $where['uid'] = UID;
-    //分类筛选
-    if(intval(@$_POST['category']) > 0){
-        $where['AND']['category'] = intval(@$_POST['category']);
-    }
-    //状态筛选
-    if(intval(@$_POST['state']) > 0){
-        $where['AND']['state'] = intval(@$_POST['state']);
-    }
-    //关键字筛选
-    $query  = $_POST['keyword'];
-    if(!empty($query)){
-        $where['AND']['OR'] = ["title[~]" => $query,"summary[~]" => $query,"content[~]" => $query];
-    }
-    //统计条数
-    $count = count_db('user_article_list',$where);
-    //分页
-    $page   = empty(intval($_REQUEST['page'])) ? 1 : intval($_REQUEST['page']);
-    $limit  = empty(intval($_REQUEST['limit'])) ? 50 : intval($_REQUEST['limit']);
-    $offset = ($page - 1) * $limit; //起始行号
-    $where['LIMIT'] = [$offset,$limit];
-
-    $datas = select_db('user_article_list',['id','title','category','state','password','top','add_time','up_time','browse_count','summary','cover'],$where);
-
-    //查询分类
-    $categorys = select_db('user_categorys',['cid(id)','name'],['uid'=>UID]);
-    $categorys = array_column($categorys,'name','id');
-    //为文章添加分类名称
-    foreach ($datas as &$data) {
-        $data['category_name'] = $categorys[$data['category']] ?? 'Null';
-    }
-    msgA(['code'=>1,'count'=>$count,'data'=>$datas]);
-}
-
-//保存文章
-function save_article(){
-    if(empty($_POST['category']) || !has_db('user_categorys',['uid'=>UID,'cid'=>$_POST['category']])){
-        msg(-1,'分类不存在');
-    }
-    $time = time();
-    //id为空,添加文章
-    if(empty($_POST['id'])){
-        insert_db('user_article_list',[
-            'uid'=>UID,
-            'title'=>$_POST['title'],
-            'category'=>$_POST['category'],
-            'state'=>$_POST['state'],
-            'password'=>'',
-            'top'=>0,
-            'add_time'=>$time,
-            'up_time'=>$time,
-            'browse_count'=>0,
-            'summary'=>$_POST['summary'],
-            'content'=>$_POST['content'],
-            'cover'=>$_POST['cover_url'],
-            'extend'=>''
-        ],[1,'保存成功']);
-    //存在id,更新文章数据
-    }else{
-        if(!has_db('user_article_list',['uid'=>UID,'id'=>$_POST['id']])){
-            msg(-1,'文章id错误');
-        }
-        update_db('user_article_list',[
-            'title'=>$_POST['title'],
-            'category'=>$_POST['category'],
-            'state'=>$_POST['state'],
-            'up_time'=>$time,
-            'summary'=>$_POST['summary'],
-            'content'=>$_POST['content'],
-            'cover'=>$_POST['cover_url']
-        ],['uid'=>UID,'id'=>$_POST['id']],[1,'保存成功']);
-    }
-    
-
-}
-//删除文章
-function del_article(){
-    $id = json_decode($_POST['id']);
-    if(empty($id)) msg(-1,'参数错误');
-    delete_db('user_article_list',['uid'=>UID,'id'=>$id],[1,'操作成功']);
-}
-//修改分类
-function up_category(){
-    $id = json_decode($_POST['id']);
-    if(empty($id)) msg(-1,'参数错误');
-    if(empty($_POST['category_id']) || !has_db('user_categorys',['uid'=>UID,'cid'=>$_POST['category_id']])){
-        msg(-1,'分类不存在');
-    }
-    update_db('user_article_list',['category'=>$_POST['category_id']],['uid'=>UID,'id'=>$id],[1,'操作成功']);
-}
-//修改状态
-function up_state(){
-    $id = json_decode($_POST['id']);
-    if(empty($id)) msg(-1,'参数错误');
-    if(!in_array($_POST['state_id'],['1','2','3','4'])){
-        msg(-1,'状态参数错误');
-    }
-    update_db('user_article_list',['state'=>$_POST['state_id']],['uid'=>UID,'id'=>$id],[1,'操作成功']);
+    msg_tip();
 }
 
 
-//保存设置 (与站点配置共享)
-function save_article_set(){
-    //检查配置参数
-    if(!in_array($_POST['visual'],['0','1','2']) || !in_array($_POST['icon'],['0','1','2'])){
-        msg(-1,'参数错误');
-    }
-    //读取站点配置
-    $s_site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
-    $s_site['article_visual'] = $_POST['visual'];
-    $s_site['article_icon'] = $_POST['icon'];
-    update_db("user_config",["v"=>$s_site],["k"=>'s_site',"uid"=>UID],[1,'保存成功']);
-}
-
 

system/api_root.php

@@ -33,76 +33,52 @@ function other_upsys(){
                 msg(-1,"文件夹不可写 >> $path");
             }
         }
-        
-        $_SESSION['upsys']['sysver'] = intval($matches[1]);
-        usleep(1000*300); //延迟300毫秒
-        msg(1,'success');
-    }
-    //下载更新包
-    if($_POST['i'] == 2){
+        //检查授权状态
         if(!is_subscribe('bool')){
             msg(-1,'未检测到有效授权,请
             <a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank" style="color: #01AAED;">购买授权</a>
             或
             <a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=8013447&doc_id=3767990" target="_blank" style="color: #01AAED;">手动更新</a>');
         }
+        $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"]));
+        if(!isset($subscribe['public']) || empty($subscribe['public'])){
+            msg(-1,'
+            错误原因: 未检测到授权秘钥<br />如何处理: <br /> 
+            &nbsp;&nbsp; 1. 转到<a href="./index.php?c=admin&u='.U.'#root/vip" target="_blank" style="color: #01AAED;">授权管理</a>页面点击保存设置<br />
+            &nbsp;&nbsp; 2. 提示保存成功后在尝试更新');
+        }
+        $_SESSION['upsys']['sysver'] = intval($matches[1]);
+        usleep(1000*300); //延迟300毫秒
+        msg(1,'success');
+    }
+    //下载更新包
+    if($_POST['i'] == 2){
         //设置执行最长时间，0为无限制。单位秒!
         set_time_limit(5*60);
         $overtime = !isset($GLOBALS['global_config']['Update_Overtime']) ? 3 : ($GLOBALS['global_config']['Update_Overtime'] < 3 || $GLOBALS['global_config']['Update_Overtime'] > 60 ? 3 : $GLOBALS['global_config']['Update_Overtime']);
         
-        //加载远程数据
-        $urls = [
-                "lm21" => "https://update.lm21.top/TwoNav/updata.json",
-                "gitee" => "https://gitee.com/tznb/twonav_updata/raw/master/updata.json"
-            ];
-        $Source = $GLOBALS['global_config']['Update_Source'] ?? '';
-        if (!empty($Source) && isset($urls[$Source])) {
-            $urls = [$Source => $urls[$Source]];
-        }
-            
-        foreach($urls as $key => $url){ 
-            $Res = ccurl($url,$overtime);
-            $data = json_decode($Res["content"], true);
-            if($data["code"] == 200 ){ //如果获取成功
-                break; //跳出循环.
-            } 
-        }
-    
+        //请求获取更新包
+        $node = intval($GLOBALS['global_config']['Update_Source']);
+        $Res = ccurl("http://service.twonav.cn/service.php",30,true,data_encryption('updateSystem',['node'=>$node]));
+        $data = json_decode($Res["content"], true);
+        
         if($data["code"] != '200'){
-            msg(-1,'获取更新信息失败,请稍后再试..');
+            msg(-1,$data['msg'] ?? '获取更新信息失败,请稍后再试..');
         }
         
-        foreach($data["data"] as $key){
-            if( $_SESSION['upsys']['sysver'] >= $key["low"]  && $_SESSION['upsys']['sysver'] <= $key["high"] &&  $key["update"] > $_SESSION['upsys']['sysver']){
-                $file = "System_Upgrade.tar.gz";
-                $filePath = "./data/temp/{$file}";
-                $data = $key;
-                break; //找到跳出
-            }
-        }
-        if(empty($file)){
-            msg(-1,'暂无可用更新');
-        }
+        $file = "System_Upgrade.tar.gz";
+        $filePath = "./data/temp/{$file}";
         
         //下载升级包
-        unlink($filePath);
-        foreach($data["url"] as $url){
-            if(downFile($url,$file,'./data/temp/')){
-                $file_md5 = md5_file($filePath);
-                if($file_md5 === $data['md5']){
-                    break; //下载成功,跳出循环
-                }else{
-                    unlink($filePath); //下载失败,删除文件
-                }
+        if(downFile($data['url'],$file,'./data/temp/')){
+            $file_md5 = md5_file($filePath);
+            if($file_md5 != $data['md5']){
+                unlink($filePath);
+                msg(-1,'更新包校验失败,请重试或联系客服');
             }
-        }
-        //检查下载结果
-        if(empty($file_md5) ){
+        }else{
             msg(-1,'下载更新包失败');
-        }elseif($file_md5 != $data['md5']){
-            msgA(['code'=>-1,'msg'=> '升级包效验失败','correct_md5'=> $data['md5'],'reality_md5'=>$file_md5]);
         }
-        //sleep(1);
         msg(1,'success');
     }
     
@@ -128,10 +104,11 @@ function other_upsys(){
     
     //检测是否需要更新数据库
     if($_POST['i'] == 4){
+        clean_cache();
         set_time_limit(5*60);
         try {
             //根据数据库类型扫描不同目录,并声明执行SQL语句的函数
-            if($GLOBALS['db_config']['type'] == 'mysql'){
+            if($GLOBALS['db_config']['type'] == 'mysql' || $GLOBALS['db_config']['type'] == 'mariadb'){
                 $dir = './system/MySQL';
                 function exe_sql($content) {
                     global $db;
@@ -199,6 +176,7 @@ function other_upsys(){
     msgA(['code'=>-1,'msg'=>'步骤错误']);
 }
 
+
 //读用户列表
 function read_user_list(){
     $query  = $_POST['query'];
@@ -258,252 +236,40 @@ function read_purview_list(){
 
 //读用户组列表
 function read_users_list(){
-    if(!is_subscribe('bool')){
-        msg(-1,'未检测到有效授权');
-    }
-    $purview_list = select_db('purview_list','name','');
-    $datas = select_db('user_group',['id','name','allow','code','codes','uname'],'');
-    foreach ($datas as $key => $data){
-        $datas[$key]['codes'] = unserialize($datas[$key]['codes']);
-        if(empty($datas[$key]['codes'])){
-            $datas[$key]['disable'] = $purview_list;//为空表示全部
-        }else{
-            $datas[$key]['disable'] = array_diff($purview_list,explode(",", $data['allow']));
-        }
-        
-        $datas[$key]['disable'] = implode(',',$datas[$key]['disable']); //数组转文本
-    }
-    msgA(['code'=>1,'msg'=>'获取成功','count'=>count($datas),'data'=>$datas]);
+    msg_tip();
 }
 
 //写用户组
 function write_users(){
     //验证代号是否合规
-    if(!preg_match('/^[A-Za-z0-9]+$/',$_POST['code'])){
-        msg(-1,'分组代号只能是字母和数字');
-    }elseif($_POST['code'] == 'root' || $_POST['code'] == 'default'){
-        msg(-1,'不能使用系统预设的代号');
-    }elseif(htmlspecialchars(trim($_POST['name'])) != $_POST['name']){
-        msg(-1,'分组名称不能含有特殊字符');
-    }
-    if(!is_subscribe('bool')){
-        msg(-1,'未检测到有效授权');
-    }
-    $USER = $_POST['uname'];
-    $USER_ID = '';
-    if(!empty($USER)){
-        $USER_ID = get_db("global_user", "ID", ["User"=>$USER]);
-        if(empty($USER_ID)){msg(-1,'蓝图用户不存在');}
-    }
-    
-    if($_GET['type'] == 'add'){
-        if(!empty(get_db('user_group','code',['code' => $_POST['code']]))){
-            msg(-1,'分组代号已存在');
-        }elseif(!empty(get_db('user_group','name',['name' => $_POST['name']]))){
-            msg(-1,'分组名称已存在');
-        }
-        
-        insert_db('user_group',["uname"=>$USER,"uid"=>$USER_ID,"code"=>$_POST['code'],"name"=>$_POST['name'],"allow"=>$_POST['allow_list'],"codes"=>json_decode($_POST['allow_code_list'])],[1,'添加成功']);
-    }elseif($_GET['type'] == 'edit'){
-        if(empty(get_db('user_group','code',['code' => $_POST['code']]))){ 
-            msg(-1,'此分组代号不存在');
-        }elseif(!empty(get_db('user_group','name',['name' => $_POST['name'],'code[!]'=>$_POST['code']]))){
-            msg(-1,'分组名称已存在');
-        }
-        update_db('user_group',["uname"=>$USER,"uid"=>$USER_ID,"name"=>$_POST['name'],'allow'=>$_POST['allow_list'],'codes'=>json_decode($_POST['allow_code_list']) ],['code'=>$_POST['code']],[1,'保存成功']);
-    }elseif($_GET['type'] == 'del'){
-        global $global_config;
-        if(!empty(get_db('global_user','ID',['UserGroup' => $_POST['code']]))){
-            msg(-1,'无法删除,有用户正在使用此用户组');
-        }elseif(!empty(get_db('regcode_list','regcode',['u_group' => $_POST['code']]))){
-            msg(-1,'无法删除,存在使用此用户组的注册码');
-        }elseif($global_config['default_UserGroup'] == $_POST['code']){
-            msg(-1,'无法删除,正在被使用:系统设置>默认分组');
-        }
-        delete_db('user_group',["code" => $_POST['code'] ],[1,'删除成功']);
-    }
+    msg_tip();
 }
 
 
 //写用户信息
 function write_user_info(){
-   switch ($_GET['type']) {
-    //删除
-    case "Del":
-        $uids = json_decode($_POST['ID']);
-        $USER_S = select_db('global_user','User',['ID'=>$uids]);
-        foreach($USER_S as $USER){
-            if(is_dir(DIR.'/data/user/'.$USER)){
-                deldir(DIR.'/data/user/'.$USER);
-                if(is_dir(DIR.'/data/user/'.$USER)){
-                    msg(1,'删除用户数据目录失败,用户名:'.$USER);
-                }
-            }
-            if(is_dir(DIR.'/data/backup/'.$USER)){
-                deldir(DIR.'/data/backup/'.$USER);
-                if(is_dir(DIR.'/data/backup/'.$USER)){
-                    msg(1,'删除用户备份目录失败,用户名:'.$USER);
-                }
-            }
-        }
-        foreach (['regcode_list','user_categorys','user_config','user_count','user_links','user_log','user_login_info'] as $table){
-            delete_db($table,[ "uid" => $uids ]);
-        }
-        delete_db('global_user',["ID" => $uids]);
-        msg(1,'删除成功');
-        break;
-    //设用户组
-    case "set_UserGroup":
-        if(empty($_POST['UserGroup'])){
-            msg(-1,'用户组不能为空');
-        }elseif(!in_array($_POST['UserGroup'],['default','root']) && empty(get_db('user_group','code',['code' => $_POST['UserGroup']]))){
-            msg(-1,'用户组不存在');
-        }
-        update_db('global_user',['UserGroup'=>$_POST['UserGroup']],["ID" => json_decode($_POST['ID']) ],[1,'修改成功']);
-        break;
-    //设密码
-    case "set_pwd":
-        if(!has_db('global_user',['ID'=>$_POST['ID']])){
-            msg(-1,'用户不存在!');
-        }
-        //空字符串md5 防止意外出现空密码
-        if( $_POST['new_pwd']== 'd41d8cd98f00b204e9800998ecf8427e'){
-            msg(-1,'密码不能为空');
-        }
-        $RegTime = get_db('global_user','RegTime',['ID'=>$_POST['ID']]);
-        update_db('global_user',['Password'=>Get_MD5_Password($_POST['new_pwd'],$RegTime)],["ID" => $_POST['ID'] ],[1,'修改成功']);
-        break;
-    //设邮箱
-    case "set_email":
-        if(!preg_match("/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/i",$_POST['new_email'])){
-            msg(-1,'邮箱错误!');
-        }
-        if(has_db('global_user',['Email'=>$_POST['new_email']])){
-            msg(-1,'邮箱已存在!');
-        }
-        update_db('global_user',['Email'=>$_POST['new_email']],["ID" => $_POST['ID'] ],[1,'修改成功']);
-        break;
-
-    default:
-        msg(-1,'操作类型错误');
-   }
+   msg_tip();
 }
 
 //读注册码列表
 function read_regcode_list(){
-    if(!is_subscribe('bool')){
-        msg(-1,'未检测到有效授权');
-    }
-    $page   = empty(intval($_REQUEST['page'])) ? 1 : intval($_REQUEST['page']);
-    $limit  = empty(intval($_REQUEST['limit'])) ? 50 : intval($_REQUEST['limit']);
-    $offset = ($page - 1) * $limit; //起始行号
-    $where = [];
-    
-    //统计条数
-    $count = count_db('regcode_list',$where);
-    //分页
-    $where['LIMIT'] = [$offset,$limit];
-    //排序
-    $where['ORDER']['id'] = 'DESC';
-    //查询
-    $datas = select_db('regcode_list','*',$where);
-    //用户组处理
-    if(!empty($datas)){
-       $user_group = select_db('user_group',['name','code'],'');//读用户组
-       $user_group = array_column($user_group, 'name', 'code');//以代号为键
-       $user_group['root'] = '站长';
-       $user_group['default'] = '默认';
-       foreach ($datas as $key => $data){
-           $datas[$key]['UserGroupName'] = $user_group[$data['u_group']]??'Null';
-       }
-    }
-    msgA(['code'=>1,'msg'=>'获取成功','count'=>$count,'data'=>$datas]);
+    msg_tip();
 }
 
 //写注册码
 function write_regcode(){
-    global $db;
-    if(!is_subscribe('bool')){
-        msg(-1,'未检测到有效授权');
-    }
-    if($_GET['type'] == 'generate'){
-        if(!in_array($_POST['group'] ,['default']) && empty(get_db('user_group','code',['code' => $_POST['group'] ]))){
-            msg(-1,'用户组不存在');
-        }
-        
-        $t = time();
-        for ($i=1; $i<=$_POST['number']??1; $i++){
-            if($_POST['regcode_length'] == 8){
-                $regcode = hash("crc32b",uniqid());
-            }elseif($_POST['regcode_length'] == 36){
-                $regcode = $db::raw("UUID()");
-            }else{
-                $regcode = md5(uniqid());
-            }
-            insert_db('regcode_list',["uid"=>UID,"regcode"=>$regcode,"u_group"=>$_POST['group'],"use_state"=>'未使用',"add_time"=>$t,"use_time"=>0]);
-        }
-        
-        msg(1,'注册码已生成');
-    }elseif($_GET['type'] == 'set'){
-        write_global_config('reg_tips',$_POST['content'],'注册提示');
-        msg(1,'保存成功');
-    }elseif($_GET['type'] == 'del'){
-        delete_db("regcode_list",[ "id" => json_decode($_POST['id'])]);
-        msg(1,'删除成功');
-    }
-    
-    msg(-1,'无效的请求类型');
+    msg_tip();
 }
 
-
-//写订阅信息
-function write_subscribe(){
-    global $USER_DB;
-    $data['order_id'] = htmlspecialchars( trim($_REQUEST['order_id']) ); //获取订单ID
-    $data['email'] = htmlspecialchars( trim($_REQUEST['email']) ); //获取邮箱
-    $data['end_time'] = htmlspecialchars( trim($_REQUEST['end_time']) );//到期时间
-    $data['domain'] = htmlspecialchars( trim($_REQUEST['domain']) );//支持域名
-    $data['host'] = $_SERVER['HTTP_HOST']; //当前域名
-    if(empty($data['order_id']) && empty($data['email']) && empty($data['end_time'])){
-        write_global_config('s_subscribe','','订阅信息');
-        msg(1,'清除成功');
-    }
-    if($data['end_time'] < time()){
-        msg(-1,"您的订阅已过期!");
-    }
-    //判断是否为IP
-    if(preg_match("/^(\d+\.\d+\.\d+\.\d+):*\d*$/",$data['host'],$host)) {
-        $data['host'] = $host[1]; //取出IP(不含端口)
-    }else{
-        $host = explode(".", $data['host']);
-        $count = count($host);
-        if($count != 2){
-            $data['host'] = $host[$count-2].'.'.$host[$count-1];
-            //如果存在端口则去除
-            if(preg_match("/(.+):\d+/",$data['host'],$host)) {
-                $data['host'] = $host[1];
-            }
-        }
-    }
-
-    if(stristr($data['domain'],$data['host'])){
-        write_global_config('s_subscribe',$data,'订阅信息');
-        msg(1,'保存成功');
-    }else{
-        msg(-1,"您的订阅不支持当前域名 >> ".$_SERVER['HTTP_HOST']);
-    }
-}
-
-
 // 写系统设置
 function write_sys_settings(){
     global $USER_DB;
     if($_POST['Login'] == $_POST['Register']){
         msg(-1,'注册入口名不能和登录入口名相同');
     }elseif(!preg_match("/^[a-zA-Z0-9]+$/",$_POST['Register'])){ 
-         msg(-1,'注册入口错误,仅允许使用字母和数字');
+        msg(-1,'注册入口错误,仅允许使用字母和数字');
     }elseif(!preg_match("/^[a-zA-Z0-9]+$/",$_POST['Login'])){ 
-         msg(-1,'登陆入口错误,仅允许使用字母和数字');
+        msg(-1,'登陆入口错误,仅允许使用字母和数字');
     }elseif(empty($_POST['Default_User']) || !get_db("global_user", "User", [ "User"=>$_POST['Default_User'] ]) ){
         msg(-1,'默认账号不存在');
     }elseif(!empty($_POST['default_UserGroup']) && empty(get_db('user_group','code',['code' => $_POST['default_UserGroup']]))){
@@ -520,6 +286,14 @@ function write_sys_settings(){
         }
     }
     
+    //自定义登录入口和注册入口检测
+    $prohibits = ['admin','click','api','ico','icon','verify','apply','guestbook','article','sitemap'];
+    if(in_array($_POST['Login'],$prohibits)){
+        msg(-1,'此登录入口名已被系统使用');
+    }
+    if(in_array($_POST['Register'],$prohibits)){
+        msg(-1,'此注册入口名已被系统使用');
+    }
     //长度限制
     foreach (['c_name','c_desc','l_name','l_url','l_key','l_desc'] as $name){
         $length_limit[$name] = is_subscribe('bool') ? intval($_POST[$name]) : 0;
@@ -543,11 +317,11 @@ function write_sys_settings(){
         'Sub_domain'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'二级域名参数错误'],
         'Privacy'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'强制私有参数错误'],
         'default_page'=>['int'=>true,'min'=>0,'max'=>2,'msg'=>'默认页面参数错误'],
-        'copyright'=>['empty'=>true],
         'global_header'=>['empty'=>true],
         'global_footer'=>['empty'=>true],
         'api_extend'=>['empty'=>true],
         'c_code'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'自定义代码参数错误'],
+        'static_link'=>['int'=>true,'min'=>0,'max'=>2,'msg'=>'静态链接参数错误'],
         //更新设置
         'Update_Source'=>['empty'=>true],
         'Update_Overtime'=>['int'=>true,'min'=>3,'max'=>60,'msg'=>'资源超时参数错误'],
@@ -555,7 +329,7 @@ function write_sys_settings(){
         'apply'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'收录管理参数错误'],
         'guestbook'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'留言管理参数错误'],
         'link_extend'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'链接扩展参数错误'],
-        'article'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'文章管理参数错误']
+        'article'=>['int'=>true,'min'=>0,'max'=>2,'msg'=>'文章管理参数错误']
         ];
     $o_config = [];
     foreach ($datas as $key => $data){
@@ -577,87 +351,14 @@ function write_sys_settings(){
         if($_POST['guestbook'] == 1){$o_config['guestbook'] = 0;$filter = true;}
         if($_POST['link_extend'] == 1){$o_config['link_extend'] = 0;$filter = true;}
         if($_POST['article'] == 1){$o_config['article'] = 0;$filter = true;}
+        if($_POST['static_link'] == 1){$o_config['static_link'] = 0;$filter = true;}
     }
-    //检测于下载文章管理依赖资源
-    clearstatcache();
-    if($o_config['article'] == 1 && ( !is_file('./static/wangEditor/wangEditor.js') || !is_file('./static/wangEditor/wangEditor.css'))){
-        $filePath = "./data/temp/wangEdito.tar.gz";
-        if(downFile('https://update.lm21.top/TwoNav/updata/wangEdito.tar.gz','wangEdito.tar.gz','./data/temp/')){
-            $file_md5 = md5_file($filePath);
-            if($file_md5 != "95f830656ba8972cca39a1ddd6ebaeda"){
-                unlink($filePath); 
-                msg(-1,'效验wangEdito失败<br/>!');
-            }
-        }else{
-            msg(-1,'下载wangEdito失败,请重试!<br/>如需手动安装可联系技术支持!');
-        }
-        try {
-            $phar = new PharData($filePath);
-            $phar->extractTo('./static/', null, true);
-            unlink($filePath);
-            clearstatcache();
-        } catch (Exception $e) {
-            msg(-1,'安装wangEdito失败');
-        }
-    }
-
     update_db("global_config", ["v" => $o_config], ["k" => "o_config"],[1,($filter ?"保存成功,未检测到有效授权,带*号的配置无法为你保存":"保存成功")]);
 }
 
 //写默认设置
 function write_default_settings(){ 
-    global $USER_DB;
-    if(!is_subscribe('bool')){
-        msg(-1,'未检测到有效授权');
-    }
-    if(intval($_POST['Session']) > 0 && intval($_POST['KeyClear']) > intval($_POST['Session'])){
-        msg(-1,'Key清理时间不能大于登录保持时间');
-    }
-    // 安全配置(登录配置)
-    $datas = [
-        'Session'=>['int'=>true,'min'=>0,'max'=>360,'msg'=>'登录保持参数错误'],
-        '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模式参数错误'],
-        'login_page'=>['v'=>['admin','index','auto'],'msg'=>'登录成功参数错误']
-        ];
-    foreach ($datas as $key => $data){
-        if($data['int']){
-            $LoginConfig[$key] = ($_POST[$key] >= $data['min'] && $_POST[$key] <= $data['max'])?intval($_POST[$key]):msg(-1,$data['msg']);
-        }elseif(isset($data['v'])){
-            $LoginConfig[$key] = in_array($_POST[$key],$data['v']) ? $_POST[$key]:msg(-1,$data['msg']);
-        }else{
-            $LoginConfig[$key] = $data['empty']?$_POST[$key]:(!empty($_POST[$key])?$_POST[$key]:msg(-1,$data['msg']));
-        }
-    }
-    $LoginConfig['Login'] = '0';
-    $LoginConfig['Password2'] = '';
-    update_db("global_config",["v"=>$LoginConfig],["k"=>'LoginConfig']);
-    
-    //站点配置
-    $datas = [
-        'title'=>['empty'=>false,'msg'=>'主标题不能为空'],
-        'subtitle'=>['empty'=>true],
-        'logo'=>['empty'=>true],
-        'keywords'=>['empty'=>true],
-        'description'=>['empty'=>true],
-        'link_model'=>['v'=>['direct','Privacy','302','Transition'],'msg'=>'链接模式参数错误'],
-        'link_icon'=>['int'=>true,'min'=>0,'max'=>6,'msg'=>'链接图标参数错误'],
-        'custom_header'=>['empty'=>true],
-        'custom_footer'=>['empty'=>true]
-        ];
-    $s_site = [];
-    foreach ($datas as $key => $data){
-        if($data['int']){
-            $s_site[$key] = ($_POST[$key] >= $data['min'] && $_POST[$key] <= $data['max'])?intval($_POST[$key]):msg(-1,$data['msg']);
-        }elseif(isset($data['v'])){
-            $s_site[$key] = in_array($_POST[$key],$data['v']) ? $_POST[$key]:msg(-1,$data['msg']);
-        }else{
-            $s_site[$key] = $data['empty']?$_POST[$key]:(!empty($_POST[$key])?$_POST[$key]:msg(-1,$data['msg']));
-        }
-    }
-    update_db("global_config",["v"=>$s_site],["k"=>'s_site'],[1,'保存成功']);
+    msg_tip();
 }
 //读日志
 function read_log(){
@@ -701,6 +402,7 @@ function other_root(){
         delfile($dir,30);
         $size = $_SESSION['CleanCacheSize'];
         unset($_SESSION['CleanCacheSize']);
+        clean_cache();
         if($size == 0){
             msg(1,'暂无可清理缓存');
         }
@@ -712,54 +414,13 @@ function other_root(){
         $data = get_db("global_config", "v", ["k" => "username_retain"]);
         msgA(['code'=>1,'msg'=>'获取成功','data'=>$data]);
     }elseif($_GET['type'] == 'write_username_retain'){
-        //遍历检测语法
-        $patterns = explode("\n",$_POST['username_retain']);
-        foreach($patterns as $pattern){
-            if (@preg_match($pattern, '') === false) {
-                msg(-1,'正则表达式语法错误,请检查');
-            }
-        }
-        if(!is_subscribe('bool')){
-            msg(-1,'未检测到有效授权');
-        }
-        write_global_config('username_retain',$_POST['username_retain'],'账号保留');
-        msg(1,'保存成功');
+        msg_tip();
     }elseif($_GET['type'] == 'write_mail_config'){
-        if($GLOBALS['global_config']['offline'] == '1'){msg(-1,"离线模式无法使用此功能");}
-        if(!is_subscribe('bool')){msg(-1,"未检测到有效授权,无法使用该功能!");}
-        //检测PHPMailer是否存在
-        clearstatcache();
-        if(!is_file(DIR.'/system/PHPMailer/PHPMailer.php')){
-            $filePath = "./data/temp/PHPMailer_6.8.0.tar.gz";
-            if(downFile('https://update.lm21.top/TwoNav/updata/PHPMailer_6.8.0.tar.gz','PHPMailer_6.8.0.tar.gz','./data/temp/')){
-                $file_md5 = md5_file($filePath);
-                if($file_md5 != "07251997fb7ebf3bf2d296d4214ccf0a"){
-                    unlink($filePath); 
-                    msg(-1,'效验PHPMailer失败<br/>!');
-                }
-            }else{
-                msg(-1,'下载PHPMailer失败,请重试!<br/>如需手动安装可联系技术支持!');
-            }
-            try {
-                $phar = new PharData($filePath);
-                $phar->extractTo('./system/', null, true);
-                unlink($filePath);
-                clearstatcache();
-            } catch (Exception $e) {
-                msg(-1,'安装PHPMailer失败');
-            }
-        }
-        write_global_config('mail_config',$_POST,'账号保留');
-        msg(1,'保存成功');
+        msg_tip();
     }elseif($_GET['type'] == 'write_mail_test'){
-        $_POST['Subject'] = 'TwoNav 测试邮件' . time();
-        $_POST['Body'] = '<h1>TwoNav 测试邮件</h1>' . date('Y-m-d H:i:s');
-        send_email($_POST);
+        msg_tip();
     }elseif($_GET['type'] == 'write_icon_config'){
-        if($GLOBALS['global_config']['offline'] == '1'){msg(-1,"离线模式无法使用此功能");}
-        if(!is_subscribe('bool')){msg(-1,"未检测到有效授权,无法使用该功能!");}
-        write_global_config('icon_config',$_POST,'图标配置');
-        msg(1,'保存成功');
+        msg_tip();
     }elseif($_GET['type'] == 'write_icon_del_cache'){
         //删除数据库缓存信息
         if(empty(count_db('global_icon','*'))){
@@ -779,7 +440,112 @@ function other_root(){
         }
         
         msg(1,'操作成功');
+    }elseif($_GET['type'] == 'write_sitemap_config'){
+        msg_tip();
     }
 }
 
+// 通用类请求官方服务器
+function other_services(){
+    // 生成请求数据
+    $domain = preg_replace('/:\d+$/','',$_SERVER['HTTP_HOST']);
+    $post = [
+        'domain'   => $domain,
+        'referer'  => isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : "",
+        'email'    => isset($_POST['email']) ? $_POST['email'] : "",
+        'order_id' => isset($_POST['order_id']) ? $_POST['order_id'] : "",
+        'sysver'   => SysVer,
+        'ip'       => Get_IP(),
+        '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']);
+    // 判断操作类型
+    if($_GET['type'] == 'query_key' || $_GET['type'] == 'save_key'){
+        $Res = ccurl("http://service.twonav.cn/service.php",$overtime,true,$post);
+        if($Res['code'] != 200){
+            msg(-1,'请求官方服务器失败,请稍后再试');
+        }
+        $data = json_decode($Res["content"], true);
+        $msg = $data['msg'];
+        // 如果是保存设置
+        if($_GET['type'] == 'save_key'){
+            $data = $data['data'];
+            if(!isset($data['order_id']) || empty($data['order_id'])){
+                msg(-1,empty($msg) ? '保存失败,请核对信息是否有误<br />' : $msg);
+            }
+            //判断是否为IP
+            if(preg_match("/^(\d+\.\d+\.\d+\.\d+):*\d*$/",$domain,$host)) {
+                $data['host'] = $host[1]; //取出IP(不含端口)
+            }else{
+                $host = explode(".", $domain);
+                $count = count($host);
+                if($count != 2){
+                    $data['host'] = $host[$count-2].'.'.$host[$count-1];
+                    //如果存在端口则去除
+                    if(preg_match("/(.+):\d+/",$data['host'],$host)) {
+                        $data['host'] = $host[1];
+                    }
+                }
+            }
+            write_global_config('s_subscribe',$data,'订阅信息');
+            clean_cache();
+            msgA(['code'=>200,'msg'=>'保存成功','data'=>['order_id'=>$data['order_id'],'end_time'=>$data['end_time'],'type_name'=>$data['type_name']]]);
+        }
+        msgA($data);
+    }elseif($_GET['type'] == 'del_key'){
+        $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); 
+        if(!isset($subscribe['order_id']) || empty($subscribe['order_id'])){
+            msg(200,'清除成功');
+        }
+        ccurl("http://service.twonav.cn/service.php",$overtime,true,$post);
+        write_global_config('s_subscribe','','订阅信息');
+        clean_cache();
+        msg(200,'删除成功');
+    }elseif($_GET['type'] == 'validate'){
+        $Res = ccurl("http://service.twonav.cn/service.php",$overtime,true,data_encryption('validate'));
+        $data = json_decode($Res["content"], true);
+        if($data["code"] != '200'){
+            msg(-1,$data['msg'] ?? '验证失败');
+        }
+        msgA($data);
+    }elseif($_GET['type'] == 'get_notice'){
+        //读取缓存数据
+        $Notice = get_db('global_config','v',['k'=>'notice']);$data=[];
+        //如果不为空,则解析数据
+        if(!empty($Notice)){
+            $data = json_decode($Notice, true);
+            $cache_time = Debug ? 0 : 60; //缓存时间(秒);
+            $reload = time() > $data["download_time"] + $cache_time; //是否更新
+        }else{
+            $reload = true; //需要刷新
+        }
+        if($GLOBALS['global_config']['offline'] == '1'){
+            msgA(['code'=>200,'message'=>"已开启离线模式,无法获取最新动态/官方公告/下载模板/更新系统等。"]);
+        }
+        // 判断是否刷新数据
+        if(!$global_config['offline'] && $reload){
+            if(is_subscribe('bool')){
+                $Res = ccurl('http://service.twonav.cn/service.php',$overtime,true,data_encryption('get_new_ver',['ver'=>SysVer]));
+            }else{
+                $Res = ccurl('http://tznb.gitee.io/twonav_resource/Notice.json',$overtime);
+            }
+            $new_data = json_decode($Res['content'], true);
+            if($new_data["code"] == 200 ){
+                $new_data['download_time'] = time();
+                $new_data['version'] = version_compare($new_data['version'],SysVer,'<') ? SysVer : $new_data['version'];
+                write_global_config('notice',json_encode($new_data),'官方公告(缓存)');
+                write_global_config('sys_switch',"{$new_data['sys_switch']}",'sys_switch');
+                $data = $new_data;
+            }
+        }
+        //时间检测
+        if(isset($_GET['t']) && !empty($_GET['t'])){
+            if (abs( time() - $_GET['t'] ) > 300) {
+                $data['message'] .= "<br /><span style=\"color: #ff5722;\" >检测到客户端时间与服务器时间存在较大差异<br />这会导致部分功能无法正常使用<br />请及时校对服务器或客户端时间</span>";
+            }
+        }
+        msgA($data);
+    }
+}
 

system/auth.php

@@ -0,0 +1,90 @@
+<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
+// 鉴权接口: 账号登录
+
+//忽略GET/POST以外的请求
+if(!in_array($_SERVER['REQUEST_METHOD'],['GET','POST'])){
+    exit;
+}
+if(!isset($auth_mode)){
+    $auth_mode = $_GET['mode'];
+}
+
+//账号登录
+if($auth_mode == 'uname'){
+    $username = $_POST['username'];
+    $password = $_POST['password'];
+    $log = ["uid" => '',"user"=>$username,"ip"=>Get_IP(),"time"=>time(),"type" => 'login',"content"=>Get_Request_Content(),"description"=>""];
+    //密码长度
+    if(strlen($password)!==32){
+        $log['description'] = '请求登录>密码错误(长度应该是32位的MD5)';
+        insert_db("user_log",$log);
+        msg(-1,'账号或密码错误');
+    }
+    //浏览器UA
+    if(strlen($_SERVER['HTTP_USER_AGENT']) > 1024){
+        $log['description'] = '请求登录>浏览器UA长度>1024';
+        insert_db("user_log",$log);
+        msg(-1,"浏览器UA长度异常,请更换浏览器!");
+    }
+    //读取资料
+    $USER_DB = get_db("global_user", "*", ["OR"=>['User'=>$username,'Email'=>$username]]);
+    if(empty($USER_DB)){
+        $log['description'] = '请求登录>账号不存在';
+        insert_db("user_log",$log);
+        msg(-1,'账号不存在');
+    }
+    $log['uid'] = $USER_DB['ID'];
+    //登录入口
+    session_start();
+    if($_SESSION['login'] != $global_config["Login"] && $_SESSION['login'] != $USER_DB['Login'] ){
+        $log['description'] = '请求登录>登录入口错误';
+        insert_db("user_log",$log);
+        msg(-1,"请求失败,请刷新登录页面再试");
+    }
+    //双重验证
+    $LoginConfig = unserialize( $USER_DB['LoginConfig'] );
+    if(!empty($LoginConfig['totp_key'])){
+        if(empty($_POST['otp_code'])){
+            msgA(['code'=>2]);
+        }
+        require DIR . '/system/Authenticator.php';
+        $totp = new PHPGangsta_GoogleAuthenticator();
+        $checkResult = $totp->verifyCode($LoginConfig['totp_key'], $_POST['otp_code'], 2);
+        if(!$checkResult){
+            $log['description'] = '请求登录>动态口令错误';
+            insert_db("user_log",$log);
+            msgA(['code'=>-1,'msg'=>'动态口令错误']);
+        }
+    }
+    //验证密码
+    if(Get_MD5_Password($password,$USER_DB["RegTime"]) === $USER_DB["Password"]){
+        $log['description'] = '请求登录>登录成功';
+        insert_db("user_log",$log);
+        //保持登录
+        $keep_login = isset($_POST['keep']) && $_POST['keep'] == 'on';
+        if($keep_login == true){
+            $LoginConfig['Session'] = ($LoginConfig['Session'] > 0 ? $LoginConfig['Session'] : 7 );
+        }else{
+            $LoginConfig['Session'] = 0;
+        }
+        $USER_DB['LoginConfig'] = serialize($LoginConfig);
+        //设置Cookie
+        Set_key($USER_DB);
+        if(empty($LoginConfig['login_page']) || $LoginConfig['login_page'] == 'admin'){
+            $url = "./?c=admin&u={$USER_DB['User']}";
+        }elseif($LoginConfig['login_page'] == 'index'){
+            $url = "./?c=index&u={$USER_DB['User']}";
+        }else{
+            $url = preg_match('/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i',$_SERVER['HTTP_USER_AGENT']) ? "./?c=index&u={$USER_DB['User']}" : "./?c=admin&u={$USER_DB['User']}";
+        }
+        //默认页面
+        if(!empty($global_config['default_page'])){
+            setcookie('Default_User', $USER_DB['User'], strtotime("+360 day"),"/",'',false,false);
+        }
+        msgA(['code'=>1,'msg'=>'登录成功','url'=>$url]);
+    }else{
+        $log['description'] = '请求登录>账户或密码错误';
+        insert_db("user_log",$log);
+        msg(-1,"账户或密码错误");
+    }
+}

system/click.php

@@ -4,7 +4,7 @@ $id = intval($_GET['id']);
 //IP数统计
 count_ip();
 //如果id为空,则显示404
-if(empty($id)){Not_Found();}
+if(empty($id)) Not_Found();
 
 //查询链接信息
 $where['lid'] = $id;
@@ -13,18 +13,7 @@ $where['status'] = 1;
 $link = get_db('user_links','*',$where);
 
 //查找失败时显示404
-if(empty($link)){Not_Found();}
-
-//站点设置和站点图标
-$site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
-$site['Title']  =  $site['title'].(empty($site['subtitle'])?'':' - '.$site['subtitle']);
-//免费用户请保留版权,谢谢!
-$copyright = empty($global_config['copyright'])?'<a target="_blank" href="https://gitee.com/tznb/TwoNav">Copyright © TwoNav</a>':$global_config['copyright'];
-$ICP = empty($global_config['ICP'])?'':'<a target="_blank" href="https://beian.miit.gov.cn">'.$global_config['ICP'].'</a>';
-$favicon = ( !empty($site['site_icon_file'])) ? $site['site_icon'] : './favicon.ico';
-
-//取登录状态
-$is_login = is_login();
+if(empty($link)) Not_Found();
 
 //取父分类和祖分类信息
 $info_c = ['cid','fid','property','status','pid'];
@@ -66,68 +55,16 @@ if(!$is_login){
     if($category_ancestor['property'] == 1 && !$pv){
         exit('很抱歉,页面所属的祖分类是私有的!您无权限查看,如果您是管理员,请先登录!');
     }
-    
-    //判断链接是否加密
-    if(!empty($link['pid'])){
-        $verify_type = 'link_pwd';
-        $password = get_db('user_pwd_group','password',['uid'=>UID,'pid'=>$link['pid']]);
-        if($_SESSION['verify']['link'][$link['lid']] != $password){
-            require DIR.'/templates/admin/other/verify_link_pwd.php';
-            exit();
-        }
-    }
-    //判断父分类是否加密
-    if(empty($link['pid']) && !empty($category_parent['pid'])){
-        $verify_type = 'category_pwd';
-        $password = get_db('user_pwd_group','password',['uid'=>UID,'pid'=>$category_parent['pid']]);
-        if($_SESSION['verify']['category'][$category_parent['cid']] != $password){
-            require DIR.'/templates/admin/other/verify_link_pwd.php';
-            exit();
-        }
-    }
-    //判断祖分类是否加密
-    if(empty($link['pid']) && empty($category_parent['pid']) && !empty($category_ancestor['pid'])){
-        $verify_type = 'category_pwd';
-        $password = get_db('user_pwd_group','password',['uid'=>UID,'pid'=>$category_ancestor['pid']]);
-        if($_SESSION['verify']['category'][$category_ancestor['cid']] != $password){
-            require DIR.'/templates/admin/other/verify_link_pwd.php';
-            exit();
-        }
-    }
 }
 
-//取模板信息
-require DIR ."/system/templates.php";
-$dir_path = DIR.'/templates/transit/'.$s_templates['transit'];
-$theme_dir = str_replace(DIR.'/templates/transit',"./templates/transit",$dir_path);
-$transit_path = $dir_path.'/index.php';
-//检查是否存在,不存在则使用默认
-if(!is_file($transit_path)){
-    $transit_path= DIR.'/templates/transit/default/index.php';
-}
 
 //统计点击数
 write_user_count(date('Ym'),'click_Ym');
 write_user_count(date('Ymd'),'click_Ymd');
 update_db("user_links", ["click[+]"=>1],['uid'=>UID,'lid'=>$id]);
 
-
-
-//读取用户主题配置
-$theme_config_db = unserialize(get_db('user_config','v',['t'=>'theme_transit','k'=>$s_templates['transit'],'uid'=>UID]));
-
-//读取默认主题配置
-$theme_info = json_decode(@file_get_contents($dir_path.'/info.json'),true);
-$theme_config = empty($theme_info['config']) ? []:$theme_info['config'];
-$theme_ver = !Debug?$theme_info['version']:$theme_info['version'].'.'.time();
-
-//合并配置数据
-$theme_config = empty($theme_config_db) ? $theme_config : array_merge ($theme_config??[],$theme_config_db??[]);
-
-//如果主题信息声明支持扩展字段
-if($global_config['link_extend'] == 1 && check_purview('link_extend',1) && in_array($theme_info['support']['link_extend'],["true","1"])){
-    $extend = empty($link['extend']) ? [] : unserialize($link['extend']);
-}
+//通用数据初始化
+require DIR."/system/templates.php";
 
 //载入过渡页设置
 $transition_page = unserialize(get_db("user_config", "v", ["uid"=>UID,"k"=>"s_transition_page"]));
@@ -149,16 +86,18 @@ if(!empty($link['url_standby']) || $site['link_model'] == 'Transition'){
 if(!empty($link['url_standby'])) {
     $link['url_standby'] = unserialize($link['url_standby']);
     //主链优先模式
-    if(!empty($site['main_link_priority']) && $site['link_model'] != 'Transition'){
+    if($site['main_link_priority'] == '3'){
+        $site['link_model'] =  $site['link_model'] == 'direct' ? '302' : $site['link_model'];
+    }elseif($site['main_link_priority'] > 0 && $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;
+            require $index_path;
             exit;
         }
     }else{
-        require $transit_path;
+        require $index_path;
         exit;
     }
 }
@@ -173,9 +112,11 @@ if ($site['link_model'] == '302'){ //302重定向(临时)
     exit;
 }elseif($site['link_model'] == 'Privacy'){ //隐私保护_header
     header("Content-type: text/html; charset=utf-8"); 
+    if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $link['url']) > 0){
+        exit ('<html lang="zh-ch"><head><title>正在保护您的隐私..</title><meta name="referrer" content="same-origin"><script>window.location.href="'.$link['url'].'"</script></head>');
+    }
     header("Refresh:0;url=".$link['url']);
-    echo '<html lang="zh-ch"><head><title>正在保护您的隐私..</title><meta name="referrer" content="same-origin"></head>';
-    exit;
+    exit ('<html lang="zh-ch"><head><title>正在保护您的隐私..</title><meta name="referrer" content="same-origin"></head>');
 }elseif($site['link_model'] == 'Privacy_js'){ //隐私保护_js
     header("Content-type: text/html; charset=utf-8");
     echo '<html lang="zh-ch"><head><title>正在保护您的隐私..</title><meta name="referrer" content="same-origin"><script>window.location.href="'.$link['url'].'"</script></head>';
@@ -185,11 +126,6 @@ if ($site['link_model'] == '302'){ //302重定向(临时)
     echo '<html lang="zh-ch"><head><title>正在保护您的隐私..</title><meta name="referrer" content="same-origin"><meta http-equiv="refresh" content="0;url='.$link['url'].'"></head>';
     exit;
 }else{ //Transition 过渡页
-    require $transit_path;
+    require $index_path;
     exit;
 }
-
-//返回404
-function Not_Found() {
-    header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;
-}

system/expand/apply.php

@@ -1,132 +1,11 @@
 <?php 
-$apply = $global_config['apply'];
-// 如果管理了收录功能则返回404
-if ($apply != 1 ){
-    load_tip();
-    header('HTTP/1.1 404 Not Found');
-    header("status: 404 Not Found");
-    exit;
-}
-$apply = unserialize( get_db("user_config", "v", ["k" => "apply","uid"=>UID]));
-// 用户关闭收录申请
-if ( $apply['apply'] == 0 ){
-    if($_SERVER['REQUEST_METHOD'] === 'GET'){
-        load_tip();
-    }else{
-        msg(-1,"用户已关闭收录申请");
-    }
-}
+
 //get请求载入页面
 if($_SERVER['REQUEST_METHOD'] === 'GET'){
-    require DIR.'/templates/admin/page/expand/apply-user.php';
-    exit;
-}
-//载入提示页
-function load_tip() {
-    $content = '站长或用户未开启申请收录功能';
-    require DIR.'/templates/admin/page/404.php';
+    require DIR."/system/templates.php";
+    require($index_path);
     exit;
 }
 
-//强制加载防火墙来过滤相关攻击!
-$global_config['XSS_WAF'] = 1; $global_config['SQL_WAF'] = 1; 
-require DIR.'/system/firewall.php';
-
-// 遍历请求表单,拦截可疑内容!
-foreach($_POST as $key =>$value){
-    if( htmlspecialchars($value,ENT_QUOTES) != $value ){
-        msg(-1,$key.' > 请避免使用<\'&">单引号,双引号等特殊字符!');
-    }elseif( strlen($value) >= 256 ){
-        msg(-1,$key.' > 字符串长度不允许超过256');
-    }
-}
-
-
-$title = $_POST['title'];
-$url =  $_POST['url'];
-$iconurl = $_POST['iconurl'] ?? '';
-$description = $_POST['description'] ?? '';
-$category_id = intval ($_POST['category_id']);
-$email = $_POST['email'] ?? '';
-$user_ip = Get_IP();
-if( !filter_var($url, FILTER_VALIDATE_URL) ) {
-    msg(-1,'URL无效!');
-}elseif(!empty($apply['iconurl'])  && !filter_var($iconurl, FILTER_VALIDATE_URL) ){
-    msg(-1,'网站图标无效!');
-}elseif(!empty($apply['email']) && !preg_match('/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/',$email)){
-    msg(-1,'联系邮箱无效!');
-}elseif(!isset($_POST['category_id'])){
-    msg(-1,'分类ID不能为空!');
-}elseif(!isset($_POST['title'])){
-    msg(-1,'网站标题不能为空!');
-}elseif(!empty($apply['description']) && empty($_POST['description'])){
-    msg(-1,'网站描述不能为空!');
-}
-//获取和检查分类信息
-$where['cid'] = $category_id;
-$where['uid'] = UID;
-$category_info = get_db('user_categorys',['cid','fid','property','name','font_icon','description'],$where);
-if(empty($category_info) || $category_info['property'] != 0){
-    msgA(['code'=>-1,'msg'=>'没有找到分类信息']);
-}
-
-//检查是否重复
-$url_data  = get_db("user_apply","*",["url"=> $url,'uid'=>UID ]);
-if(isset($url_data['id'])){
-    if ($url_data['state'] == 0){
-        msg(-1,'审核中,请勿重复提交!');
-    }elseif ($url_data['state'] == 1 || $url_data['state'] == 3 ){
-        msg(-1,'已通过,请勿重复提交!');
-    }elseif ($url_data['state'] == 2){
-        msg(-1,'已拒绝,请勿重复提交!');
-    }
-}
-
-// 统计IP 24小时内提交的数量!,超限则拦截!
-$count = count_db("user_apply", ["uid"=>UID , "ip" => $user_ip ,"time[>]" => time() - 60*60*24]);
-if ($count >= $apply['submit_limit'] ?? 5){
-    msg(-1,'您提交的申请数量已达到上限!请明天再试!');
-}
-
-
-$data = [
-    'uid'           =>  UID,
-    'iconurl'       =>  $iconurl,
-    'title'         =>  $title,
-    'url'           =>  $url,
-    'email'         =>  $email,
-    'ip'            =>  $user_ip,
-    'ua'            =>  $_SERVER['HTTP_USER_AGENT'],
-    'time'          =>  time(),
-    'state'         =>  0, // 0.待审核 1.手动通过 2.已拒绝 3.自动通过
-    'category_id'   =>  $category_id,
-    'category_name' =>  $category_info['name'],
-    'description'   =>  $description
-];
-
-//0.关闭 1.开启 2.无需审核
-if($apply['apply'] == 1){
-    $data['state'] = 0 ;
-}elseif($apply['apply'] == 2){
-    $data['state'] = 3 ;
-    if(!empty(get_db("user_links","*",["url"=> $url,'uid'=>UID ]))){
-        msg(-1,'URL已经存在！'); //存在于链接列表中!
-    }
-    $lid = get_maxid('link_id');
-    $url_data = [
-        'lid'           =>  $lid,
-        'uid'           =>  UID,
-        'fid'           =>  $category_id,
-        'title'         =>  $title,
-        'url'           =>  $url,
-        'description'   =>  $description,
-        'add_time'      =>  time(),
-        'up_time'       =>  time(),
-        'weight'        =>  0,
-        'property'      =>  0,
-        'icon'       =>  $iconurl
-    ];
-    insert_db('user_links',$url_data);
-}
-insert_db('user_apply',$data,[1,'提交成功!']);
+msg(-1,'免费版不支持此功能');
 ?>

system/expand/article.php

@@ -1,65 +1,3 @@
 <?php if(!defined('DIR')){Not_Found();}AccessControl();
-if($global_config['article'] == 0 | !check_purview('article',1)){ 
-    Not_Found();
-}
 
-$id = intval($_GET['id']);
-//IP数统计
-count_ip();
-//如果id为空,则显示404
-if(empty($id)){Not_Found();}
-
-//查询文章
-$where['uid'] = UID;
-if(!is_login()){
-    $where['state'] = 1; //状态筛选
-}
-$where['id'] = $id;
-$data = get_db('user_article_list','*',$where);
-
-//查找失败时显示404
-if(empty($data)){Not_Found();}
-
-//var_dump($data);
-//exit;
-//站点设置和站点图标
-$site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
-$site['Title']  =  $site['title'].(empty($site['subtitle'])?'':' - '.$site['subtitle']);
-//免费用户请保留版权,谢谢!
-$copyright = empty($global_config['copyright'])?'<a target="_blank" href="https://gitee.com/tznb/TwoNav">Copyright © TwoNav</a>':$global_config['copyright'];
-$ICP = empty($global_config['ICP'])?'':'<a target="_blank" href="https://beian.miit.gov.cn">'.$global_config['ICP'].'</a>';
-$favicon = ( !empty($site['site_icon_file'])) ? $site['site_icon'] : './favicon.ico';
-
-
-//取模板信息
-require DIR ."/system/templates.php";
-$dir_path = DIR.'/templates/article/'.$s_templates['article'];
-$theme_dir = str_replace(DIR.'/templates/article',"./templates/article",$dir_path);
-$path = $dir_path.'/index.php';
-//检查是否存在,不存在则使用默认
-if(!is_file($path)){
-    $path= DIR.'/templates/article/default/index.php';
-    $theme_dir = './templates/article/default';
-}
-
-//统计点击数
-update_db("user_article_list", ["browse_count[+]"=>1],['uid'=>UID,'id'=>$id]);
-
-//读取用户主题配置
-$theme_config_db = unserialize(get_db('user_config','v',['t'=>'theme_article','k'=>$s_templates['article'],'uid'=>UID]));
-
-//读取默认主题配置
-$theme_info = json_decode(@file_get_contents($theme_dir.'/info.json'),true);
-$theme_config = empty($theme_info['config']) ? []:$theme_info['config'];
-$theme_ver = !Debug?$theme_info['version']:$theme_info['version'].'.'.time();
-
-//合并配置数据
-$theme_config = empty($theme_config_db) ? $theme_config : array_merge ($theme_config??[],$theme_config_db??[]);
-
-require $path;
-exit;
-
-//返回404
-function Not_Found() {
-    header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;
-}
+exit('免费版不支持此功能');

system/expand/guestbook.php

@@ -1,71 +1,11 @@
 <?php 
-if($global_config['guestbook'] != 1 || !check_purview('guestbook',1)){
-    require DIR.'/templates/admin/page/404.php';
-    exit;
-}
-
-$s = unserialize( get_db("user_config", "v", ["k" => "guestbook","uid"=>UID]) );
-if(empty($s) || $s['allow'] != 1){
-    $content = '站点已设置禁止留言';
-    require DIR.'/templates/admin/page/404.php';
-    exit;
-}
-if(!Check_Path("data/user/{$u}/MessageBoard")){
-    exit("<h2>创建目录失败,请检查权限</h2>");
-}
 
 //POST提交留言
 if($_SERVER['REQUEST_METHOD'] === 'POST'){
-     if($s['allow'] != '1'){ msg(-1015,'提交失败,当前禁止留言!');  }
-     $type = $_POST['type']; //类型
-     $contact = $_POST['contact']; //联系方式
-     $title = $_POST['title']; //标题
-     $content = $_POST['content']; //内容
-     if(empty($type)){
-         msg(-1015,'提交失败,类型不能为空');
-     }elseif(empty($contact)){
-         msg(-1015,'提交失败,联系方式不能为空');
-     }elseif(empty($title)){
-         msg(-1015,'提交失败,标题不能为空');
-     }elseif(empty($content)){
-         msg(-1015,'提交失败,内容不能为空');
-     }elseif(strlen($type) >= 32 || strlen($contact) >= 64 || strlen($title) >= 128 || strlen($content) >= 2048){
-         msg(-1015,'提交失败,长度超限');
-     }elseif(ShuLiang("data/user/{$u}/MessageBoard/") > 256){
-         msg(-1015,'提交失败,留言太多了请稍后再试');
-     }
-     
-     $json_arr = array(
-         'type'=>htmlentities($type),
-         'contact'=>htmlentities($contact),
-         'title'=>htmlentities($title),
-         'content'=>htmlentities($content),
-         'time'=>time(),
-         'ip'=>get_IP()
-         );
-         //限制长度 参数
-     //var_dump($json_arr);exit;
-     $json = json_encode($json_arr);
-     $path = "data/user/{$u}/MessageBoard/".time().'_'.crc32($json).'.json';
-     if( Check_Path("data/user/{$u}/MessageBoard") && file_put_contents($path, $json)){
-        msg(0,'提交成功'); 
-    }else{
-        msg(-1015,'系统错误,提交失败'); //创建目录或写入文件失败,请检查权限
-    }
+     msg(-1,'免费版不支持此功能');
  } 
 
-//获取文件数
-function ShuLiang($path){
-    $sl=0;
-    $arr = glob($path);
-    foreach ($arr as $v){
-        if(is_file($v)){
-            $sl++;
-        }else{
-            $sl+=ShuLiang($v."/*");
-        }
-    }
-    return $sl;
-}
-require DIR.'/templates/admin/page/expand/guestbook-user.php';
+//通用数据初始化
+require DIR."/system/templates.php";
+require $index_path;
 exit;

system/expand/sitemap.php

@@ -0,0 +1,8 @@
+<?php
+if(!is_subscribe('bool')){exit;}
+
+//设置协议头
+header('Content-Type: application/xml');
+exit;
+
+?>

system/expand/sitemap_create.php

@@ -0,0 +1 @@
+<?php

system/icon.php

@@ -1,254 +1,6 @@
 <?php
 
-//读取配置
-$config = unserialize( get_db("global_config", "v", ["k" => "icon_config"])) ?? [];
-$config['analysis_timeout'] = (intval($config['analysis_timeout']) >= 3 && intval($config['analysis_timeout']) <= 20) ? intval($config['analysis_timeout']) : 6; //解析超时
-$config['download_timeout'] = (intval($config['download_timeout']) >= 3 && intval($config['download_timeout']) <= 20) ? intval($config['download_timeout']) : 6; //下载超时
-$config['icon_size'] = (intval($config['icon_size']) >= 5 && intval($config['icon_size']) <= 1024) ? intval($config['icon_size']) : 256; //大小限制
-$favicon_url = '';
-//防盗链
-if($config['referer_test'] == 1){
-    if(empty($_SERVER['HTTP_REFERER']) || !strstr($_SERVER['HTTP_REFERER'],$_SERVER['HTTP_HOST'])){
-        header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit('404 Not Found');
-    }
-}
-
-//获取URL
-$url = base64_decode($_GET['url']);
-$url_md5 = md5($url);
-
-//维护模式/离线模式/关闭服务 > 输出固定图标
-if($global_config['Maintenance'] != 0 || $global_config['offline'] == '1' || $config['o_switch'] == '0' || !is_subscribe('bool')){
-    echo_link_type_icon();
-}
-
-//如果不是http(s)则根据类型输出固定图标
-if(!preg_match("/^(http:\/\/|https:\/\/)/",$url)){
-    echo_link_type_icon();
-}else{
-    $uri_part = parse_url($url);
-    $url_root = $uri_part['scheme'] . '://' . $uri_part['host'] . (isset($uri_part['port']) ? ':' . $uri_part['port'] : '');
-}
-
-//检查目录 > 不存在则自动创建 > 创建失败显示错误图标
-if(!Check_Path(DIR.'/data/icon')){
-    echo_icon(DIR . '/templates/admin/img/error.svg',$config);
-}
-
-//读取缓存 > 存在且可用则输出
-$cache_data = get_db('global_icon','*',['url_md5'=>$url_md5]);
-if(!empty($cache_data) && $cache_data['update_time'] > time() - intval($config['server_cache_time']) && is_file(DIR . '/data/icon/' . $cache_data['file_name'])){
-    echo_icon(DIR . '/data/icon/' . $cache_data['file_name'],$config,$cache_data);
-}
-
-//缓存不可用
-//获取URL的html内容
-$html = get_html($url,$config['analysis_timeout']);
-
-//获取html失败
-if(empty($html)){
-    backup_api($url,$config); //调用备选接口
-}
-
-//html获取成功>尝试解析
-try {
-    $doc = new DOMDocument();
-    @$doc->loadHTML($html);
-    $links = $doc->getElementsByTagName('link');
-    //后续可以考虑将所有声明的图标加入数组,然后按特定规则排序,实现多图标时获取较大尺寸的图标
-    foreach ($links as $link) {
-        if (in_array($link->getAttribute('rel'),['shortcut icon','icon','alternate icon','apple-touch-icon'])) {
-            $favicon_url = $link->getAttribute('href');
-            break;
-        }
-    }
-}catch (Exception $e) {
-    //解析异常,不做处理!下面继续尝试其他方法获取!
-}
-
-//解析失败(可能是未设置图标)
-if(empty($favicon_url)){
-    //尝试获取根目录的favicon.ico
-    $res = down_ico($url_root.'/favicon.ico','./data/icon/',$url,$config['download_timeout']);
-    if($res){
-        echo_icon(DIR . '/data/icon/'.$url_md5.".ico",$config);
-    }
-    //调用备选接口
-    backup_api($url,$config);
-}
-
-//解析到图标
-$favicon_url = url_patch($favicon_url,$url);
-
-//if 如果图标类型是base64或者svg则不需要下载
-
-//匹配图标类型>下载>输出
-$suffix = strtolower(end(explode('.',$favicon_url)));
-$suffix = strtolower(reset(explode('?',$suffix)));
-$suffix = preg_match('/^(jpg|jpeg|png|ico|bmp|svg|webp)$/i',$suffix) ? $suffix : 'ico';
-
-//下载图标 > 成功则输出
-$res = down_ico($favicon_url,'./data/icon/',$url,$config['download_timeout']);
-if($res){
-    echo_icon(DIR . '/data/icon/'.$url_md5.".$suffix",$config);
-}else{
-    echo_link_type_icon();
-}
-
-//使用备用接口
-function backup_api($url,$config){
-    global $uri_part,$url_root;
-    //未设置时直接输出ie图标
-    $backup_api = intval($config['backup_api']);
-    if($backup_api == 0){
-        echo_icon(DIR . '/templates/admin/img/ie.svg',$config);
-    }elseif($backup_api == 6){
-        $res = down_ico('https://api.iowen.cn/favicon/'.parse_url($url)['host'].'.png','./data/icon/','',$config['download_timeout']);
-        if($res){
-            echo_icon(DIR . '/data/icon/'.$GLOBALS['url_md5'].".png",$config);
-        }
-    }elseif($backup_api == 2){
-        $res = down_ico('https://favicon.png.pub/v1/'.base64_encode($url_root),'./data/icon/','',$config['download_timeout']);
-        if($res){
-            echo_icon(DIR . '/data/icon/'.$GLOBALS['url_md5'].".png",$config);
-        }
-    }
-    
-    //如果都失败,则输出默认图标
-    echo_icon(DIR . '/templates/admin/img/ie.svg',$config);
-}
-//检测URL自动补全
-function url_patch($favicon_url,$url){
-    global $uri_part,$url_root;
-    //包含协议表示URL完整,直接返回
-    if(strpos($favicon_url, '://')){
-        return $favicon_url;
-    }
-    
-    //忽略协议的绝对路径
-    if(strpos($favicon_url, '//') === 0 ) {
-        return $uri_part['scheme'] . ':' . $favicon_url;
-    }
-    
-    //位于根目录
-    if(strpos($favicon_url, '/') === 0 ){
-        return $url_root.$favicon_url;
-    }
-    //当前目录
-    if(strpos($favicon_url, './') === 0){
-        return $url_root . $uri_part['path'] . substr($favicon_url, 2);
-    }
-    //向上N级目录
-    if(strpos($favicon_url, '../') === 0){
-        $N = substr_count($favicon_url,'../');
-        $url_temp = $uri_part['path'];
-        for ($i = 0; $i < $N; $i++) {
-             $url_temp = dirname($url_temp);
-             $favicon_url = preg_replace('/^\.\.\//', '', $favicon_url);
-        }
-        return $url_root . $url_temp . $favicon_url;
-    }
-    
-    //base64
-    
-    //SVG
-    
-    //默认路径
-    return $url_root . $uri_part['path'] . $favicon_url;
-}
-
-//获取html
-function get_html($url,$TIMEOUT = 5){
-    try {
-        $c = curl_init(); 
-        curl_setopt($c, CURLOPT_URL, $url); 
-        curl_setopt($c, CURLOPT_RETURNTRANSFER, 1); 
-        curl_setopt($c, CURLOPT_FAILONERROR, 1);
-        curl_setopt($c, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($c, CURLOPT_SSL_VERIFYHOST, false);
-        curl_setopt($c, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($c, CURLOPT_TIMEOUT, $TIMEOUT);
-        curl_setopt($c, 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');
-        $data = curl_exec($c); 
-        //如果是gzip则解压
-        $prefix  = dechex(ord($data[0])) . dechex(ord($data[1]));
-        if(strtolower($prefix) == '1f8b'){
-            $data = gzdecode($data);
-        }
-        curl_close($c);
-        return $data;
-    }catch (Exception $e) {
-        return false;
-    }
-}
-
-function down_ico($ico_url,  $savePath = './data/temp/',$referer = '',$TIMEOUT = 60){
-    $suffix = strtolower(end(explode('.',$ico_url)));
-    $suffix = strtolower(reset(explode('?',$suffix))); //截取?前面的
-    if(!preg_match('/^(jpg|jpeg|png|ico|bmp|svg|webp)$/i',$suffix)){
-        $suffix = 'ico'; //没匹配到后缀名则默认为ico
-    }
-    $file = "{$GLOBALS['url_md5']}.{$suffix}";
-    $c = curl_init();
-    curl_setopt($c, CURLOPT_URL, $ico_url);
-    curl_setopt($c, CURLOPT_TIMEOUT, $TIMEOUT);
-    curl_setopt($c, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($c, CURLOPT_HEADER, FALSE);
-    curl_setopt($c, CURLOPT_NOBODY, FALSE);
-    curl_setopt($c, CURLOPT_SSL_VERIFYPEER, false);
-    curl_setopt($c, CURLOPT_SSL_VERIFYHOST, false);
-    curl_setopt($c, CURLOPT_FOLLOWLOCATION, 1);
-    curl_setopt($c, 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');
-    if(!empty($referer)){
-        curl_setopt($c, CURLOPT_REFERER, $referer);
-    }
-    try{
-        $res = curl_exec($c);
-    }finally{
-        $code = curl_getinfo($c, CURLINFO_HTTP_CODE);
-        curl_close($c);
-    }
-    
-    if ($code == '200') { //状态码正常
-        //十六进制取文件头
-        $prefix  = strtolower( dechex(ord($res[0])) . dechex(ord($res[1])) );
-        //根据头判断类型
-        if($prefix == '1f8b'){ //gzip解码
-            $res = gzdecode($res);
-        }elseif( $prefix != '3c73' && strpos($prefix, '3c') === 0){ // <开头视为文本 <?开头是svg除外 
-            return false;
-        }
-        //3c73>svg 3c21>html 1f8b>gzip
-        
-        //文件大小限制
-        if((strlen($res) / 1024)> $GLOBALS['config']['icon_size']){
-            return false;
-        }
-        $fullName = rtrim($savePath, '/') . '/' . $file;
-        $type = ['jpg'=>'jpeg','jpeg'=>'jpeg','svg'=>'svg+xml','ico'=>'x-icon']; //类型表
-        $mime = $type[$suffix] ?? 'x-icon';
-        
-        //黑名单(后期考虑使用在线名单缓存到本地,以便以更好的维护)
-        $_md5 = md5($res);
-        if($_md5 == 'c531ffbdad1ba93bd84f2398052958dc') return false; //阿里云
-        if($_md5 == '05231fb6b69aff47c3f35efe09c11ba0') return false; //一为默认
-        if($_md5 == '3ca64f83fdcf25135d87e08af65e68c9') return false; //小z默认
-        
-        $data = ['update_time'=>time(),'file_name'=>$file,'file_mime'=>$mime,'ico_url'=>$ico_url,'extend'=>''];
-        if(!has_db('global_icon',['url_md5'=>$GLOBALS['url_md5']])){
-            $data['url_md5'] = $GLOBALS['url_md5'];
-            $data['url'] = $GLOBALS['url'];
-            $data['add_time'] = time();
-            insert_db('global_icon',$data); 
-        }else{
-            update_db('global_icon',$data,['url_md5'=>$GLOBALS['url_md5']]); 
-        }
-        
-        return file_put_contents($fullName, $res);
-    }else{
-        return false;
-    }
-}
+echo_link_type_icon();
 
 function echo_icon($path,$config,$db = false){
     //文件不存在时输出固定图标(理论上执行到这里不会出现文件不存在)

system/index.php

@@ -1,6 +1,60 @@
 <?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}AccessControl();
-//主页入口
-define('is_login',is_login());
+
+//是否载入引导页
+if(@$global_config['default_page'] == 2){
+    if(empty(Get('u')) && empty($_COOKIE['Default_User'])){
+        $c = 'guide';
+        require DIR."/system/templates.php";
+        require $index_path;
+        exit;
+    }
+}
+
+//书签分享
+$share = Get('share');
+if(!empty($share)){
+    $share = get_db('user_share','*',['uid'=>UID,'sid'=>$share]);
+    if(empty($share)){
+        $content = '分享已被删除,请联系作者!';
+        require DIR.'/templates/admin/page/404.php';
+        exit;
+    }
+    //判断是否过期
+    if(time() > $share['expire_time']){
+        $content = '分享已过期,请联系作者!';
+        require DIR.'/templates/admin/page/404.php';;
+        exit;
+    }
+    //判断是否加密
+    if(!empty($share['pwd']) && !is_login()){
+        session_start();
+        if($_SESSION['verify']['share'][$share['id']] != $share['pwd']){
+            $c = 'verify';$_GET['c'] = 'share';
+            require DIR."/system/templates.php";
+            require $index_path;
+            exit;
+        }
+    }
+    
+    $data = json_decode($share['data']);
+    //判断分享类型(1.分类 2.链接)
+    if($share['type'] == 1){
+        $where['cid'] = $data;
+        if($share['pv'] == 1){
+            unset($where['property']);
+        }
+    }else if($share['type'] == 2){
+        $category_parent = [['name' => $share['name'] ,"font_icon" =>"fa fa-bookmark-o" , "id" => 'share' ,"description" => "书签分享"]];
+        $categorys = $category_parent;
+    }
+    
+    //浏览计次
+    update_db("user_share", ["views[+]"=>1],['uid'=>UID,'id'=>$share['id']]);
+}
+
+
+//通用数据初始化
+require DIR."/system/templates.php";
 
 //判断用户组,是否允许未登录时访问主页
 if(!is_login && ($global_config['Privacy'] == 1 || !check_purview('Common_home',1))){
@@ -8,73 +62,10 @@ if(!is_login && ($global_config['Privacy'] == 1 || !check_purview('Common_home',
     header("Location: ./?c=admin&u=".U);
     exit;
 }
-//载入站点设置
-$site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
-//如果没有权限则清除自定义代码
-if(!check_purview('header',1)){$site['custom_header'] = '';}
-if(!check_purview('footer',1)){$site['custom_footer'] = '';}
 
-$site['Title']  =  $site['title'].(empty($site['subtitle'])?'':' - '.$site['subtitle']);
-//免费用户请保留版权,谢谢!
-$copyright = empty($global_config['copyright'])?'<a target="_blank" href="https://gitee.com/tznb/TwoNav">Copyright © TwoNav</a>':$global_config['copyright'];
-$ICP = empty($global_config['ICP'])?'':'<a target="_blank" href="https://beian.miit.gov.cn">'.$global_config['ICP'].'</a>';
-$favicon = ( !empty($site['site_icon_file'])) ? $site['site_icon'] : './favicon.ico';
+//例外主题,不支持热门网址/最新网址/输出上限
+$site['ex_theme'] = in_array($theme,['snail-nav','heimdall']); 
 
-//读取默认模板信息
-require DIR ."/system/templates.php";
-//引导页
-if(!empty($global_config['default_page']) && $global_config['default_page'] == 2){
-    if(empty(Get('u')) && empty($_COOKIE['Default_User'])){
-        $theme = $global_templates['guide'];
-        $dir_path = DIR.'/templates/guide/'.$global_templates['guide'];
-        $index_path = $dir_path.'/index.php';
-        if(!is_file($index_path)){
-            $dir_path= DIR.'/templates/guide/default';
-            $index_path = $dir_path.'/index.php';
-        }
-        $theme_dir = str_replace(DIR.'/templates/guide',"./templates/guide",$dir_path);
-        $theme_info = json_decode(@file_get_contents($dir_path.'/info.json'),true);
-        $theme_config = empty($theme_info['config']) ? []:$theme_info['config'];
-        $theme_config_db = get_db('user_config','v',['t'=>'theme_guide','k'=>$theme,'uid'=>UID]);
-        $theme_config_db = unserialize($theme_config_db);
-        $theme_config = empty($theme_config_db) ? $theme_config : array_merge ($theme_config,$theme_config_db);
-        require($index_path);
-        exit;
-    }
-}
-//参数指定主题优先
-$theme = trim(@$_GET['theme']);
-if ( !empty ($theme) && check_purview('theme_in',1)){
-    $dir_path = DIR.'/templates/home/'.$theme;
-    $index_path = $dir_path.'/index.php';
-}else{
-    $is_Pad = preg_match('/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i',$_SERVER['HTTP_USER_AGENT']);
-    $theme = $is_Pad?$s_templates['home_pad']:$s_templates['home_pc'];
-    $dir_path = DIR.'/templates/home/'.$theme;
-    $index_path = $dir_path.'/index.php';
-}
-//检查是否存在,不存在则使用默认
-if(!is_file($index_path)){
-    $dir_path= DIR.'/templates/home/default';
-    $index_path = $dir_path.'/index.php';
-}
-//相对路径
-$theme_dir = str_replace(DIR.'/templates/home',"./templates/home",$dir_path);
-//主题信息
-$theme_info = json_decode(@file_get_contents($dir_path.'/info.json'),true);
-//支持属性
-$support_subitem = $theme_info['support']['subitem']??0; //0.不支持子分类 1.分类栏支持 2.链接栏支持 3.都支持
-$support_category_svg = $theme_info['support']['category_svg']??0; //0.不支持 1.支持
-//主题配置(默认)
-$theme_config = empty($theme_info['config']) ? []:$theme_info['config'];
-//主题配置(用户)
-$theme_config_db = get_db('user_config','v',['t'=>'theme_home','k'=>$theme,'uid'=>UID]);
-$theme_config_db = unserialize($theme_config_db);
-//合并配置数据
-$theme_config = empty($theme_config_db) ? $theme_config : array_merge ($theme_config,$theme_config_db);
-//主题版本(调试时追加时间戳)
-$theme_ver = !Debug?$theme_info['version']:$theme_info['version'].'.'.time();
-$site['ex_theme'] = in_array($theme,['snail-nav','heimdall']); //例外主题,不支持热门网址/最新网址/输出上限
 //分类查找条件
 $categorys = []; //声明一个空数组
 $content = ['cid(id)','fid','name','property','font_icon','icon','description'];//需要的内容
@@ -129,7 +120,6 @@ function get_links($fid) {
     $where['ORDER']['lid'] = 'ASC';
     if(!is_login){
         $where['property'] = 0;
-
     }
     //书签分享>私有可见
     if(isset($share['pv']) && $share['pv'] == 1){
@@ -164,7 +154,8 @@ function get_links($fid) {
         $max_link = true;
     }
     $links = select_db('user_links',['lid(id)','fid','property','title','url(real_url)','url_standby','description','icon','click','pid','extend'],$where);
-    foreach ($links as $key => $link) {
+    $UUID = ($GLOBALS['global_config']['static_link'] == 2 ? UID : U);
+    foreach ($links as &$link) {
         $click = false; $lock = false;
         
         //直连模式,但存在备用链接
@@ -184,20 +175,20 @@ function get_links($fid) {
         }
         
         if($click || $site['link_model'] != 'direct'){
-            $links[$key]['url'] = "./index.php?c=click&id={$link['id']}&u=".U;
+            $link['url'] = static_link ? "{$GLOBALS['HOST']}/click-{$UUID}-{$link['id']}.html" : "./index.php?c=click&id={$link['id']}&u={$u}";
             if($lock){
-                $links[$key]['real_url'] = $links[$key]['url']; //篡改真实URL,防止泄密
+                $link['real_url'] = $link['url']; //篡改真实URL,防止泄密
                 if(isset($share['sid'])){
-                    $links[$key]['url'] .='&share='.$share['sid'];
+                    $link['url'] .='&share='.$share['sid'];
                 }
             }
         }else{
-            $links[$key]['url'] = $link['real_url'];
+            $link['url'] = $link['real_url'];
         }
 
         //获取图标链接
-        $links[$key]['ico'] = $lock ? $GLOBALS['libs'].'/Other/lock.svg' : geticourl($site['link_icon'],$link);
-        $links[$key]['type'] = 'link';
+        $link['ico'] = $lock ? $GLOBALS['libs'].'/Other/lock.svg' : geticourl($site['link_icon'],$link);
+        $link['type'] = 'link';
     }
     //处理扩展信息
     if($GLOBALS['global_config']['link_extend'] == 1 && check_purview('link_extend',1) && in_array($GLOBALS['theme_info']['support']['link_extend'],["true","1"])){
@@ -208,77 +199,16 @@ function get_links($fid) {
         }
 
     }
-    //生成文章链接, 条件:非隐藏,且主题未声明不显示文章
-    if( intval($site['article_visual'] ?? '1') > 0 && $GLOBALS['theme_info']['support']['article'] != 'notdisplay'){
-        $articles = get_article_list($fid);
-        foreach ($articles['data'] as $article) {
-            $url = "./index.php?c=article&id={$article['id']}&u={$u}";
-            if($site['article_icon'] == '1'){ //站点图标
-                $icon = $GLOBALS['favicon'];
-            }elseif($site['article_icon'] == '2' && !empty($article['cover'])){ //封面
-                $icon = $article['cover'];
-            }else{ //首字
-                $icon = './system/ico.php?text='.mb_strtoupper(mb_substr($article['title'], 0, 1));
-            }
-            $article_link = ['type'=>'article','id'=>0,'title'=>$article['title'],'url'=>$url,'real_url'=>$url,'description'=>$article['summary'],'ico'=>$icon,'icon'=>$icon];
-            //判断靠前还是靠后
-            if($site['article_visual'] == '1'){
-                array_unshift($links,$article_link);
-            }else{
-                array_push($links,$article_link);
-            }
-            
-        }
-    }
-    
-    
+
     if($max_link && $count > $site['max_link']){
-        $oc_url = "./index.php?u={$u}&oc={$fid}" . (empty($_GET['theme']) ? '':"&theme={$_GET['theme']}");
+        $oc_url = static_link ? "{$GLOBALS['HOST']}/category-{$UUID}-{$fid}.html" : "./index.php?u={$u}&oc={$fid}";
         array_push($links,['id'=>0,'title'=>'查看全部','url'=>$oc_url,'real_url'=>$oc_url,'description'=>'该分类共有'.$count.'条数据','ico'=>'./favicon.ico']);
     }
    
     return $links;
 }
 
-//书签分享
-$share = Get('share');
-if(!empty($share)){
-    $share = get_db('user_share','*',['uid'=>UID,'sid'=>$share]);
-    if(empty($share)){
-        $content = '分享已被删除,请联系作者!';
-        require DIR.'/templates/admin/page/404.php';
-        exit;
-    }
-    //判断是否过期
-    if(time() > $share['expire_time']){
-        $content = '分享已过期,请联系作者!';
-        require DIR.'/templates/admin/page/404.php';;
-        exit;
-    }
-    //判断是否加密
-    if(!empty($share['pwd']) && !is_login){
-        session_start();
-        if($_SESSION['verify']['share'][$share['id']] != $share['pwd']){
-            require DIR.'/templates/admin/other/verify_share_pwd.php';
-            exit;
-        }
-    }
-    
-    $data = json_decode($share['data']);
-    //判断分享类型(1.分类 2.链接)
-    if($share['type'] == 1){
-        $where['cid'] = $data;
-        if($share['pv'] == 1){
-            unset($where['property']);
-        }
-    }else if($share['type'] == 2){
-        $category_parent = [['name' => $share['name'] ,"font_icon" =>"fa fa-bookmark-o" , "id" => 'share' ,"description" => "书签分享"]];
-        $categorys = $category_parent;
-    }
-    
-    //浏览计次
-    update_db("user_share", ["views[+]"=>1],['uid'=>UID,'id'=>$share['id']]);
-}
+
 
 //如果为空则查找分类
 if($category_parent == []){
@@ -323,5 +253,6 @@ if(empty($_GET['share']) && !$site['ex_theme']){
 write_user_count(date('Ym'),'index_Ym');
 write_user_count(date('Ymd'),'index_Ymd');
 count_ip();
+
 //载入模板
 require($index_path);

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.10/layui.js';
-$layui['css'] = './static/Layui/v2.8.10/css/layui.css';
+$layui['js']  = './static/Layui/v2.9.7/layui.js';
+$layui['css'] = './static/Layui/v2.9.7/css/layui.css';
 
 //判断请求类型
 if($_SERVER['REQUEST_METHOD'] === 'POST'){
@@ -148,25 +148,33 @@ $db_config = array(
     }
     
     // mysql
-    if($_POST['db_type'] === 'mysql'){
+    if($_POST['db_type'] === 'mysql' || $_POST['db_type'] === 'mariadb'){
         if( !isset($_POST['db_host']) || !isset($_POST['db_port']) || !isset($_POST['db_name']) || !isset($_POST['db_user']) || !isset($_POST['db_password']) ){
-            msg(-1,'MySQL配置错误,请检查..');
+            msg(-1,'数据库配置错误,请检查..');
         }
         
         require (DIR.'/system/Medoo.php'); //载入框架
         try {
             $db = new Medoo\Medoo([
-                'type' => 'mysql',
+                'type' => $_POST['db_type'],
                 'host' => $_POST['db_host'],
                 'port' => $_POST['db_port'],
                 'database' => $_POST['db_name'],
                 'username' => $_POST['db_user'],
-                'password' => $_POST['db_password']
+                'password' => $_POST['db_password'],
+                'charset' => 'utf8mb4'
             ]);
-
-            //判断版本,目前基于5.6.50开发,其他版本兼容性未知,若您需要强制安装请屏蔽检测
-            if(version_compare($db->info ()['version'],'5.6.0','<')) msg(-1,'MySQL数据库版本不能低于5.6,当前版本:'.$db->info ()['version']);
-            //链接成功..
+            $ver = $db->info ()['version'];
+            if($_POST['db_type'] === 'mysql'){
+                if(version_compare($ver,'5.6.0','<')){
+                    msg(-1,'MySQL数据库版本不能低于5.6,当前版本:'.$ver);
+                }
+            }else{
+                preg_match('/(\d+\.\d+\.\d+)-MariaDB/', $ver, $matches);
+                if(version_compare($matches[1],'10.1.0','<')){
+                    msg(-1,'MariaDB数据库版本不能低于10.1,当前版本:'.$ver);
+                }
+            }
         }catch (Exception $e) {
             $E = $e->getMessage();
             if(strstr($E,'[1044]') || strstr($E,'[1049]')){
@@ -194,7 +202,7 @@ $db_config = array(
         $config = '<?php
 //数据库配置
 $db_config = array(
-    "type" => "mysql", //类型
+    "type" => "'.$_POST['db_type'].'", //类型
 	"host" => "'.$_POST['db_host'].'", //地址
 	"port" => '.$_POST['db_port'].', //端口
 	"name" => "'.$_POST['db_name'].'", //库名
@@ -282,19 +290,40 @@ function Write_Config(){
     insert_db("global_config", ["k" => "s_templates","v" => $templates,"d" => '默认模板']);
 
     //写站点配置
-    $o_config['Login'] = 'login'; //登录入口
-    $o_config['Register'] = 'register'; //注册入口
-    $o_config['RegOption'] = '0'; //注册配置
-    $o_config['Libs'] = './static'; //静态库路径
-    $o_config['Default_User'] = $_POST['User']; //默认用户
-    $o_config['XSS_WAF'] = '1'; //防XSS脚本
-    $o_config['SQL_WAF'] = '1'; //防SQL注入
-    $o_config['offline'] = '0'; //离线模式
-    $o_config['Debug']   = '0'; //调试模式
-    $o_config['Maintenance'] = '0'; //维护模式
-    $o_config['Sub_domain'] = '0'; //二级域名
-    $o_config['copyright'] = ''; //版权信息
-    $o_config['c_code'] = '0'; //禁用默认用户使用自定义代码
+    $o_config['Default_User'] = $_POST['User'];
+    $o_config['default_page'] = 0;
+    $o_config['default_UserGroup'] = '';
+    $o_config['RegOption'] = 0;
+    $o_config['Register'] = 'register';
+    $o_config['Login'] = 'login';
+    $o_config['Libs'] = './static';
+    $o_config['ICP'] = ''; 
+    $o_config['XSS_WAF'] = 0;
+    $o_config['SQL_WAF'] = 0;
+    $o_config['offline'] = 0;
+    $o_config['Update_Source'] = 0;
+    $o_config['Update_Overtime'] = 3;
+    $o_config['Debug'] = 0;
+    $o_config['Maintenance'] = 0;
+    $o_config['static_link'] = 0;
+    $o_config['Privacy'] = 0;
+    $o_config['Sub_domain'] = 0;
+    $o_config['copyright'] = '';
+    $o_config['global_header'] = '';
+    $o_config['global_footer'] = '';
+    $o_config['api_extend'] = 0;
+    $o_config['apply'] = 1;
+    $o_config['guestbook'] = 1;
+    $o_config['link_extend'] = 0;
+    $o_config['article'] = 1;
+    $o_config['c_name'] = 0;
+    $o_config['c_desc'] = 0;
+    $o_config['l_name'] = 0;
+    $o_config['l_url'] = 0;
+    $o_config['l_key'] = 0;
+    $o_config['l_desc'] = 0;
+    $o_config['c_code'] = 0;
+    
     
     insert_db("global_config", ["k" => "o_config","v" => $o_config,"d" => '网站配置']);  
     
@@ -378,8 +407,9 @@ function Write_Config(){
     <label class="layui-form-label">数据库类型</label>
     <div class="layui-input-block">
       <select id="db_type" name="db_type" lay-filter="db_type" >
-        <option value="sqlite" selected="">SQLite ( 个人和工作室推荐 )</option>
-        <option value="mysql" >MySQL ( 大量用户推荐 )</option>
+        <option value="sqlite" selected="">SQLite ( 推荐 )</option>
+        <option value="mysql" >MySQL ≥ 5.6.0 </option>
+        <option value="mariadb" >MariaDB ≥ 10.1 </option>
       </select>
     </div>
   </div>
@@ -393,40 +423,40 @@ function Write_Config(){
   </div>
 <!--SQLite配置-->
 
-<!--MySQL配置-->
+<!--MySQL/MariaDB 配置-->
  <div id='db_mysql' style = "display:none;">
   <div class="layui-form-item">
-    <label class="layui-form-label">MySQL地址</label>
+    <label class="layui-form-label">地址</label>
     <div class="layui-input-block">
       <input type="text" name="db_host" value="localhost" placeholder="请输入服务器地址" autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
-    <label class="layui-form-label">MySQL端口</label>
+    <label class="layui-form-label">端口</label>
     <div class="layui-input-block">
       <input type="number" name="db_port" value="3306" placeholder="请输入服务器端口" autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
-    <label class="layui-form-label">MySQL库名</label>
+    <label class="layui-form-label">库名</label>
     <div class="layui-input-block">
       <input type="text" name="db_name" placeholder="请输入数据库库名" autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
-    <label class="layui-form-label">MySQL账号</label>
+    <label class="layui-form-label">账号</label>
     <div class="layui-input-block">
       <input type="text" name="db_user" placeholder="请输入数据库账号" autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
-    <label class="layui-form-label">MySQL密码</label>
+    <label class="layui-form-label">密码</label>
     <div class="layui-input-block">
       <input type="text" name="db_password" placeholder="请输入数据库密码" autocomplete="off" class="layui-input">
     </div>
   </div>
  </div>
-<!--MySQL配置 End-->
+<!--MySQL/MariaDB 配置 End-->
  <div class="layui-form-mid layui-word-aux">安装方式：全新安装 &ensp;&ensp;&ensp;&ensp;&ensp;</div>
  <div class="layui-form-mid layui-word-aux">推荐配置：Nginx-1.20 +&ensp;PHP-8.1 </div>
  <button class="layui-btn" lay-submit lay-filter="register" style = "width:100%;">开始安装</button>
@@ -481,7 +511,7 @@ layui.use(['form'], function(){
             return false;
         }else if(d.db_type == 'mysql'){
             if(d.db_host.length == 0 || d.db_port.length == 0 || d.db_name.length == 0 || d.db_user.length == 0 || d.db_password.length == 0){
-                layer.msg('MySQL配置有误,请检查.', {icon: 5});
+                layer.msg('数据库配置有误,请检查.', {icon: 5});
                 return false;
             }
         }
@@ -516,7 +546,7 @@ layui.use(['form'], function(){
 //数据库类型切换
 function set_db_type(v){
     document.cookie="db_type="+v;
-    if(v == 'mysql'){
+    if(v == 'mysql' || v == 'mariadb'){
         $("#db_mysql").show();
         $("#db_sqlite").hide();
     }else if(v == 'sqlite'){

system/login.php

@@ -2,15 +2,10 @@
 
 //如果是Get请求则载入登录模板
 if($_SERVER['REQUEST_METHOD'] === 'GET'){
-    require DIR ."/system/templates.php";
-    $t_path = DIR ."/templates/login/{$s_templates['login']}/index.php"; //模板路径
-    $copyright = empty($global_config['copyright'])?'<a target="_blank" href="https://gitee.com/tznb/TwoNav">Copyright © TwoNav</a>':$global_config['copyright'];
-    $ICP = empty($global_config['ICP'])?'':'<a target="_blank" href="https://beian.miit.gov.cn">'.$global_config['ICP'].'</a>';
-    //检查是否存在,不存在则使用默认
-    if(!is_file($t_path)){
-        $t_path = DIR.'/templates/login/default/index.php';
-    }
-    require $t_path;
+    session_start();
+    $_SESSION['login'] = $c;
+    require DIR."/system/templates.php";
+    require $index_path;
     exit;
 }
 

system/public.php

@@ -291,8 +291,9 @@ function Set_key($USER_DB){
     $LoginConfig = unserialize($USER_DB['LoginConfig']);
     $session  = $LoginConfig['Session']; //保持时间(单位天)
     $Expire = Get_ExpireTime($session); //计算到期时间戳
+    $real_Expire = ($Expire == 0) ? time() + 86400 : $Expire;
     $time = time(); //取当前时间
-    $key = Getkey($USER_DB['User'],Get_MD5_Password($USER_DB["Password"],$USER_DB["RegTime"]),$Expire,$LoginConfig['KeySecurity'],$time);
+    $key = Getkey($USER_DB['User'],Get_MD5_Password($USER_DB["Password"],$USER_DB["RegTime"]),$real_Expire,$LoginConfig['KeySecurity'],$time);
     setcookie($USER_DB['User'].'_key', $key, $session == 0 ? 0 : $Expire,"/",'',false,$LoginConfig['HttpOnly']==1);
     insert_db("user_login_info", [
         "uid" => $USER_DB['ID'],
@@ -301,8 +302,8 @@ function Set_key($USER_DB){
         "ua"=>$_SERVER['HTTP_USER_AGENT'],
         "login_time"=>$time,
         "last_time"=>$time,
-        "expire_time"=>$Expire,
-        "cookie_key"=>md5($key)]); //不记录用户真实key,同时防止Cookie攻击
+        "expire_time"=>$real_Expire,
+        "cookie_key"=>md5($key)]);
     return $key;
 }
 
@@ -503,15 +504,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; 
 }
 
@@ -530,7 +534,7 @@ function get_http_code($url,$TIMEOUT = 10 ,$NOBODY = true) {
     return $return;
 }
 
-function ccurl($url,$overtime = 3,$Referer = false){
+function ccurl($url,$overtime = 3,$Referer = false,$post_data = false){
     try {
         $curl  =  curl_init ( $url ) ; //初始化
         curl_setopt($curl, CURLOPT_TIMEOUT, $overtime ); //超时
@@ -539,6 +543,11 @@ function ccurl($url,$overtime = 3,$Referer = false){
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+        if(!empty($post_data)){
+            curl_setopt($curl, CURLOPT_POST, true);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $post_data);
+        }
+        
         if($Referer === true){
             curl_setopt($curl, CURLOPT_REFERER, $_SERVER['HTTP_REFERER']);
         }elseif(!empty($Referer)){
@@ -555,7 +564,7 @@ function ccurl($url,$overtime = 3,$Referer = false){
     return $Res;
 }
 
-function downFile($url, $file = '', $savePath = './data/temp/',$referer = '',$TIMEOUT = 60){
+function downFile($url, $file = '', $savePath = './data/temp/',$referer = '',$TIMEOUT = 60,$post_data = false){
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, $url);
     curl_setopt($ch, CURLOPT_TIMEOUT, $TIMEOUT); //超时/秒
@@ -565,6 +574,10 @@ function downFile($url, $file = '', $savePath = './data/temp/',$referer = '',$TI
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
     curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); //允许重定向(适应网盘下载)
+    if(!empty($post_data)){
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
+    }
     if(!empty($referer)){
         curl_setopt($ch, CURLOPT_REFERER, $referer);
     }
@@ -574,14 +587,14 @@ function downFile($url, $file = '', $savePath = './data/temp/',$referer = '',$TI
         $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         curl_close($ch);
     }
-    
     if ($code == '200') { //状态码正常
-        
         if(empty($file)){ //如果文件名为空
             $file = date('Ymd_His').'.tmp';
         }
         $fullName = rtrim($savePath, '/') . '/' . $file;
-        return file_put_contents($fullName, $res);
+        return file_put_contents($fullName, $res) > 0;
+    }elseif($code == '202'){
+        return $res;
     }else{
         return false;
     }
@@ -647,6 +660,9 @@ function is_Duplicated($array, $field){
 //检查权限(有权限返回true 没有权限时根传递参数1是返回false 2是直接返回错误信息)
 function check_purview($name,$return_type){
     global $USER_DB;
+    if($USER_DB == null){
+        return true;
+    }
     //230705新增,禁止判断默认用户是否可以使用自定义代码
     if($USER_DB['UserGroup'] == 'default' && $GLOBALS['global_config']['c_code'] != '1' && ( $name == 'header' || $name == 'footer' )){
         return false;
@@ -666,6 +682,26 @@ function check_purview($name,$return_type){
     }
     
 }
+//数据加密函
+function data_encryption($method,$extend = []){
+    $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"]));
+    if(!isset($subscribe['public']) || empty($subscribe['public'])){
+        msg(-1,'未检测到授权秘钥,如果已经获取授权,请在授权管理页面点击保存设置后在重试!');
+    }
+    $data['key'] = $subscribe['order_id'];
+    $data['host'] = $_SERVER['HTTP_HOST'];
+    $data['sysver'] = SysVer;
+    $data['time'] = time();
+    $data['ip'] = Get_IP();
+    $data['method'] = $method;
+    $publicKey = openssl_pkey_get_public($subscribe['public']);
+    openssl_public_encrypt(json_encode($data), $encryptedData, $publicKey, OPENSSL_PKCS1_PADDING);
+    $data = $extend;
+    $data['data'] = base64_encode($encryptedData);
+    $data['md5'] = md5($subscribe['order_id']);
+    $data['email'] = md5($subscribe['email']);
+    return json_encode($data);
+}
 //字节格式化
 function byteFormat($bytes) {
     $sizetext = array(" B", " KB", " MB", " GB", " TB", " PB", " EB", " ZB", " YB");
@@ -694,67 +730,57 @@ function Get_Rand_Str( $length = 8 ,$extend = false){
 }
 //发送邮件
 function send_email($config){
-    if(!is_file(DIR.'/system/PHPMailer/PHPMailer.php')){
-        msg(-1,'未安装PHPMailer!');
-    }
-
-    require DIR.'/system/PHPMailer/Exception.php';
-    require DIR.'/system/PHPMailer/PHPMailer.php';
-    require DIR.'/system/PHPMailer/SMTP.php';
-    $mail = new PHPMailer\PHPMailer\PHPMailer(true);
-    try {
-        $mail->CharSet ="UTF-8";
-        $mail->SMTPDebug = 0;
-        $mail->isSMTP();
-        $mail->Host = $config['host'];
-        $mail->SMTPAuth = true;
-        $mail->Username = $config['user'];
-        $mail->Password = $config['pwd'];
-        $mail->SMTPSecure = $config['secure'];
-        $mail->Port = intval($config['port']);
-        
-        if(preg_match('/(.+)<(.+)>/', $config['sender'], $match)){
-            $mail->setFrom($match[2],$match[1]);
-        }else{
-            $mail->setFrom($config['sender']);
-        }
-        
-        $mail->addAddress($config['addressee']); //收件人
-    
-        $mail->isHTML(true);
-        $mail->Subject = $config['Subject'];
-        $mail->Body    = $config['Body'];
-        $mail->send();
-        if(!empty($config['return']) && $config['return'] == 'bool'){
-            return true;
-        }
-        msg(1,'邮件发送成功');
-    } catch (Exception $e) {
-        if(!empty($config['return']) && $config['return'] == 'bool'){
-            return false;
-        }
-        if(Debug){
-            msgA(['code'=>-1,'msg'=>'发送失败:'.$mail->ErrorInfo]);
-        }else{
-            msg(-1,'发送失败');
-        }
-    }
+    msg(0,'免费版不支持此功能');
 }
 
 //统计访问ip数
 function count_ip(){
-    $ip = Get_IP(); //取访客IP
-    $k = date('Ymd'); $t = 'ip_list';
-    $ip_list = get_db('user_count','e',['uid'=>UID,'k'=>$k,'t'=>$t]); //取列表
-    $ip_list = empty($ip_list) ? [] : unserialize($ip_list); //反序列化
-    //判断IP是否存在列表中
-    if(!in_array($ip, $ip_list)){
-        $ip_list[] = $ip; //加入列表
-        if(!has_db('user_count',['uid'=>UID,'t'=>$t,'k'=>$k])){
-            insert_db("user_count", ['uid'=>UID,"k"=>$k,"e"=>$ip_list,'t'=>$t]);  
-        }else{
-            update_db("user_count", ["e"=>$ip_list],['uid'=>UID,'t'=>$t,'k'=>$k]); 
-        }
+    $ip = Get_IP(); $k = date('Ymd'); $t = 'access_ip';
+    if(!has_db('user_count',['uid'=>UID,'k'=>$k,'t'=>$t,'e'=>$ip])){
+        insert_db("user_count",['uid'=>UID,'k'=>$k,'t'=>$t,'e'=>$ip,'v'=>0]);
         write_user_count($k,'ip_count');//访问ip数+1
     }
 }
+
+//清理缓存
+function clean_cache(){
+    write_global_config('notice','','官方公告(缓存)');
+    foreach(['home','login','transit','register','guide','article','apply','verify','guestbook'] as $v){
+        write_global_config($v.'_cache','',$v.'_模板缓存');
+    }
+}
+
+//取系统版本(日期)
+function get_SysVer(){
+    if(preg_match('/^v.+-(\d{8})$/i',SysVer,$matches)){
+        return $matches[1];
+    }else{
+        return 19990101;
+    }
+}
+
+function get_HOST(){
+    return (((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) ? 'https://' :'http://').$_SERVER['HTTP_HOST'];
+}
+function get_UUID(){
+    return ($GLOBALS['global_config']['static_link'] == 2 ? UID : U);
+}
+function get_surl($input,$id=''){
+    return get_HOST().'/'.strtr($input, ['{UUID}'=>get_UUID(),'{id}'=>$id]);
+}
+function get_OEM(){
+    $OEM['program_name'] = "TwoNav";
+    return $OEM;
+}
+//返回404
+function Not_Found() {
+    header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;
+}
+
+function process_url_idn($url) {
+    $parsed_url = parse_url($url);
+    if(!preg_match('/[\x{4e00}-\x{9fa5}]/u', $parsed_url['host'])){
+        return $url;
+    }
+    return substr_replace($url, idn_to_ascii($parsed_url['host']), strpos($url, "//") + 2, strlen($parsed_url['host']));
+}

system/templates.php

@@ -3,110 +3,219 @@
 //读取全局模板配置
 $global_templates = unserialize(get_db("global_config",'v', ["k" => "s_templates"]));
 
-//读取用户模板配置
-$s_templates = unserialize(get_db("user_config", "v", ["uid"=>UID,"k"=>"s_templates"]));
-
-//没找到用户模板配置
-if(empty($s_templates)){
-    //将全局默认模板配置写到用户配置
-    $s_templates = $global_templates;
-    insert_db("user_config", ["uid" => UID,"k"=>"s_templates","v"=>$global_templates,"t"=>"config","d" => '默认模板']);
+if(defined('UID') && $c != 'guide'){
+    //读取用户模板配置
+    $s_templates = unserialize(get_db("user_config", "v", ["uid"=>UID,"k"=>"s_templates"]));
+    //没找到用户模板配置
+    if(empty($s_templates)){
+        $s_templates = $global_templates;
+        insert_db("user_config", ["uid" => UID,"k"=>"s_templates","v"=>$global_templates,"t"=>"config","d" => '默认模板']);
+    }
 }
 
-//载入辅助函数
-if(empty($c) || in_array($c,['index','click','article'])){
-    //将URL转换为base64编码
-    function base64($url){
-        $urls = parse_url($url);
-        $scheme = empty( $urls['scheme'] ) ? 'http://' : $urls['scheme'].'://'; //获取请求协议
-        $host = $urls['host']; //获取主机名
-        $port = empty( $urls['port'] ) ? '' : ':'.$urls['port']; //获取端口
-        $new_url = $scheme.$host.$port;
-        return base64_encode($new_url);
+//根据请求来读取模板名
+if($c == 'index'){
+    $theme = trim(@$_GET['theme']); //主题预览
+    if (empty($theme)){
+        $is_Pad = preg_match('/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i',$_SERVER['HTTP_USER_AGENT']);
+        $theme = $is_Pad ? $s_templates['home_pad'] : $s_templates['home_pc'];
     }
-    //是否启用收录
-    function is_apply(){
-        global $global_config;
-        $apply_user = unserialize( get_db("user_config", "v", ["k" => "apply","uid"=>UID]));
-        return ($global_config['apply'] == 1 && $apply_user['apply'] == 1);
-    }
-    //是否启用留言
-    function is_guestbook(){
-        global $global_config;
-        $guestbook_user = unserialize( get_db("user_config", "v", ["k" => "guestbook","uid"=>UID]) );
-        return ($global_config['guestbook'] == 1 && $guestbook_user['allow'] == 1);
-        
-    }
-    //获取图标URL
-    function geticourl($icon,$link){
-        if( !empty( $link['icon']) ){
-            if(substr($link['icon'], 0,4) == '<svg'){
-                return('data:image/svg+xml;base64,'.base64_encode($link['icon']));
-            }else{
-                return($link['icon']);
-            }
-        }
-        if ($site['link_icon'] == 'default'){
-            return($GLOBALS['libs'].'/Other/default.ico');
-        }elseif ($icon ==20){
-            return('./index.php?c=icon&url='.base64_encode($link['real_url']));
-        }elseif ($icon ==21){
-            return('./ico/'.base64_encode($link['real_url']));
-        }elseif($icon ==2){
-            return('//favicon.png.pub/v1/'.base64($link['real_url']));
-        }elseif($icon ==4){
-            return('//api.15777.cn/get.php?url='.$link['real_url']);
-        }elseif($icon ==5){
-            return('//favicon.cccyun.cc/'.$link['real_url']);
-        }elseif($icon ==6){
-            return('//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 ==0){
-            return('./system/ico.php?text='.mb_strtoupper(mb_substr($link['title'], 0, 1)));
-        }else{
-            return('./favicon/index2.php?url='.$link['real_url']);
-        }//如果参数错误则使用本地服务器
-    }
-    //取分类图标(六零系主题在用)
-    function get_category($content){ //抽风的命名..过度几个版本后删除
-        return get_category_icon($content);
-    }
-    function get_category_icon($content){
-        if(empty($content)){
-            return '';
-        }
-        if(substr($content, 0,4) == '<svg'){
-            return 'data:image/svg+xml;base64,'.base64_encode($content);
-        }else{
-            return $content;
-        }
-    }
-    //获取公开分类(返回数组cid)
-    function get_open_category(){
-        $where['uid'] = UID; 
-        $where['fid'] = 0;
-        $where['status'] = 1;
-        $where['property'] = 0;
-        $categorys = select_db('user_categorys','cid',$where);
-        $where['fid'] = $categorys;
-        $categorys = array_merge ($categorys,select_db('user_categorys','cid',$where));
-        return $categorys;
+    $dir_path = DIR.'/templates/home';
+}elseif($c == 'click'){ //过渡
+    $theme = $s_templates['transit'];
+    $dir_path = DIR.'/templates/transit';
+}elseif($c == 'verify'){ //验证
+    if($_GET['c'] == 'click'){
+        $data['title'] = $link['title'];
+        $data['tip'] = '查看加密链接';
+        $data['input_tip'] = '请输入密码';
+        $data['post_url'] = "./index.php?c=verify&type=link_pwd&u={$u}&id={$_GET['id']}";
+        $config = unserialize(get_db("user_config", "v", ["k" => "s_verify_page","uid"=>$USER_DB['ID']]));
+        $data['get_tip'] = $config['link_tip'];
+    }elseif($_GET['c'] == 'share'){
+        $data['title'] = $share['name'];
+        $data['tip'] = '查看分享书签';
+        $data['input_tip'] = '请输入提取码';
+        $data['post_url'] = "./index.php?c=verify&type=share_pwd&u={$u}&share={$_GET['share']}";
+        $config = unserialize(get_db("user_config", "v", ["k" => "s_verify_page","uid"=>$USER_DB['ID']]));
+        $data['get_tip'] = $config['share_tip'];
+    }elseif($_GET['c'] == 'pwd2'){
+        $data['title'] = '验证二级密码';
+        $data['tip'] = '验证二级密码';
+        $data['input_tip'] = '请输入二级密码';
+        $data['post_url'] = "./index.php?c=verify&type=pwd2&u={$u}";
     }
+    $theme = $s_templates['verify'];
+    $dir_path = DIR.'/templates/verify';
+}elseif($c == 'article'){ //文章
+    $theme = $s_templates['article'];
+    $dir_path = DIR.'/templates/article';
+}elseif($c == 'guestbook'){ //留言
+    $theme = $s_templates['guestbook'];
+    $dir_path = DIR.'/templates/guestbook';
+}elseif($c == 'apply'){ //收录
+    $theme = $s_templates['apply'];
+    $dir_path = DIR.'/templates/apply/';
+}elseif($c == $global_config['Login']  || $c == $USER_DB['Login']){ //登录
+    $theme = $s_templates['login'];
+    $dir_path = DIR.'/templates/login';
+}elseif($c == $global_config["Register"] ){ //注册
+    $theme = $global_templates['register'];
+    $dir_path = DIR.'/templates/register';
+}elseif($c == 'guide'){ //引导页,由主页修改$c
+    $theme = $global_templates['guide'];
+    $dir_path = DIR.'/templates/guide';
+    $s_site = unserialize( get_db("global_config", "v", ["k" => "s_site"]));//读入默认站点配置
+}
 
+//模板类型(用于读取配置)
+$templates_type = substr($dir_path, strrpos($dir_path, "/") + 1) ;
+$config_type = in_array($templates_type,['guide','register']) ? 'global' : 'user';
+//无权限或不存在使用默认
+if( !check_purview('theme_in',1) || !is_file("{$dir_path}/{$theme}/index.php")){
+    $theme = 'default';
+    $dir_path .= '/default';
+    $index_path = $dir_path.'/index.php';
+}else{
+    $dir_path .= '/'.$theme;
+    $index_path = $dir_path.'/index.php';
+}
+
+//相对路径
+$theme_dir = str_replace(DIR,'.',$dir_path);
+//主题信息
+$theme_info = json_decode(@file_get_contents($dir_path.'/info.json'),true);
+//主题配置(默认)
+$theme_config = empty($theme_info['config']) ? []:$theme_info['config'];
+
+//读取主题配置
+if(defined('UID') && !in_array($templates_type,['guide','register'])){
+    $theme_config_db = get_db('user_config','v',['t'=>"theme_{$templates_type}",'k'=>$theme,'uid'=>UID]);
+}else{
+    $theme_config_db = get_db('global_config','v',['k'=>"theme_{$templates_type}_{$theme}"]);
+}
+$theme_config_db = unserialize($theme_config_db);
+
+//合并配置数据
+$theme_config = empty($theme_config_db) ? $theme_config : array_merge ($theme_config,$theme_config_db);
+//主题版本
+$theme_ver = Debug ? "{$theme_info['version']}.".time() : $theme_info['version'];
+
+//版权信息
+$copyright = empty($global_config['copyright'])?'<a target="_blank" href="https://gitee.com/tznb/TwoNav">Copyright © TwoNav</a>':$global_config['copyright'];
+
+//备案信息
+$ICP = empty($global_config['ICP'])?'':'<a target="_blank" href="https://beian.miit.gov.cn">'.$global_config['ICP'].'</a>';
+//访问域名(伪静态用)
+$HOST = get_HOST();
+$OEM = get_OEM();
+//静态链接
+define('static_link',$global_config['static_link'] > 0);
+
+$urls['login'] = static_link ? "$HOST/login":"./?c=login";
+$urls['register'] = static_link ? "$HOST/register":"./?c=register";
+if($config_type == 'user'){
+    //载入站点设置
+    $site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
+    //如果没有权限则清除自定义代码
+    if(!check_purview('header',1)){$site['custom_header'] = '';}
+    if(!check_purview('footer',1)){$site['custom_footer'] = '';}
+    
+    //主页标题( 主标题 - 副标题 )
+    $site['Title']  =  $site['title'].(empty($site['subtitle'])?'':' - '.$site['subtitle']);
+    
+    //站点图标
+    $favicon = ( !empty($site['site_icon_file'])) ? $site['site_icon'] : './favicon.ico';
+    //相关入口
+    $UUID = get_UUID();
+    $urls['home'] = static_link ? "$HOST/{$UUID}.html":"./?u={$u}";
+    $urls['admin'] = static_link ? "$HOST/admin-{$UUID}.html":"./?c=admin&u={$u}";
+    $urls['apply'] = static_link ? "$HOST/apply-{$UUID}.html":"./?c=apply&u={$u}";
+    $urls['guestbook'] = static_link ? "$HOST/guestbook-{$UUID}.html":"./?c=guestbook&u={$u}";
+}else{
+    //站点图标
+    $favicon = './favicon.ico';
+}
+
+//是否启用收录
+function is_apply(){
+    $apply_user = unserialize( get_db("user_config", "v", ["k" => "apply","uid"=>UID]));
+    return ($GLOBALS['global_config']['apply'] == 1 && $apply_user['apply'] > 0);
+}
+//是否启用留言
+function is_guestbook(){
+    $guestbook_user = unserialize( get_db("user_config", "v", ["k" => "guestbook","uid"=>UID]) );
+    return ($GLOBALS['global_config']['guestbook'] == 1 && $guestbook_user['allow'] == 1);
+}
+
+//取URL域名
+function get_url_host($url, $get_scheme = false, $get_port = false){
+    $urls = parse_url($url);
+    $host = $urls['host']; //获取主机名
+    $port = $get_port === true ? ( empty( $urls['port'] ) ? '' : ':'.$urls['port']) : '';
+    $scheme = $get_port === true ? ( empty( $urls['scheme'] ) ? 'http://' : $urls['scheme'].'://') : ''; //获取请求协议
+    return $scheme.$host.$port;
+}
+//获取图标URL
+function geticourl($icon,$link){
+    if( !empty( $link['icon']) ){
+        if(substr($link['icon'], 0,4) == '<svg'){
+            return('data:image/svg+xml;base64,'.base64_encode($link['icon']));
+        }else{
+            return($link['icon']);
+        }
+    }
+    if ($site['link_icon'] == 'default'){
+        return($GLOBALS['libs'].'/Other/default.ico');
+    }elseif ($icon ==20){
+        return('./index.php?c=icon&url='.base64_encode($link['real_url']));
+    }elseif ($icon ==21){
+        return('./ico/'.base64_encode($link['real_url']));
+    }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']);
+    }else{
+        return('./system/ico.php?text='.mb_strtoupper(mb_substr($link['title'], 0, 1)));
+    }
+}
+
+//取分类图标
+function get_category_icon($content = ''){
+    return empty($content) ? '' : ( substr($content, 0,4) == '<svg' ? 'data:image/svg+xml;base64,'.base64_encode($content) : $content);
+}
+
+//获取公开分类(返回数组cid)
+function get_open_category(){
+    $where['uid'] = UID;
+    $where['fid'] = 0;
+    $where['status'] = 1;
+    $where['property'] = 0;
+    $categorys = select_db('user_categorys','cid',$where);
+    $where['fid'] = $categorys;
+    $categorys = array_merge ($categorys,select_db('user_categorys','cid',$where));
+    return $categorys;
 }
 
 //获取文章列表
 function get_article_list($category = 0,$limit = 0){
+    if($GLOBALS['global_config']['article'] < 1){
+        return ['data'=>[],'count'=>0];
+    }
     $where['uid'] = UID; 
     if(!is_login()){
         $where['AND']['state'] = 1; //状态筛选
     }else{
         $where['AND']['OR']['state'] = [1,2]; //状态筛选
     }
-    
     //分类筛选
     if($category > 0){
         $where['AND']['category'] = $category;
@@ -119,26 +228,38 @@ function get_article_list($category = 0,$limit = 0){
     }
     //获取文章列表
     $datas = select_db('user_article_list','*',$where);
-    
+    $host = get_HOST();
+    $uuid = get_UUID();
     //查询分类
     $categorys = select_db('user_categorys',['cid(id)','name'],['uid'=>UID]);
     $categorys = array_column($categorys,'name','id');
     //为文章添加分类名称
     foreach ($datas as &$data) {
         $data['category_name'] = $categorys[$data['category']] ?? 'Null';
+        $data['title'] = htmlspecialchars($data['title'],ENT_QUOTES);
+        $data['summary'] = htmlspecialchars($data['summary'],ENT_QUOTES);
+        if(static_link){
+            $data['url'] = "{$host}/article-{$uuid}-{$data['id']}.html";
+        }else{
+            $data['url'] = "./index.php?c=article&id={$data['id']}&u={$u}";
+        }
     }
     return ['data'=>$datas,'count'=>$count];
 }
+
 //根据文章id获取内容
 function get_article_content($id){
+    if($GLOBALS['global_config']['article'] < 1){
+        return ['data'=>[],'count'=>0];
+    }
     $where['uid'] = UID;
     if(!is_login()){
-        $where['AND']['state'] = 1; //状态筛选
-    }else{
-        $where['AND']['OR']['state'] = [1,2]; //状态筛选
+        $where['state'] = 1; //状态筛选
     }
     $where['id'] = $id;
     $data = get_db('user_article_list','*',$where);
+    $data['title'] = htmlspecialchars($data['title'],ENT_QUOTES);
+    $data['summary'] = htmlspecialchars($data['summary'],ENT_QUOTES);
     $data['category_name'] = get_db('user_categorys','name',['uid'=>UID,'cid'=>$data['category']]);
     return $data;
 }
@@ -177,4 +298,70 @@ function get_category_list($layer = false){
         }
     }
     return $categorys;
+}
+
+function get_links2($fid,$limit = 0) {
+    global $site,$u;
+    $fid_s = select_db('user_categorys',['cid','fid','pid'],['uid'=>UID,'status'=>1]);
+    $fid_s = array_column($fid_s,null,'cid');
+    $where['uid'] = UID;
+    $where['fid'] = intval($fid);
+    $where['status'] = 1;
+    $where['ORDER']['weight'] = 'ASC';
+    $where['ORDER']['lid'] = 'ASC';
+    if($limit > 0){
+        $where['LIMIT'] = [0,$limit];
+    }
+    if(!is_login){
+        $where['property'] = 0;
+    }
+    
+    $links = select_db('user_links',['lid(id)','fid','property','title','url(real_url)','url_standby','description','icon','click','pid','extend'],$where);
+    $UUID = ($GLOBALS['global_config']['static_link'] == 2 ? UID : U);
+    foreach ($links as &$link) {
+        $click = false; $lock = false;
+        
+        //直连模式,但存在备用链接
+        if ($site['link_model'] == 'direct' && $site['main_link_priority'] != '3' && !empty($link['url_standby'])){
+            $click = true;
+        }
+        
+        //未登录,判断是否加密
+        if(!is_login){
+            //链接加密了
+            if(!empty($link['pid'])){
+                $click = true; $lock = true;
+            //父分类加密了 或 祖分类加密了
+            }elseif(!empty($fid_s[$link['fid']]['pid']) || (!empty($fid_s[$link['fid']]['fid']) && !empty($fid_s[$fid_s[$link['fid']]['fid']]['pid'])) ){
+                $click = true; $lock = true;
+            }
+        }
+        
+        if($click || $site['link_model'] != 'direct'){
+            $link['url'] = static_link ? "{$GLOBALS['HOST']}/click-{$UUID}-{$link['id']}.html" : "./index.php?c=click&id={$link['id']}&u={$u}";
+            if($lock){
+                $link['real_url'] = $link['url'];
+            }
+        }else{
+            $link['url'] = $link['real_url'];
+        }
+
+        //获取图标链接
+        $link['ico'] = $lock ? $GLOBALS['libs'].'/Other/lock.svg' : geticourl($site['link_icon'],$link);
+    }
+    return $links;
+}
+
+function admin_inlet() {
+    global $USER_DB;
+    $v = unserialize($USER_DB['LoginConfig'])['admin_inlet'];
+    if($v == 'display'){
+        return true;
+    }elseif($v == 'hide'){
+        return false;
+    }elseif($v == 'condition1'){
+        return is_login();
+    }else{
+        return true;
+    }
 }

system/verify.php

@@ -23,8 +23,8 @@ switch ($type) {
         break;
     case "pwd2":
         $LoginConfig = unserialize($USER_DB['LoginConfig']);
-        if($_POST['Password2'] === $LoginConfig['Password2']){
-            setcookie($USER_DB['User'].'_Password2', md5($USER_DB['Password'].$_COOKIE[U.'_key'].$_POST['Password2']), 0,'','',false,true);
+        if($_POST['Password'] === $LoginConfig['Password2']){
+            setcookie($USER_DB['User'].'_Password2', md5($USER_DB['Password'].$_COOKIE[U.'_key'].$_POST['Password']), 0,'','',false,true);
             msg(1,'二级密码正确!');
         }else{
             msg(-1,'二级密码错误!');
@@ -32,7 +32,7 @@ switch ($type) {
         break;
     case "link_pwd":
         //读取链接信息
-        $link = get_db('user_links',['pid','fid','property'],['uid'=>UID,'lid'=>$_POST['id'],'status'=>1]);
+        $link = get_db('user_links',['pid','fid','property'],['uid'=>UID,'lid'=>$_GET['id'],'status'=>1]);
         if(empty($link)){
             msg(-1,'链接不存在'); //查找链接失败
         }
@@ -44,7 +44,7 @@ switch ($type) {
             }
             if($password == $_POST['Password']){
                 session_start();
-                $_SESSION['verify']['link'][$_POST['id']] = $password;
+                $_SESSION['verify']['link'][$_GET['id']] = $password;
                 msg(1,'验证通过');
             }else{
                 msg(-1,'密码错误!');

system/version.txt

@@ -1 +1 @@
-v2.0.34-20230809
+v2.1.12-20240308

templates/admin/index.php

@@ -35,6 +35,7 @@
                     <dl class="layui-nav-child">
                         <dd><a href="javascript:;" layuimini-content-href="LoginDevice" data-title="登录设备">登录设备</a></dd>
                         <dd><a href="javascript:;" layuimini-content-href="SecuritySetting" data-title="安全设置">安全设置</a></dd>
+                        <dd><a href="javascript:;" layuimini-content-href="AccessRestrictions" data-title="访问限制">访问限制</a></dd>
                         <dd><a href="javascript:;" layuimini-content-href="UserPassword" data-title="修改密码">修改密码</a></dd>
                         <dd><hr></dd>
                         <dd><a href="javascript:;" id="logout">退出登录</a></dd>
@@ -82,7 +83,7 @@ layui.config({version:"<?php echo $Ver;?>"});
 layui.use(['layer','miniAdmin'], function () {
     var layer = layui.layer;
     layui.miniAdmin.render({
-        iniUrl: "./index.php?c=admin&page=menu&u="+u,
+        iniUrl: "./index.php?c=api&method=read_data&type=menu&u="+u,
         urlHashLocation: true,
         bgColorDefault: false,
         menuChildOpen: true,

templates/admin/js/category.js

@@ -73,6 +73,7 @@
                 //分类切换按钮
                 $("#btn-type").text(type == '&type=all' ?'收起':'展开');
                 //将一级分类加入下拉框
+                let old_val = $("#fid").val();
                 $("#fid").empty();
                 $("#fid").append("<option value=\"0\">无</option>");
                 for (i = 0; i < count; i++) {
@@ -80,6 +81,8 @@
                         $("#fid").append("<option value=\""+res.data[i].cid+"\">"+res.data[i].name+"</option>");
                     }
                 }
+                $("#fid").val(old_val);
+                form.render('select');
                 limit = false; //取消修改限制
                 layer.closeAll('loading'); //关闭加载层
                 //加载加密分组数据

templates/admin/js/home-root.js

@@ -3,93 +3,122 @@ layui.use(['layer','miniTab'], function(){
     var $ = layui.$;
     var miniTab = layui.miniTab;
     
-    //获取最新版本
-    let latest_version = $("#new_ver").text();
-    //console.log(latest_version);
+    $("#new_ver").append('<span id="sysup" style="cursor:pointer;color:darkgray;">&nbsp;更新系统&nbsp;</span> ');
+    $("#new_ver").append('<i class="fa fa-spinner fa-spin update" style="cursor:pointer;color: rgb(127 137 141);"     title="正在检测更新中"></i>');
     
-    //获取当前版本 
-    let current_version = $("#ver").text();
-    //console.log(current_version);
     
-    let pattern = /\d{8}/;
-    current_version = pattern.exec(current_version)[0];
-    latest_version = pattern.exec(latest_version)[0];
-
-    //如果当前版本小于最新版本，则提示更新
-    if( current_version < latest_version ) {
-        $("#new_ver").append(' <span id="sysup" style="cursor:pointer;color:red;">&nbsp;更新系统</span>');
-        if($("#layuiminiHomeTabId",parent.document).attr('class') == 'layui-this'){
-            $('html,body').animate({scrollTop : $("#msg").offset().top - 20});
-            layer.tips("点击此处更新到最新版","#sysup",{tips: [3, "#ff5722"],time: 60*1000,anim: 6});
-            layer.msg(' 检测到新版本,请尽快更新 ', {offset: 'b',anim: 6,time: 60*1000});
+    // 获取最新信息
+    $.post(get_api('other_services','get_notice') + '&t=' + Math.round(new Date() / 1000),function(data,status){
+        if(data.code == 200) {
+            $("#new_ver a").text(data.version);
+            $('#notice_link').text('');
+            if (Array.isArray(data.notice) && data.notice.length > 0) {  
+                data.notice.forEach(notice => {
+                    $('#notice_link').append(`<div class="layuimini-notice"><div class="layuimini-notice-title"><a href="${notice.url}" target="_blank">${notice.title}</a></div></div>`);
+                });
+            }else{
+                $('.notice1').remove();  
+            }
+            if(data.message.length > 0){
+                $('#notice_text').html(data.message);
+            }else{
+                $('.notice2').remove();  
+            }
+            
         }
-        //点击更新事件
-        $('#sysup').on('click', function(){
-            let tip = layer.open({
-                title:"系统更新"
-                ,content: "1.更新有风险请备份后再更新<br />2.更新后检查主题是否可更新<br />3.更新时请勿有其他操作<br />4.更新时请勿刷新或关闭页面<br />5.确保所有文件(夹)是可写权限"
-                ,btn: ['确定更新', '更新内容', '取消']
-                ,yes: function(index, layero){
-                    let fail = false;
-                    let up_info = {'code':0};
-                    let i=0;
-                    layer.close(tip);
-                    layer.load(1, {shade:[0.3,'#fff']});//加载层
-                    let msg_id = layer.msg('正在准备更新,请勿操作.', {icon: 16,time: 1000*300});
-                    //设置同步模式
-                    $.ajaxSetup({ async : false }); 
-                    
-                    //获取更新信息
-                    $.post(get_api("other_upsys"),{"i":0}, function(data, status) {
-                        up_info = data;
-                    });
-                    
-                    //如果失败
-                    if(up_info.code != 1){
-                        layer.closeAll();
-                        layer.alert(up_info.msg || "错误代码：404",{icon:2,title:'更新失败',anim: 2,shadeClose: false,closeBtn: 0,btn: ['知道了']});
-                        return;
-                    }
-                    //设为异步模式
-                    $.ajaxSetup({ async : true }); 
-                    //开始请求更新
-                    request_update(); let msg = '';
-                    function request_update(){
-                        if( i >= up_info.info.length){
-                            layer.closeAll();
-                            layer.alert('更新完毕,请刷新页面!',{icon:1,title:'更新成功',anim: 2,shadeClose: false,closeBtn: 0,btn: ['刷新页面']},function () {parent.location.reload();});
-                            return;
-                        }else{
-                            i++;
-                        }
-                        $("#layui-layer"+ msg_id+" .layui-layer-padding").html('<i class="layui-layer-face layui-icon layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>[ ' + i + ' / ' + up_info.info.length + ' ] ' + up_info.info[i-1]);
-                        
-                        $.post(get_api("other_upsys"),{"i":i}, function(data, status) {
-                            if (data.code == 1) { 
-                                request_update();
-                            }else{
-                                layer.closeAll();
-                                layer.alert(data.msg || "未知错误,请联系开发者!",{icon:5,title:up_info.info[i-1],anim: 2,shadeClose: false,closeBtn: 0,btn: ['知道了']});
-                            } 
-                        });
-                    }
-                },btn2: function(index, layero){
-                    window.open("https://gitee.com/tznb/TwoNav/releases");
-                },btn3: function(index, layero){
-                    return true;
-                },cancel: function(){ 
-                    return true;
-                }
-            });
-        });
-    }else{
-        $("#new_ver").append(' <span id="sysup" style="cursor:pointer;color: rgb(1, 170, 237);">&nbsp;更新系统</span>');
-        $('#sysup').on('click', function(){
-            layer.alert("暂无可用更新,当前为最新版本",{icon:1,title:"更新系统",anim: "slideDown",shadeClose: true,closeBtn: 0,btn: ['知道了']});
-        });
-    }
+        init_update();
+        $(".update").remove();
+    }).fail(function () {
+        $(".update").remove();
+        layer.msg('请求失败', {icon: 5});
+    });
+    
+    function init_update(){
+        //获取最新版本
+        let latest_version = $("#new_ver").text();
 
- 
+        //获取当前版本 
+        let current_version = $("#ver").text();
+
+        let pattern = /\d{8}/;
+        current_version = pattern.exec(current_version)[0];
+        latest_version = pattern.exec(latest_version)[0];
+    
+        //如果当前版本小于最新版本，则提示更新
+        if( current_version < latest_version ) {
+            $("#sysup").css("color", "red");
+            if($("#layuiminiHomeTabId",parent.document).attr('class') == 'layui-this'){
+                $('html,body').animate({scrollTop : $("#msg").offset().top - 20});
+                layer.tips("点击此处更新到最新版","#sysup",{tips: [3, "#ff5722"],time: 60*1000,anim: 6});
+                layer.msg(' 检测到新版本,请尽快更新 ', {offset: 'b',anim: 6,time: 60*1000});
+            }
+            //点击更新事件
+            $('#sysup').on('click', function(){
+                let tip = layer.open({
+                    title:"系统更新"
+                    ,content: "1.更新有风险请备份后再更新<br />2.更新后检查主题是否可更新<br />3.更新时请勿有其他操作<br />4.更新时请勿刷新或关闭页面<br />5.确保所有文件(夹)是可写权限"
+                    ,btn: ['确定更新', '更新内容', '取消']
+                    ,yes: function(index, layero){
+                        let fail = false;
+                        let up_info = {'code':0};
+                        let i=0;
+                        layer.close(tip);
+                        layer.load(1, {shade:[0.3,'#fff']});//加载层
+                        let msg_id = layer.msg('正在准备更新,请勿操作.', {icon: 16,time: 1000*300});
+                        //设置同步模式
+                        $.ajaxSetup({ async : false }); 
+                        
+                        //获取更新信息
+                        $.post(get_api("other_upsys"),{"i":0}, function(data, status) {
+                            up_info = data;
+                        });
+                        
+                        //如果失败
+                        if(up_info.code != 1){
+                            layer.closeAll();
+                            layer.alert(up_info.msg || "错误代码：404",{icon:2,title:'更新失败',anim: 2,shadeClose: false,closeBtn: 0,btn: ['知道了']});
+                            return;
+                        }
+                        //设为异步模式
+                        $.ajaxSetup({ async : true }); 
+                        //开始请求更新
+                        request_update(); let msg = '';
+                        function request_update(){
+                            if( i >= up_info.info.length){
+                                layer.closeAll();
+                                layer.alert('更新完毕,请刷新页面!',{icon:1,title:'更新成功',anim: 2,shadeClose: false,closeBtn: 0,btn: ['刷新页面']},function () {parent.location.reload();});
+                                return;
+                            }else{
+                                i++;
+                            }
+                            $("#layui-layer"+ msg_id+" .layui-layer-padding").html('<i class="layui-layer-face layui-icon layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>[ ' + i + ' / ' +     up_info.info.length + ' ] ' + up_info.info[i-1]);
+                            
+                            $.post(get_api("other_upsys"),{"i":i}, function(data, status) {
+                                if (data.code == 1) { 
+                                    request_update();
+                                }else{
+                                    layer.closeAll();
+                                    layer.alert(data.msg || "未知错误,请联系开发者!",{icon:5,title:up_info.info[i-1],anim: 2,shadeClose: false,closeBtn: 0,btn: ['知道了']});
+                                } 
+                            });
+                        }
+                    },btn2: function(index, layero){
+                        window.open("https://gitee.com/tznb/TwoNav/releases");
+                    },btn3: function(index, layero){
+                        return true;
+                    },cancel: function(){ 
+                        return true;
+                    }
+                });
+            });
+        }else{
+            $("#sysup").css("color", "rgb(1, 170, 237)");
+            $('#sysup').on('click', function(){
+                layer.alert("暂无可用更新,当前为最新版本",{icon:1,title:"更新系统",anim: "slideDown",shadeClose: true,closeBtn: 0,btn: ['知道了']});
+            });
+        }
+    }
+    
     //查看更新日志
     $('#ver').css({"cursor":"pointer","color":"#01AAED"}); //设置鼠标形状和字体颜色
     $('#ver').attr("title","点击查看更新日志");
@@ -99,7 +128,6 @@ layui.use(['layer','miniTab'], function(){
             title:"更新日志",
         });
     });
-
 });
 
 function get_api(method,type=null){

templates/admin/js/link_list.js

@@ -270,45 +270,6 @@ layui.use(['form','table','dropdown','miniTab'], function () {
                 return true;
             }
           })
-        }else if(event === 'icon_pull'){
-            layer.alert('存在链接图标时如何处理 ?', {icon: 3, title:'请选择',btn: ['保持原样', '重新拉取', '取消'],
-              btnAlign: 'c', 
-              btn1: function(){icon_pull_test('0')}, //跳过
-              btn2: function(){icon_pull_test('1')} //覆盖
-            });
-            function icon_pull_test(cover){
-                let i = 0;
-                let success = 0;
-                let skip = 0;
-                let fail = 0;
-                let total = checkStatus.data.length;
-                layer.load(1, {shade:[0.5,'#fff']});//加载层
-                let msg_id = layer.msg('正在拉取中', {icon: 16,time: 1000*300});
-                icon_pull(i);
-                function icon_pull(id){
-                    if(i >= total){
-                        layer.closeAll();
-                        layer.alert('总计:' + total +',成功:' + success + ',失败:'+ fail + (skip > 0 ? (',跳过:' + skip):'' ),{icon:1,title:'信息',anim: 2,shadeClose: false,closeBtn: 0});
-                        return true;
-                    }
-                    $("#layui-layer"+ msg_id+" .layui-layer-padding").html('<i class="layui-layer-face layui-icon layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>[ ' + i + ' / ' + total + ' ]     正在拉取图标');
-                    $.post(get_api('write_link','icon_pull'),{id:checkStatus.data[i].lid,cover:cover},function(data,status){
-                        if(data.msg == 'success'){
-                            success ++;
-                        }else if(data.msg == 'fail'){
-                            fail ++;
-                        }else if(data.msg == 'skip'){
-                            skip ++;
-                        }else{
-                            layer.closeAll();
-                            layer.alert(data.msg,{icon:2,title:'信息',anim: 2,shadeClose: false,closeBtn: 0});
-                            return true;
-                        }
-                        i ++;
-                        icon_pull(i);
-                    });
-                }
-            }
         }else if(event === 'link_extend'){
             extend_data = '';
             index = layer.open({type: 1,scrollbar: false,shadeClose: true,title: '编辑扩展字段',area : ['100%', '100%'],content: $('.link_extend')});
@@ -322,6 +283,8 @@ layui.use(['form','table','dropdown','miniTab'], function () {
             });
         }else if(event === 'msg_pull'){
             index = layer.open({type: 1,scrollbar: false,shadeClose: true,title: '批量识别链接信息',area : ['100%', '100%'],content: $('.msg_pull')});
+        }else if(event === 'push'){
+            index = layer.open({type: 1,scrollbar: false,shadeClose: true,title: '推送工具',area : ['100%', '100%'],content: $('.push')});
         }
     });
 
@@ -359,6 +322,23 @@ layui.use(['form','table','dropdown','miniTab'], function () {
         return false;
     });
     
+    //开始推送
+    $('#start_push').click(function () {
+        let checkStatus = table.checkStatus('table');
+        tableIds = checkStatus.data.map(function (value) {return value.lid;});
+        tableIds = JSON.stringify(tableIds);
+        $.post(get_api('other_baidu_push'),{'type':'link','push_api':$('#push_api').val(),'id':tableIds},function(data,status){
+            if(data.code == -1){
+                layer.msg(data.msg,{icon: 5});
+            }else if(data.code == 200){
+                layer.alert('成功推送的条数: ' + data.data.success + '<br />当天剩余的可推送条数: ' + data.data.remain + (data.data.not_same_site && data.data.not_same_site.length > 0 ? "<br />未处理的条数(非本站URL): " + data.data.not_same_site.length:'') + (data.data.not_valid && data.data.not_valid.length  > 0 ? "<br />不合法的URL条数: " + data.data.not_valid.length:''));
+            }else{
+                layer.alert('错误代码: ' + data.data.error + '<br />错误描述: ' + data.data.message);
+            }
+        });
+        return false;
+    });
+    
     table.render({
         elem: '#link_extend_list'
         ,height: 'full-150'
@@ -494,6 +474,7 @@ layui.use(['form','table','dropdown','miniTab'], function () {
     //手机端操作
     function load_dropdown(){
         var data = [];
+        data.push({'title':'删除选中','id':'batch_del'});
         $(".layui-btn-normal.layui-hide-xs").each(function(){
             data.push({'title':$(this).text(),'id':$(this).attr('lay-event')});
         });

templates/admin/js/public.js

@@ -73,6 +73,10 @@ function Get_baseUrl() {
     return baseUrl;
 }
 
+function Authorization_Prompt() {
+    layer.alert("您正在使用的是免费版,此功能需购买授权才可使用<br />如果您已购买授权,请在授权管理页面输入并保存<br />然后在更新系统即可解锁全部功能!");
+}
+
 //帮助
 if (typeof jQuery != 'undefined') { 
     $("#help").click(function(){

templates/admin/js/theme.js

@@ -1,140 +1,306 @@
-
-layui.use(['form','miniTab'], function () {
-    var form = layui.form,
-        layer = layui.layer,
-        miniTab = layui.miniTab;
-        miniTab.listen();
-        layer.photos({photos: '.img-list',anim: 5});
+layui.use(function(){
+    var datas,local_theme,active;
+    var buttons = [
+      {'name':'主页模板','dir':'home','display':true},
+      {'name':'过渡模板','dir':'transit','display':true},
+      {'name':'登录模板','dir':'login','display':true},
+      {'name':'验证模板','dir':'verify','display':true},
+      {'name':'收录模板','dir':'apply','display':apply},
+      {'name':'留言模板','dir':'guestbook','display':guestbook},
+      {'name':'文章模板','dir':'article','display':article},
+      {'name':'注册模板','dir':'register','display':is_admin},
+      {'name':'引导页模板','dir':'guide','display':is_admin}
+    ];
+    var $tab = $('#tab');
+    $tab.append('<button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm" id="refresh" title="刷新数据"><i class="layui-icon layui-icon-refresh"></i></button>');
+    $tab.append('<button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm" id="tips" title="提示信息"><i class="layui-icon layui-icon-tips"></i></button>');
+    $tab.append('<button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm" style="display: none;" id="set_up" title="设置"><i class="layui-icon layui-icon-set"></i></button>');
+    buttons.forEach(item => {
+        if(item.display){
+            $tab.append(`<button class="layui-btn layui-btn-sm layui-btn-primary dir" dir="${item.dir}">${item.name}</button>`);
+        }
+    });
     
-    //监听按钮
-    $(".layui-btn-group .layui-btn").click(function () {
-        var dir= $(this).parent().attr("id");//取目录名key
-        var fn= $(this).parent().parent().attr("id");//取模板类型
-        var type = $(this).attr("id");//取事件类型
-        var data = datas[dir].info;
-        //console.log(data);alert('目录:'+dir+',类型:'+type+',模板类型:'+fn);
-        
-        if(type === 'dw' || type === 'up' ){ //下载或更新
-            if (data.desc != null && data.desc.length != 0){ //存在描述时弹窗显示描述
-                layer.open({title:data.name,content: data.desc,btn: ['下载', '取消']
-                    ,yes: function(index, layero){
-                        theme_download(dir,data.name,data.desc,fn);
-                    },btn2: function(index, layero){
-                        return true;
-                    },cancel: function(){ 
-                        return true;
-                    }
-                });
-            }else{
-                theme_download(dir,data.name,data.desc,fn);
-            }
-        }else if(type === 'del' ){ //删除
-            layer.confirm('确认删除?',{icon: 3, title:'温馨提示'}, function(index){
-                theme_del(dir,fn);
+    var tag_btns = $('#tab .dir'); 
+    local_theme = localStorage.getItem(u + "_theme_active") || 'home'; 
+    local_theme = tag_btns.filter('[dir="' + local_theme + '"]');
+    active =  local_theme.length > 0 ? local_theme : tag_btns.first();
+    $(active).addClass('layui-this'); //激活第一个
+    active = $(active).attr('dir'); //取激活的dir
+    load_data(active); //加载数据
+    //刷新按钮
+    $('#refresh').click(function() {
+        load_data(active,true);
+    });
+    //预览按钮
+    $("#preview").click(function() {
+        window.open(`./index.php?c=${loginAddress}&u=${u}`); 
+    });
+    //提示信息
+    $("#tips").click(function() {
+        let tip,url;
+        let title = $("#tab .layui-this:first").text();
+        if(active == 'home'){
+            tip = '部分模板来自其它开源项目, 本程序仅做适配 <br />主题版权归原作者所有, 如有问题请联系! <br />注意: 部分模板可能不支持书签分享';
+        }else if(active == 'login'){
+            tip = '只有使用您的专属登录入口时才会生效,即:概要页面中的专属地址>登录';
+            url = `./index.php?c=${loginAddress}&u=${u}`;
+        }else if(active == 'verify'){
+            tip = '验证加密链接/加密分类/二级密码的页面样式';
+        }else if(active == 'apply'){
+            tip = '收录页面的样式,需在收录管理>设置>申请收录>开启';
+            url = `./index.php?c=apply&u=${u}`;
+        }else if(active == 'guestbook'){
+            tip = '留言板的页面样式,需在留言管理>当前设置>允许留言(点击蓝字切换)';
+            url = `./index.php?c=guestbook&u=${u}`;
+        }else if(active == 'article'){
+            tip = '浏览文章页面的样式,前端显示样式与后端编辑器不一致属正常现象!';
+        }else if(active == 'register'){
+            tip = '注册页面的样式';
+        }else if(active == 'guide'){
+            tip = '引导页面的样式,需将系统设置>默认页面>改为引导页面 <br />未登录时直接访问域名显示引导页 <br />登录后将显示用户主页';
+        }
+        if(url != undefined){
+            layer.alert(tip, {title:title,shadeClose: true,anim: 2,closeBtn: 0,
+                btn: ['预览', '确定'],btn1: function(){
+                    layer.closeAll();
+                    setTimeout(function() { window.open(url) }, 288);
+                }
             });
-            
-        }else if(type === 'config' ){ //配置
-            theme_config(dir,data.name,fn);
-        }else if(type === 'preview' ){ //预览
-            if(fn == 'home'){
-                window.open('./index.php?theme='+dir+'&u='+u);
-            }else{
-                layer.msg('不支持预览此模板', {icon: 3});return;
+        }else{
+            layer.alert(tip,{title:title,shadeClose: true,anim: 2,closeBtn: 0});
+        }
+    });
+    
+    //设置(目前仅用于过渡页)
+    $('#set_up').click(function() {
+        if(active == 'transit'){
+            layer_open2('过渡页面设置',`/?c=admin&page=set_transit&u=${u}`);
+        }else if(active == 'verify'){
+            layer_open2('过渡页面设置',`/?c=admin&page=set_verify&u=${u}`);
+        }
+    });
+    
+    //切换tab按钮 
+    tag_btns.click(function() {
+        const dir = $(this).attr('dir');
+        if(active == dir) return;
+        active = dir;
+        tag_btns.removeClass('layui-this').filter(this).addClass('layui-this');
+        load_data(active);
+        localStorage.setItem(u + "_theme_active",active);
+    });
+    
+    function layer_open2(title,url) {
+        layer.open({type: 2,title: title,shadeClose: true,area : ['100%','100%'],scrollbar: false,resize: false,content: url});
+    }
+    //加载数据
+    function load_data(dir,cache = false) {
+        const set_up = (dir == 'transit' || dir == 'verify');
+        $("#set_up")[ set_up ? "show" : "hide"]();
+        $("#tips")[ !set_up ? "show" : "hide"]();
+        layer.load(1, {shade: [0.5,'#fff']});//加载层
+        layer.msg('正在获取数据..', {icon: 16,time: 1000*300});
+        $.post(`./index.php?c=api&method=read_theme&dir=${dir}&u=${u}&cache=${cache ? 'no':'yes'}`, function (r, status) {
+            layer.closeAll();
+            if (r.code == 1) {
+                if(r.referrer.length > 0){
+                    $('meta[name="referrer"]').replaceWith(`<meta name="referrer" content="${r.referrer}">`); 
+                }
+                datas = r.data;
+                render_data(r);
+            } else {
+                layer.alert("获取数据失败,请重试!",{icon:5,title:'错误',anim: 2,closeBtn: 1,btn: ['刷新页面']},function () {location.reload();});
+            }
+        }).fail(function () {
+            layer.alert("获取数据异常,请重试!",{icon:5,title:'错误',anim: 2,closeBtn: 1,btn: ['刷新页面']},function () {location.reload();});
+        });
+    }
+    
+    //渲染数据
+    function render_data(d){
+        $row = $('.layui-row');
+        $row.html('');
+        for (const key in d.data) {
+            const t = d.data[key];
+            let upordw = '';
+            if(is_admin){
+                if(t.state == 'dw' || t.state == 'up'){
+                    upordw = `<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="${t.state}">${t.state == 'dw' ? '下载' : '更新' }</button>`;
+                }
             }
             
-        }else if(type === 'set' ){ //使用
-            if(fn == 'home'){
-                set_theme(dir,data.name,fn);
-            }else{
-                set_theme2(dir,'',fn);
-            }
-            
-        }else if(type === 'detail' ){ //详情
-            theme_detail(data);
+            let html = 
+                `<div class="layui-col-xs layui-col-sm4 layui-col-md3" id="col_${key}">
+                    <div class="layui-card">
+                        <div class="layui-card-header"> 
+                            <div clas="left" style="float:left; cursor:pointer;" title="${key}" id="t_${key}">${t.name}</div>
+                            <div style="float:right;cursor:pointer;" title="${t.update}">${t.version}</div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="img-list"><img class="screenshot" layer-src="${t.screenshot}" data-original="${t.screenshot}"></div>
+                        </div>
+                        <div class="layui-card-header" style="height: 1px;"></div>
+                        <div class="layui-card-header" style="height: auto;" id="${active}">
+                            <div class="layui-btn-group" id="${key}">
+                                ${upordw}
+                                ${t.state == 'local' ||  t.state == 'up' ? '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>':''}
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="detail">详情</button>
+                                ${(t.state == 'local' || t.state == 'up') &&  active == 'home' ? '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="preview">预览</button>':''} 
+                                ${t.config == '1' && theme_set == true ? '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="config">配置</button>':''} 
+                                ${(t.state == 'local' || t.state == 'up' ) && is_admin == true ? '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="del">删除</button>':''} 
+                            </div>
+                        </div>
+                    </div>
+                </div>`;
+            $row.append(html);
         }
         
-    //监听End
-    })
+        //标记当前模板,使用中靠前显示
+        if(active == 'home'){
+            var current1 = $(`#t_${d.current.home_pc}`);
+            current1.css('color','#03a9f4');
+            current1.prepend('</i><i class="fa fa-tv" title="PC终端正在使用此主题"></i> ');
+            $(`#col_${d.current.home_pc}`).prependTo($row);
+            var current2 = $(`#t_${d.current.home_pad}`);
+            current2.css('color','#03a9f4');
+            current2.prepend('<i class="layui-icon layui-icon-cellphone" title="移动终端正在使用此主题"> ');
+            $(`#col_${d.current.home_pad}`).prependTo($row);
+        }else{
+            if(d.current[active] !== null && d.current[active] !== undefined && d.current[active].length > 0){
+                var current = $(`#t_${d.current[active]}`);
+                current.css('color','#03a9f4');
+                current.prepend('<i class="fa fa-magic" style="color: #03a9f4;" title="正在使用"></i> ');
+                $(`#col_${d.current[active]}`).prependTo($row);
+            }
+        }
+        $(`#col_default`).prependTo($row);
+        //点击图片放大
+        layer.photos({photos: '.img-list',anim: 5});
+        
+        //懒加载预览图
+        $('.screenshot').lazyload({placeholder:"./templates/admin/img/loading.gif",threshold : 600});
+        
+        //监听按钮
+        $(".layui-btn-group .layui-btn").click(function () {
+            var dir= $(this).parent().attr("id");//取目录名key
+            var fn= $(this).parent().parent().attr("id");//取模板类型
+            var type = $(this).attr("id");//取事件类型
+            var data = datas[dir];
+            //console.log('目录:'+dir+',类型:'+type+',模板类型:'+fn);
+            if(type === 'dw' || type === 'up' ){ //下载或更新
+                if (data.desc != null && data.desc.length != 0){ //存在描述时弹窗显示描述
+                    layer.open({title:data.name,content: data.desc,btn: ['下载', '取消']
+                        ,yes: function(index, layero){
+                            theme_download(dir,data.name,data.desc,fn);
+                        },btn2: function(index, layero){
+                            return true;
+                        },cancel: function(){ 
+                            return true;
+                        }
+                    });
+                }else{
+                    theme_download(dir,data.name,data.desc,fn);
+                }
+            }else if(type === 'del' ){ //删除
+                layer.confirm('确认删除?',{icon: 3, title:'温馨提示'}, function(index){
+                    theme_del(dir,fn);
+                });
+            }else if(type === 'config' ){ //配置
+                theme_config(dir,data.name,fn);
+            }else if(type === 'preview' ){ //预览
+                if(fn == 'home'){
+                    window.open('./index.php?theme='+dir+'&u='+u);
+                }else{
+                    layer.msg('不支持预览此模板', {icon: 3});return;
+                }
+            }else if(type === 'set' ){ //使用
+                if(fn == 'home'){
+                    set_theme(dir,data.name,fn);
+                }else{
+                    set_theme2(dir,'',fn);
+                }
+            }else if(type === 'detail' ){ //详情
+                theme_detail(data);
+            }
+        });
+    }
     
+    //下载主题
+    function theme_download(dir,name,desc,fn){
+        layer.msg('下载安装中,请稍后..', {shade:[0.5,'black'],anim: 1,icon: 16,time: 1000*300});
+        $.post(get_api('write_theme','download'),{dir:dir,name:name,fn:fn},function(data,status){
+            layer.closeAll();
+            if( data.code == 1 ) {
+                layer.msg(data.msg, {icon: 1});
+                setTimeout(() => {load_data(active);}, 800);
+            }else{
+                layer.alert(data.msg,{icon:5,title:"错误",anim: "slideDown",shadeClose: true,closeBtn: 0,btn: ['知道了']});
+            }
+        });
+    }
     
-});
-
-//懒加载预览图
-$('.screenshot').lazyload({placeholder:"./templates/admin/img/loading.gif",threshold : 600});
-
-//下载主题
-function theme_download(dir,name,desc,fn){
-    layer.load(1, {shade:[0.1,'#fff']});//加载层
-    layer.msg('下载安装中,请稍后..', {offset: 'b',anim: 1,time: 60*1000});
-    $.post(get_api('write_theme','download'),{dir:dir,name:name,fn:fn},function(data,status){
-        layer.closeAll();
-        if( data.code == 1 ) {
-            layer.msg(data.msg, {icon: 1});
-            setTimeout(() => {location.reload();}, 500);//延迟刷新
-        }else{
-            //layer.msg(data.msg, {icon: 5});
-            layer.alert(data.msg,{icon:5,title:"错误",anim: "slideDown",shadeClose: true,closeBtn: 0,btn: ['知道了']});
-        }
-    });
-}
-//删除主题
-function theme_del(dir,fn){
-    layer.load(1, {shade:[0.1,'#fff']});//加载层
-    layer.msg('正在删除,请稍后..', {offset: 'b',anim: 1,time: 60*1000});
-    $.post(get_api('write_theme','del'),{dir:dir,fn:fn},function(data,status){
-        layer.closeAll();
-        if( data.code == 1 ) {
-            layer.msg(data.msg, {icon: 1});
-            setTimeout(() => {location.reload();}, 500);
-        }else{
-            layer.msg(data.msg, {icon: 5});
-        }
-    });
-}
-//载入主题配置
-function theme_config(key,name,fn){
-     layer.open({
-        type: 2,
-        title: name + ' - 主题配置',
-        shadeClose: true,
-        area : [( $(window).width() < 768 ? '100%' : '568px' ),'100%'],
-        scrollbar: false,
-        resize: false,
-        offset: 'rt',
-        content: './index.php?c=admin&page=config_home&u='+u+'&theme='+key+'&fn='+fn+'&source=admin',
-    });
-}
-//使用主题提示框
-function set_theme(key,name,fn) {
-    layer.open({
-        title:name
-        ,content: '请选择要应用的设备类型 ?'
-        ,btn: ['全部', 'PC', 'Pad']
-        ,yes: function(index, layero){
-            set_theme2(key,'PC/Pad',fn);
-        },btn2: function(index, layero){
-            set_theme2(key,'PC',fn);
-        },btn3: function(index, layero){
-            set_theme2(key,'Pad',fn);
-        },cancel: function(){ 
-            return true;
-        }
-    });
-}
-//使用主题
-function set_theme2(name,type,fn) {
-    console.log(type,name);
-    $.post(get_api('write_theme','set'),{type:type,name:name,fn:fn},function(data,status){
-        if( data.code == 1 ) {
-            layer.msg(data.msg, {icon: 1});
-            setTimeout(() => {location.reload();}, 500);
-        }else{
-            layer.msg(data.msg, {icon: 5});
-        }
-    });
-}
-//主题详情
-function theme_detail(data){
-    layer.open({type: 1,scrollbar: false,maxmin: false,shadeClose: true,resize: false,title: data.name + ' - 主题详情',area: ['60%', '59%'],content: '<body class="layui-fluid"><div class="layui-row" style = "margin-top:1em;"><div class="layui-col-sm9" style = "border-right:1px solid #e2e2e2;"><div style = "margin-left:1em;margin-right:1em;"><img src="'+data.screenshot+'" alt="" style = "max-width:100%;"></div></div><div class="layui-col-sm3"><div style = "margin-left:1em;margin-right:1em;"><h1>'+data.name+'</h1><p>描述：'+data.description+'</p><p>版本：'+data.version+'</p><p>更新时间：'+data.update+'</p><p>作者：'+data.author+'</p><p>主页：<a style = "color:#01AAED;" href="'+data.homepage+'" target="_blank" rel = "nofollow">访问主页</a></p></div></div></div></body>'});
-                    
-}
+    //删除主题
+    function theme_del(dir,fn){
+        layer.load(1, {shade:[0.5,'black']});//加载层
+        layer.msg('正在删除,请稍后..', {offset: 'b',anim: 1,time: 60*1000});
+        $.post(get_api('write_theme','del'),{dir:dir,fn:fn},function(data,status){
+            layer.closeAll();
+            if( data.code == 1 ) {
+                layer.msg(data.msg, {icon: 1});
+                setTimeout(() => {load_data(active);}, 800);
+            }else{
+                layer.msg(data.msg, {icon: 5});
+            }
+        });
+    }
+    
+    //载入主题配置
+    function theme_config(key,name,fn){
+        layer.open({
+            type: 2,
+            title: name + ' - 主题配置',
+            shadeClose: true,
+            area : [( $(window).width() < 768 ? '100%' : '666px' ),'100%'],
+            scrollbar: false,
+            resize: false,
+            offset: 'rt',
+            content: './index.php?c=admin&page=config_home&u='+u+'&theme='+key+'&fn='+fn+'&source=admin',
+        });
+    }
+    
+    //使用主题提示框
+    function set_theme(key,name,fn) {
+        layer.open({
+            title:name
+            ,content: '请选择要应用的设备类型 ?'
+            ,btn: ['全部', 'PC', 'Pad']
+            ,yes: function(index, layero){
+                set_theme2(key,'PC/Pad',fn);
+            },btn2: function(index, layero){
+                set_theme2(key,'PC',fn);
+            },btn3: function(index, layero){
+                set_theme2(key,'Pad',fn);
+            },cancel: function(){ 
+                return true;
+            }
+        });
+    }
+    
+    //使用主题
+    function set_theme2(name,type,fn) {
+        $.post(get_api('write_theme','set'),{type:type,name:name,fn:fn},function(data,status){
+            if( data.code == 1 ) {
+                layer.msg(data.msg, {icon: 1});
+                setTimeout(() => {load_data(active);}, (data.msg == '设置成功' ? 800 : 2000));
+            }else{
+                layer.msg(data.msg, {icon: 5});
+            }
+        });
+    }
+    
+    //主题详情
+    function theme_detail(data){
+        layer.open({type: 1,scrollbar: false,maxmin: false,shadeClose: true,resize: false,title: data.name + ' - 主题详情',area: ['60%', '59%'],content: '<body class="layui-fluid"><div class="layui-row" style = "margin-top    :1em;"><div class="layui-col-sm9" style = "border-right:1px solid #e2e2e2;"><div style = "margin-left:1em;margin-right:1em;"><img src="'+data.screenshot+'" alt="" style = "max-width:100%;"></div></div><div class    ="layui-col-sm3"><div style = "margin-left:1em;margin-right:1em;"><h1>'+data.name+'</h1><p>描述：'+data.description+'</p><p>版本：'+data.version+'</p><p>更新时间：'+data.update+'</p><p>作者：'+data.author+'</p><p    >主页：<a style = "color:#01AAED;" href="'+data.homepage+'" target="_blank" rel = "nofollow">访问主页</a></p></div></div></div></body>'});
+    }
+});

templates/admin/other/verify_link_pwd.php

@@ -1,91 +0,0 @@
-<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
-$tip = $verify_type == 'link_pwd'?'请输入链接密码':'请输入分类密码';
-?>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>查看加密链接 - TwoNav</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta http-equiv="Access-Control-Allow-Origin" content="*">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
-    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css">
-    <!--[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">
-    <div class="login-main">
-        <div class="login-top">
-            <span>TwoNav 查看加密链接</span>
-            <span class="bg1"></span>
-            <span class="bg2"></span>
-        </div>
-        <form class="layui-form login-bottom">
-            <div class="center">
-                <div class="item">
-                    <span class="icon icon-3"></span>
-                    <input type="password" name="Password" lay-verify="required" lay-reqtext="<?php echo $tip;?>" placeholder="<?php echo $tip;?>">
-                    <span class="bind-password icon icon-4"></span>
-                </div>
-            </div>
-            <div class="layui-form-item" style="text-align:center; width:100%;height:100%;margin:0px;">
-                <button class="login-btn" lay-submit="" lay-filter="verify">验证</button>
-            </div>
-        </form>
-    </div>
-</div>
-<div class="footer">
-     <?php echo $copyright.( !empty($ICP)?'<span class="padding-5">|</span>':'').$ICP; ?>
-</div>
-<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>
-    layui.use(['form','jquery'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
-            layer = layui.layer;
-
-        $('.bind-password').on('click', function () {
-            if ($(this).hasClass('icon-5')) {
-                $(this).removeClass('icon-5');
-                $("input[name='Password']").attr('type', 'password');
-            } else {
-                $(this).addClass('icon-5');
-                $("input[name='Password']").attr('type', 'text');
-            }
-        });
-
-        form.on('submit(verify)', function (data) {
-            data = data.field;
-
-            if (data.Password == '') {
-                layer.msg('密码不能为空');
-                return false;
-            }
-            data.id = '<?php echo $_GET['id']?>';
-            $.post('./index.php?c=verify&type=link_pwd&u=<?php echo U?>',data,function(re,status){
-                if(re.code == 1) {
-                    layer.msg('正在验证..', {icon: 16,shade: [0.1, '#f5f5f5'],scrollbar: false,offset: 'auto',time: 888,
-				        end: function() {
-					        window.location.reload();
-					        return false;
-				        }
-			        });
-                }else{
-                    layer.msg(re.msg, {icon: 5});
-                }
-            });
-            return false;
-        });
-    });
-</script>
-</body>
-</html>

templates/admin/other/verify_pwd2.php

@@ -1,90 +0,0 @@
-<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
-$tip ='请输入二级密码';
-?>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>查看加密链接 - TwoNav</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta http-equiv="Access-Control-Allow-Origin" content="*">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
-    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css">
-    <!--[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">
-    <div class="login-main">
-        <div class="login-top">
-            <span>TwoNav 验证二级密码</span>
-            <span class="bg1"></span>
-            <span class="bg2"></span>
-        </div>
-        <form class="layui-form login-bottom">
-            <div class="center">
-                <div class="item">
-                    <span class="icon icon-3"></span>
-                    <input type="password" name="Password2" lay-verify="required" lay-reqtext="<?php echo $tip;?>" placeholder="<?php echo $tip;?>">
-                    <span class="bind-password icon icon-4"></span>
-                </div>
-            </div>
-            <div class="layui-form-item" style="text-align:center; width:100%;height:100%;margin:0px;">
-                <button class="login-btn" lay-submit="" lay-filter="verify">验证</button>
-            </div>
-        </form>
-    </div>
-</div>
-<div class="footer">
-     <?php echo $copyright.( !empty($ICP)?'<span class="padding-5">|</span>':'').$ICP; ?>
-</div>
-<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>
-    layui.use(['form','jquery'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
-            layer = layui.layer;
-
-        $('.bind-password').on('click', function () {
-            if ($(this).hasClass('icon-5')) {
-                $(this).removeClass('icon-5');
-                $("input[name='Password']").attr('type', 'password');
-            } else {
-                $(this).addClass('icon-5');
-                $("input[name='Password']").attr('type', 'text');
-            }
-        });
-
-        form.on('submit(verify)', function (data) {
-            data = data.field;
-
-            if (data.Password == '') {
-                layer.msg('密码不能为空');
-                return false;
-            }
-            $.post('./index.php?c=verify&type=pwd2&u=<?php echo U?>',data,function(re,status){
-                if(re.code == 1) {
-                    layer.msg('验证成功,请稍后..', {icon: 6,time: 1000,
-				        end: function() {
-					        window.location.reload();
-					        return false;
-				        }
-			        });
-                }else{
-                    layer.msg(re.msg, {icon: 5});
-                }
-            });
-            return false;
-        });
-    });
-</script>
-</body>
-</html>

templates/admin/other/verify_share_pwd.php

@@ -1,88 +0,0 @@
-<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}?>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>提取书签 - TwoNav</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta http-equiv="Access-Control-Allow-Origin" content="*">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
-    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css">
-    <!--[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">
-    <div class="login-main">
-        <div class="login-top">
-            <span>TwoNav 提取书签</span>
-            <span class="bg1"></span>
-            <span class="bg2"></span>
-        </div>
-        <form class="layui-form login-bottom">
-            <div class="center">
-                <div class="item">
-                    <span class="icon icon-3"></span>
-                    <input type="text" name="Password" lay-verify="required" lay-reqtext="请输入提取码" placeholder="请输入提取码" value="<?php echo $_GET['pwd'];?>">
-                    <span class="bind-password icon icon-4 icon-5"></span>
-                </div>
-            </div>
-            <div class="layui-form-item" style="text-align:center; width:100%;height:100%;margin:0px;">
-                <button class="login-btn" lay-submit="" lay-filter="verify">提取</button>
-            </div>
-        </form>
-    </div>
-</div>
-<div class="footer">
-     <?php echo $copyright.( !empty($ICP)?'<span class="padding-5">|</span>':'').$ICP; ?>
-</div>
-<script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $layui['js']; ?>"></script>
-<script>
-    layui.use(['form','jquery'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
-            layer = layui.layer;
-
-        $('.bind-password').on('click', function () {
-            if ($(this).hasClass('icon-5')) {
-                $(this).removeClass('icon-5');
-                $("input[name='Password']").attr('type', 'password');
-            } else {
-                $(this).addClass('icon-5');
-                $("input[name='Password']").attr('type', 'text');
-            }
-        });
-
-        form.on('submit(verify)', function (data) {
-            data = data.field;
-
-            if (data.Password == '') {
-                layer.msg('密码不能为空');
-                return false;
-            }
-            
-            $.post('./index.php?c=verify&type=share_pwd&u=<?php echo U;?>&share=<?php echo $_GET['share'];?>',data,function(re,status){
-                if(re.code == 1) {
-                    layer.msg('正在提取..', {icon: 16,shade: [0.1, '#f5f5f5'],scrollbar: false,offset: 'auto',time: 888,
-				        end: function() {
-					        window.location.reload();
-					        return false;
-				        }
-			        });
-                }else{
-                    layer.msg(re.msg, {icon: 5});
-                }
-            });
-            return false;
-        });
-    });
-</script>
-</body>
-</html>

templates/admin/page/AccessRestrictions.php

@@ -0,0 +1,71 @@
+<?php $title='访问限制'; require 'header.php';?>
+<style>
+.layui-btn-container .layui-btn{border-width: 1px; border-style: solid; border-color: #FF5722!important; color: #FF5722!important;background: none;height: 30px; line-height: 30px; padding: 0 10px; font-size: 12px;}
+</style>
+<body>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+    <form class="layui-form" lay-filter="form">
+        <div class="layui-form layuimini-form layui-form-pane">
+            <blockquote class="layui-elem-quote layui-text" style="">
+                此功能<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享
+            </blockquote>
+            <blockquote class="layui-elem-quote layui-text" style="">白名单模式 > 除了名单中的账号和分组一律不可访问您的主页<br />黑名单模式 > 黑名单中的账号和分组不可访问您的主页<br />匹配优先级: 用户组名单 > 账号名单<br />使用黑白名单模式时,未登录账号不可访问您的主页<br />名单中多个账号或分组时用半角的逗号,间隔<br />新增功能,难免会有BUG,如有遇到请反馈并关闭该功能</blockquote>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">访问限制</label>
+                <div class="layui-input-inline" >
+                    <select name="mode">
+                        <option value="0" selected="">无限制</option>
+                        <option value="white">白名单模式</option>
+                        <option value="black">黑名单模式</option>
+                    </select>
+                </div>
+                <div class="layui-form-mid layui-word-aux"></div>
+            </div>
+            <div class="layui-form-item layui-form-text">
+                <label class="layui-form-label">用户组名单</label>
+                <div class="layui-input-block">
+                    <textarea name="users_list" class="layui-textarea" placeholder='填写用户组代号,例如: group1,group2,group3'></textarea>
+                </div>
+            </div>
+            <div class="layui-form-item layui-form-text">
+                <label class="layui-form-label">账号名单</label>
+                <div class="layui-input-block">
+                    <textarea name="user_list" class="layui-textarea" placeholder='填写用户账号,例如: user1,user2,user3'></textarea>
+                </div>
+            </div>
+            <div class="layui-form-item layui-form-text">
+                <label class="layui-form-label">限制提示</label>
+                <div class="layui-input-block">
+                    <textarea name="prompt" class="layui-textarea" placeholder='留空时: 显示引导页
+以http开头时: 跳转到url
+其他内容则直接显示'></textarea>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-input-block"><button class="layui-btn layui-btn-normal" lay-submit lay-filter="save">确认保存</button></div>
+            </div>
+        </div>
+    </form>
+    </div>
+</div>
+<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
+<?php load_static('js.layui');?>
+<script>
+layui.use(['jquery','form','miniTab'], function () {
+    var form = layui.form;
+    var layer = layui.layer;
+    var $ = layui.jquery;
+    var miniTab = layui.miniTab;
+    miniTab.listen();
+
+    //监听提交
+    form.on('submit(save)', function (data) {
+        return false;
+    }); 
+    
+});
+</script>
+</body>
+</html>

templates/admin/page/SecuritySetting.php

@@ -25,7 +25,17 @@ $LoginConfig['totp_key'] = empty($LoginConfig['totp_key']) ? '0':'1';?>
                 </div>
                 <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="admin_inlet" >
+                        <option value="display" selected>显示</option>
+                        <option value="hide">隐藏</option>
+                        <option value="condition1">登录时显示</option>
+                    </select>
+                </div>
+                <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" >
@@ -89,7 +99,6 @@ $LoginConfig['totp_key'] = empty($LoginConfig['totp_key']) ? '0':'1';?>
                 </div>
                 <div class="layui-form-mid layui-word-aux">部分主题和插件需设为兼容 <a href="javascript:;" layuimini-content-href="Token" data-title="Token"><font color="red"> 获取API ( Token )</font></a></div>
             </div>
-            
             <div class="layui-form-item">
                 <label class="layui-form-label">登录后</label>
                 <div class="layui-input-inline" >

templates/admin/page/SiteSetting.php

@@ -69,20 +69,25 @@
                 <label class="layui-form-label">链接图标</label>
                 <div class="layui-input-inline" >
                     <select name="link_icon">
-                        <option value="0" selected>离线图标</option>
+                        <option value="0" selected>离线图标(首字图标)</option>
                         <option value="20" >本地服务</option>
                         <option value="21" >本地服务(伪静态)</option>
                         <option value="2" >favicon.png.pub (小图标)</option>
-                        <option value="4" >api.15777.cn</option>
-                        <option value="5" >favicon.cccyun.cc</option>
                         <option value="6" >api.iowen.cn</option>
-                        <!--<option value="7" >toolb.cn</option>-->
-                        <!--<option value="8" >apis.jxcxin.cn</option>-->
                     </select>
                 </div>
                 <div class="layui-form-mid layui-word-aux">所有API接口均由其他大佬提供!若有异常请尝试更换接口!</div>
             </div>
-            
+            <div class="layui-form-item">
+                <label class="layui-form-label">重复链接</label>
+                <div class="layui-input-inline" >
+                    <select name="repeat_url" >
+                        <option value="0" selected>禁止</option>
+                        <option value="1">允许</option>
+                    </select>
+                </div>
+                <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" >
@@ -194,13 +199,18 @@ layui.use(['jquery','form','upload'], function () {
     });
     //监听提交
     form.on('submit(save)', function (data) {
+        layer.load(0);
         $.post('./index.php?c=api&method=write_site_setting&u='+u,data.field,function(data,status){
+            layer.closeLast('loading');
             if(data.code == 1) {
                 layer.msg(data.msg, {icon: 1});
             }else{
                 layer.msg(data.msg, {icon: 5});
             }
-        });
+        }).fail(function(xhr, textStatus, errorThrown) {  
+            layer.closeLast('loading');
+            layer.alert('请求失败');
+        }); 
         return false;
     }); 
 

templates/admin/page/data_control.php

@@ -34,7 +34,7 @@
             <div class="layui-progress" lay-filter="progress" id="progress" style="display:none;">
                 <div class="layui-progress-bar"></div>
             </div>
-            <blockquote class="layui-elem-quote" style="margin-top: 10px;border-left: 5px solid #FF5722; color: #FF5722;" id='guide'>第一步:请上传数据,支持: db3 / html 格式(最大10M),使用前请参考<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968661&doc_id=3767990" target="_blank" rel = "nofollow">帮助文档</a></blockquote>
+            <blockquote class="layui-elem-quote" style="margin-top: 10px;border-left: 5px solid #FF5722; color: #FF5722;" id='guide'>第一步:请上传数据,支持: db3 / html / itabdata 格式(最大10M),使用前请参考<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968661&doc_id=3767990" target="_blank" rel = "nofollow">帮助文档</a></blockquote>
             
             <div class="layui-form-item" style="display:none;" id='fid'>
                 <label class="layui-form-label">所属分类</label>
@@ -267,7 +267,7 @@ layui.use(['layer','element','upload','form','table'], function(){
     var up_bookmark = upload.render({
         elem: '#up_html'
         ,url: get_api('write_data_control','upload')
-        ,exts: 'html|db3'
+        ,exts: 'html|db3|itabdata'
         ,accept: 'file'
         ,size: 1024 * 10
         ,data: {"page_sid":page_sid}
@@ -290,6 +290,12 @@ layui.use(['layer','element','upload','form','table'], function(){
                     $("#property").hide();
                     $("#attr").show();
                     $("#source").show();
+                }else if(suffix == 'itabdata'){
+                    $("#fid").hide();
+                    $("#AutoClass").hide();
+                    $("#property").hide();
+                    $("#attr").hide();
+                    $("#source").hide();
                 }else{
                     $("#fid").show();
                     $("#AutoClass").show();

templates/admin/page/expand/apply-admin.php

@@ -1,8 +1,8 @@
 <?php 
-if($global_config['apply'] != 1 || !check_purview('apply',1)){
-    require(DIR.'/templates/admin/page/404.php');
-    exit;
-}
+// if($global_config['apply'] != 1 || !check_purview('apply',1)){
+//     require(DIR.'/templates/admin/page/404.php');
+//     exit;
+// }
 $data = unserialize( get_db("user_config", "v", ["k" => "apply","uid"=>UID]) );
 $title='收录管理';$awesome=true; require dirname(__DIR__).'/header.php'; 
 ?>

templates/admin/page/expand/article-edit.php

@@ -1,8 +1,6 @@
 <?php 
-if($global_config['article'] != 1 || !check_purview('article',1)){
-    require(DIR.'/templates/admin/page/404.php');
-    exit;
-}
+
+
 $article_id = Get('id');
 $mode = empty($article_id) ? 'add' : 'edit' ;
 
@@ -45,7 +43,7 @@ require dirname(__DIR__).'/header.php'  ?>
         <div class="layui-form-item ">
          <label class="layui-form-label w40">标题:</label>
           <div class="layui-input-block">
-           <input class="layui-input" name="title" placeholder='请输入文章标题' autocomplete="off" value="<?php echo $data['title'];?>">
+           <input class="layui-input" name="title" placeholder='请输入文章标题' autocomplete="off" value="<?php echo htmlspecialchars($data['title'],ENT_QUOTES);?>">
           </div>
         </div>
         
@@ -73,7 +71,7 @@ require dirname(__DIR__).'/header.php'  ?>
         <div class="layui-form-item">
          <label class="layui-form-label w40">摘要:</label>
           <div class="layui-input-block">
-            <textarea name="summary" rows ="2" placeholder="文章摘要,留空时自动获取" class="layui-textarea" style="min-height: 45px;"><?php echo $data['summary'];?></textarea>
+            <textarea name="summary" rows ="2" placeholder="文章摘要,留空时自动获取" class="layui-textarea" style="min-height: 45px;"><?php echo htmlspecialchars($data['summary'],ENT_QUOTES);?></textarea>
           </div>
         </div>
     
@@ -82,7 +80,7 @@ require dirname(__DIR__).'/header.php'  ?>
           <div class="layui-input-block" id="editor—wrapper">
             <div id="toolbar-container"></div>
             <div id="editor-container"></div>
-            <textarea name="content" id="content" class="layui-textarea layui-hide"><?php echo $data['content'] ?? '<p><br></p>';?></textarea>
+            <textarea name="content" id="content" class="layui-textarea layui-hide"><?php echo htmlspecialchars($data['content'],ENT_QUOTES) ?? '<p><br></p>';?></textarea>
           </div>
         </div>
         
@@ -199,6 +197,7 @@ const toolbar = createToolbar({
 })
 
 
+    
 layui.use(['form','upload'], function () {
     var form = layui.form,
         upload = layui.upload;
@@ -291,6 +290,18 @@ layui.use(['form','upload'], function () {
         });
         return false;
     });
+    $(".content").dblclick(function(){
+        layer.prompt({
+            formType: 2,
+            value: editor.getHtml(),
+            maxlength:9999999,
+            title: 'HTML代码编辑',
+            area: ['800px', '350px']
+        }, function(value, index, elem){
+            editor.setHtml(value);
+            layer.close(index); // 关闭层
+        });
+    });
 });
 
 function truncateString(str,n) {

templates/admin/page/expand/article-list.php

@@ -1,13 +1,5 @@
 <?php 
-if($global_config['article'] != 1 || !check_purview('article',1)){
-    require(DIR.'/templates/admin/page/404.php');
-    exit;
-}
-//读取设置
-$s_site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
-$set['visual'] = $s_site['article_visual'] ?? '1';
-$set['icon'] = $s_site['article_icon'] ?? '1';
-$title='文章列表';
+
 require dirname(__DIR__).'/header.php'  ?>
 <body>
 <div class="layuimini-container">
@@ -131,6 +123,30 @@ require dirname(__DIR__).'/header.php'  ?>
         </pre>
    </form>
 </ul>
+<ul class="push" style="margin-top: 18px;display:none;padding-right: 10px;padding-left: 10px;">
+    <form class="layui-form layuimini-form" lay-filter="push">
+        <pre class="layui-code" >使用API推送功能会达到怎样效果
+及时发现：可以缩短百度爬虫发现您站点新链接的时间，使新发布的页面可以在第一时间被百度收录
+保护原创：对于网站的最新原创内容，使用API推送功能可以快速通知到百度，使内容可以在转发之前被百度发现
+百度官方说明: https://ziyuan.baidu.com/linksubmit/index
+注意事项: 推送的URL是静态格式,所以请务必正确配置好伪静态!
+伪静态配置: 请前往站长工具>生成伪静态,并复制内容配置到服务器 (仅针对Nginx)
+</pre>
+        <div class="layui-form-item">
+            <label class="layui-form-label">接口地址</label>
+                <div class="layui-input-block">
+                    <input type="text" name="push_api" id="push_api" placeholder="请输入接口调用地址如 http://data.zz.baidu.com/urls?site=lm21.top&token=xxxxxx" 
+                    value="<?php echo get_db("user_config", "v", ["k" => "baidu_push_api","uid"=>UID]); ?>" class="layui-input">
+                </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn layui-btn-warm" type="button" id="close" >关闭</button>
+                <button class="layui-btn layui-btn-normal" lay-submit lay-filter="start_push" id="start_push">开始</button>
+            </div>
+        </div>
+    </form>
+</ul>
 <script>
 layui.use(['form','table','dropdown','miniTab'], function () {
     var $ = layui.jquery;
@@ -145,7 +161,7 @@ layui.use(['form','table','dropdown','miniTab'], function () {
       {type:'checkbox'} //开启复选框
       ,{ title:'操作', toolbar: '#tablebar',width:110}
       ,{field: 'title', title: '标题', minWidth:200,templet: function(d){
-          return '<a style="color:#3c78d8" target="_blank" href="./?c=article&id=' +d.id + '&u=' + u + '" title="' + d.summary + '">'+d.title+'</a>'
+          return '<a style="color:#3c78d8" target="_blank" href="./?c=article&id=' +d.id + '&u=' + u + '" title="' + htmlspecialchars(d.summary) + '">'+htmlspecialchars(d.title)+'</a>'
       }}
       ,{field:'category',title:'分类',width:100,templet: function(d){
           return d.category_name;
@@ -215,6 +231,9 @@ layui.use(['form','table','dropdown','miniTab'], function () {
             },{
               title: '批量删除',
               id: 'del_article'
+            },{
+              title: '百度推送',
+              id: 'push'
             }],
             click: function(obj){
                 let checkStatus = table.checkStatus('table').data;
@@ -248,11 +267,21 @@ layui.use(['form','table','dropdown','miniTab'], function () {
                             layer.msg(data.msg || '未知错误',{icon: 5});
                         }
                     });
+                }else if(obj.id == 'push'){
+                    index = layer.open({type: 1,scrollbar: false,shadeClose: true,title: '推送工具',area : ['100%', '100%'],content: $('.push')});
                 }
             }
         });
     }
-
+    //开始推送
+    $('#start_push').click(function () {
+        Authorization_Prompt();
+        return false;
+    });
+    //关闭按钮
+    $(document).on('click', '#close', function() {
+        layer.close(index);//关闭当前页
+    });
     //输入框回车事件和搜索按钮点击事件
     $('#keyword, #search').on('keydown click', function(e) {
         if ( (e.target.id === 'keyword' &&  e.keyCode === 13) || (e.target.id === 'search' && e.type === 'click') ) {
@@ -274,20 +303,7 @@ layui.use(['form','table','dropdown','miniTab'], function () {
     table.on('toolbar(table)', function (obj) {
         var btn = obj.event;
         if (btn == 'add_article') { //添加文章
-            layer.open({
-                title: false,
-                type: 2,
-                scrollbar: false,
-                shade: 0.2,
-                maxmin:false,
-                shadeClose: true,
-                closeBtn:0,
-                area: ['100%', '100%'],
-                content: './?c=admin&page=expand/article-edit&u=' + u,
-                end: function(){
-                    search();
-                }
-            });
+            Authorization_Prompt();
         }else if(btn == 'set'){ //设置
             index = layer.open({type: 1,scrollbar: false,shadeClose: true,title: false ,area : ['100%', '100%'],closeBtn:0,content: $('.set')});
         }else{ //综合批量操作
@@ -333,33 +349,13 @@ layui.use(['form','table','dropdown','miniTab'], function () {
                 });
             });
         }else if(btn === 'edit'){
-            layer.open({
-                title: false,
-                type: 2,
-                scrollbar: false,
-                shade: 0.2,
-                maxmin:false,
-                shadeClose: true,
-                closeBtn:0,
-                area: ['100%', '100%'],
-                content: './?c=admin&page=expand/article-edit&id='+data.id+'&u=' + u,
-                end: function(){
-                    search();
-                }
-            });
+            Authorization_Prompt();
         }
     });
     //设置相关
     form.val('set_form', <?php echo json_encode($set);?>);
     $('#save_set').on('click', function(){
-        $.post(get_api('write_article','save_article_set'),form.val('set_form'),function(data,status){
-            if(data.code == 1) {
-                layer.close(index);
-                layer.msg('操作成功', {icon: 1});
-            }else{
-                layer.msg(data.msg || '未知错误',{icon: 5});
-            }
-        });
+        Authorization_Prompt();
         return false;
     });
     //取消按钮
@@ -370,19 +366,13 @@ layui.use(['form','table','dropdown','miniTab'], function () {
     
     //批量修改分类
     $('#batch_category').click(function () {
-        fid = $('#batch_category_fid').val();
-        $.post(get_api('write_article','up_category'),{'id':tableIds,'category_id':fid},function(data,status){
-            if(data.code == 1) {
-                search();
-                layer.close(index);
-                layer.msg('操作成功', {icon: 1});
-            }else{
-                layer.msg(data.msg || '未知错误',{icon: 5});
-            }
-        });
+        Authorization_Prompt();
         return false;
     });
     
+    function htmlspecialchars(str) {
+        return $('<div/>').text(str).html();
+    }
 });
 
 </script>

templates/admin/page/expand/guestbook-admin.php

@@ -1,8 +1,5 @@
 <?php 
-if($global_config['guestbook'] != 1 || !check_purview('guestbook',1)){
-    require(DIR.'/templates/admin/page/404.php');
-    exit;
-}
+
 
 $s = unserialize( get_db("user_config", "v", ["k" => "guestbook","uid"=>UID]) );
 if(empty($s)){
@@ -14,27 +11,9 @@ if(!Check_Path("data/user/{$u}/MessageBoard")){
 $dir = DIR."/data/user/{$u}/MessageBoard/";
 
 if($_POST['type'] == 'set'){
-    $s['allow'] = $_POST['set'];
-    write_user_config('guestbook',$s,'config','留言板配置');
-    msg(1,'操作成功');
+    msg(-1,'免费不支持此功能');
 }elseif($_POST['type'] == 'del'){
-    if($_POST['name'] == 'help'){
-        $s['help'] = 'del';
-        write_user_config('guestbook',$s,'config','留言板配置');
-        msg(1,'删除成功');
-    }
-    //文件名检测
-    if( !preg_match_all('/^\d+_\d+\.json$/',$_POST['name']) ) {
-        msg(-1,'数据库名称不合法！');
-    }
-    $path = DIR."/data/user/{$u}/MessageBoard/".$_POST['name'];
-    if(!file_exists($path)){
-        msg(-1,'文件不存在');
-    }else if(unlink($path)){
-        msg(1,'删除成功');
-    }else{
-        msg(-1,'删除失败');
-    }
+    msg(-1,'免费不支持此功能');
 }
 
 
@@ -104,7 +83,7 @@ $title='留言管理';require dirname(__DIR__).'/header.php';
 <body>
 <div class="layuimini-container">
     <div class="layuimini-main">
-        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend><a style="cursor:pointer;" title="点击打开客户留言页面" rel = "nofollow" href="./?c=guestbook&u=<?php echo U;?>" target="_blank">TowNav 极简留言板</a></legend></fieldset>
+        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend><a style="cursor:pointer;" title="点击打开客户留言页面" rel = "nofollow" href="<?php echo (static_link ? get_surl("guestbook-{UUID}.html"):"./?c=guestbook&u={$u}") ;?>" target="_blank">TowNav 极简留言板</a></legend></fieldset>
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
             <legend>当前设置:<a style="cursor:pointer;" title="点击切换" rel = "nofollow" onclick = "set('<?php echo $s['allow']== '1'?'0':'1';?>')"><?php echo $s['allow']== '1'?'允许留言':'禁止留言';?></a>
           </legend>

templates/admin/page/expand/guestbook-user.php

@@ -54,7 +54,7 @@
   </div>
   <div class="layui-form-item" style="padding-top: 10px;">
     <div class="layui-input-block">
-      <?php if($s['allow'] == '1'){ echo '<button class="layui-btn" lay-submit lay-filter="Submit">提交</button>';} ?>
+      <button class="layui-btn" lay-submit lay-filter="Submit">提交</button>
     </div>
   </div>
 </form>

templates/admin/page/expand/sitemap.php

@@ -0,0 +1,206 @@
+<?php 
+if($USER_DB['UserGroup'] != 'root'){$content='您没有权限访问此页面'; require(DIR.'/templates/admin/page/404.php');exit;}
+$title='站点地图';require(dirname(__DIR__).'/header.php');
+?>
+<body>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+    <form class="layui-form" lay-filter="form">
+        <div class="layui-form layuimini-form layui-form-pane">
+            <blockquote class="layui-elem-quote layui-text" style="">
+                2023.09.05 新增功能 (授权用户专享),如有问题请及时反馈 ! <br />
+                URL格式: 静态地址需配置伪静态,二级域名需配置DNS泛解析和服务器绑定并已开启功能<br />
+<?php if(preg_match('/nginx/i',$_SERVER['SERVER_SOFTWARE']) ){ ?>
+                注意: 此功能依赖伪静态,请前往站长工具>生成伪静态,并复制内容配置到服务器
+<?php } ?>
+            </blockquote>
+            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>综合配置</legend></fieldset>
+            <div class="layui-form-item">
+                <label class="layui-form-label">功能开关</label>
+                <div class="layui-input-inline" >
+                    <select name="switch">
+                        <option value="0" selected>关闭</option>
+                        <option value="1">开启</option>
+                    </select>
+                </div>
+                <div class="layui-form-mid layui-word-aux">关闭后将禁止生成和读取站点地图</div>
+            </div>
+            
+            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>自动生成</legend></fieldset>
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label">被动请求</label>
+                <div class="layui-input-inline" >
+                    <select name="beidong">
+                        <option value="0">不生成</option>
+                        <option value="1">生成</option>
+                    </select>
+                </div>
+                <div class="layui-form-mid layui-word-aux">当请求根目录的<a href="./sitemap.xml" target="_blank">sitemap.xml</a>是否生成地图数据(需配置伪静态),受更新频率的限制</div>
+            </div>
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label">主动更新</label>
+                <div class="layui-input-inline" >
+                    <select name="zhudong">
+                        <option value="0" selected>关闭</option>
+                        <option value="1">添加链接时</option>
+                    </select>
+                </div>
+                <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="changefreq">
+                        <option value="monthly">每月</option>
+                        <option value="weekly">每周</option>
+                        <option value="daily" selected>每天</option>
+                        <option value="hourly">每小时</option>
+                        <option value="minute">每分钟(不推荐)</option>
+                        <option value="second">每秒钟(仅用于测试)</option>
+                    </select>
+                </div>
+                <div class="layui-form-mid layui-word-aux">根据自己站点的更新频率设置</div>
+            </div>
+            
+            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>用户主页</legend></fieldset>
+            <div class="layui-form-item">
+                <label class="layui-form-label">URL格式</label>
+                <div class="layui-input-block" >
+                    <select name="user_homepage">
+                        <option value="0" >不生成</option>
+                        <option value="1" >动态地址 | http://example.com/index.php?u=user</option>
+                        <option value="2" selected="">静态地址 | http://example.com/user.html</option>
+                        <option value="3" >二级域名 | http://user.example.com</option>
+                    </select>
+                </div>
+            </div>
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label">权重</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="user_homepage_weight" lay-verify="required" value="0.9" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label">更新频率</label>
+                <div class="layui-input-inline" >
+                    <select name="user_homepage_changefreq"></select>
+                </div>
+            </div>
+            
+            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>过度页面</legend></fieldset>
+            <div class="layui-form-item">
+                <label class="layui-form-label">URL格式</label>
+                <div class="layui-input-block" >
+                    <select name="click_page">
+                        <option value="0" >不生成</option>
+                        <option value="1" >动态地址 | http://example.com/index.php?c=click&id=1&u=user</option>
+                        <option value="2" selected="">静态地址 | http://example.com/user/click/1.html</option>
+                        <option value="2" selected="">静态地址 | http://example.com/click-user-1.html</option>
+                    </select>
+                </div>
+            </div>
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label">权重</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="click_page_weight" lay-verify="required" value="0.8" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label">更新频率</label>
+                <div class="layui-input-inline" >
+                    <select name="click_page_changefreq"></select>
+                </div>
+            </div>
+            
+            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>文章页面</legend></fieldset>
+            <div class="layui-form-item">
+                <label class="layui-form-label">URL格式</label>
+                <div class="layui-input-block" >
+                    <select name="article_page">
+                        <option value="0" >不生成</option>
+                        <option value="1" >动态地址 | http://example.com/index.php?c=article&id=1&u=user</option>
+                        <option value="2" selected="">静态地址 | http://example.com/article-user-1.html</option>
+                    </select>
+                </div>
+            </div>
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label">权重</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="article_page_weight" lay-verify="required" value="0.8" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label">更新频率</label>
+                <div class="layui-input-inline" >
+                    <select name="article_page_changefreq"></select>
+                </div>
+            </div>
+            
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <button class="layui-btn layui-btn-normal" lay-submit lay-filter="save">保存配置</button>
+                    <button class="layui-btn layui-btn-normal" lay-submit lay-filter="generate">手动生成</button>
+                </div>
+            </div>
+        </div>
+    </form>
+    </div>
+</div>
+<?php load_static('js.layui');?>
+<script src="./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
+<script>
+layui.use(['jquery','form'], function () {
+    var form = layui.form;
+    var layer = layui.layer;
+    var $ = layui.jquery;
+    const changefreq_Map = {"always": "始终","hourly": "每小时","daily": "每天","weekly": "每周","monthly": "每月","yearly": "每年","never": "从不"};
+
+    //给更新频率下拉框添加选项
+    $("select[name$='_changefreq']").each(function() {
+        const select = $(this);
+        $.each(changefreq_Map, function(optionValue, optionText) {
+            select.append($("<option>").text(optionText).val(optionValue));
+        });
+        select.val('daily'); //默认值改为每天
+    });
+    //刷新组件
+    layui.form.render('select');
+    
+    //表单赋值
+    form.val('form', <?php echo json_encode(unserialize( get_db("global_config", "v", ["k" => "sitemap_config"])));?>);
+
+    //监听提交
+    form.on('submit(save)', function (data) {
+        $.post(get_api('other_root','write_sitemap_config'),data.field,function(data,status){
+            if(data.code == 1) {
+                if(data.msg!="保存成功"){
+                    layer.alert(data.msg)
+                }else{
+                    layer.msg(data.msg, {icon: 1});
+                }
+            }else{
+                layer.msg(data.msg, {icon: 5});
+            }
+        });
+        return false;
+    }); 
+    //测试
+    form.on('submit(generate)', function (data) {
+        Authorization_Prompt();
+        return false;
+    }); 
+
+    
+});
+</script>
+</body>
+</html>

templates/admin/page/header.php

@@ -7,7 +7,7 @@
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <?php if(defined('referrer')) echo '<meta name="referrer" content="' . referrer . '">'."\n";?>
+    <meta name="referrer" content="no-referrer-when-downgrade">
     <?php load_static('css');if($awesome) echo str_replace('#',$libs,'    <link rel="stylesheet" href="#/Font-awesome/4.7.0/css/font-awesome.css" media="all">'."\n");?>
     <script>var u = "<?php echo U;?>";</script>
 </head>

templates/admin/page/home.php

@@ -4,65 +4,20 @@ $awesome=true;
 
 //读取缓存数据
 $Notice = get_db('global_config','v',['k'=>'notice']);
-//如果不为空,则解析数据
-if(!empty($Notice)){
-    $data = json_decode($Notice, true);
-    $cache_time = 60; //缓存时间(秒);
-    $reload = time() > $data["download_time"] + $cache_time; //是否更新公告
-}else{
-    $reload = true; //需要刷新
-}
-//是否下载数据
-if(!offline && $reload){
-    $overtime = !isset($global_config['Update_Overtime']) ? 3 : ($global_config['Update_Overtime'] < 3 || $global_config['Update_Overtime'] > 60 ? 3 : $global_config['Update_Overtime']);
-    $urls = [
-        "lm21" => "https://update.lm21.top/TwoNav/Notice.json",
-        "gitee" => "https://gitee.com/tznb/twonav_updata/raw/master/Notice.json"
-    ];
-    $Source = $global_config['Update_Source'] ?? '';
-    if (!empty($Source) && isset($urls[$Source])) {
-        $urls = [$Source => $urls[$Source]];
-    }
-    
-    foreach($urls as $key => $url){ 
-        $Res = ccurl($url,$overtime);
-        $new_data = json_decode($Res['content'], true);unset($Res);
-        if($new_data["code"] == 200 ){ //下载成功,写入缓存
-            $new_data['download_time'] = time();
-            write_global_config('notice',json_encode($new_data),'官方公告(缓存)');
-            $data = $new_data;
-            unset($new_data);
-            break;
-        }
-    }
-}
-//判断是否为空
-if(empty($data['version'])){
-    $data['version'] = SysVer; //获取失败时=当前版本
-}else{
-    //比较远程版本
-    if(version_compare($data['version'],SysVer,'<')){
-        $data['version'] = SysVer; //远程版本比当前旧是最新版本显示当前版本
-    }
-}
+$data = empty($Notice)?[]:json_decode($Notice, true);
 
-//输出公告
-function echo_notice($data){
-    if(empty($data["notice"])){
-        return;
-    }
-    echo '<div class="layui-card"><div class="layui-card-header"><i class="fa fa-bullhorn icon"></i>最新动态</div><div class="layui-card-body layui-text">';
+//输出最新动态
+function echo_notice_link($data){
+    echo '<div class="layui-card notice1"><div class="layui-card-header"><i class="fa fa-bullhorn icon"></i>最新动态</div><div class="layui-card-body layui-text" id="notice_link">';
     foreach($data["notice"] as $value){
         echo "<div class=\"layuimini-notice\"><div class=\"layuimini-notice-title\"><a href=\"{$value['url']}\" target=\"_blank\">{$value['title']}</a></div></div>";
     }
     echo '</div></div>';
 }
-//输出作者心语
-function echo_message($data){
-    if(empty($data["message"])){
-        return;
-    }
-    echo '<div class="layui-card"><div class="layui-card-header"><i class="fa fa-paper-plane-o icon"></i>作者心语</div><div class="layui-card-body layui-text layadmin-text">';
+
+//输出官方公告
+function echo_notice_text($data){
+    echo '<div class="layui-card notice2"><div class="layui-card-header"><i class="fa fa-bell-o icon"></i>官方公告</div><div class="layui-card-body layui-text layadmin-text" id="notice_text">';
     echo $data['message'];
     echo '</div></div>';
 }
@@ -77,12 +32,9 @@ if( $global_config['Sub_domain'] == 1 && check_purview('Sub_domain',1)){
     }
 }
 if(!isset($_h)){
-    $_h = './?u='.U;
-    $_l = './?c='.$USER_DB['Login'].'&u='.U;
+    $_h = static_link ? get_surl('{UUID}.html'):"./?u={$u}";
+    $_l = static_link ? get_surl("login-{UUID}-{$USER_DB['Login']}.html"):"./?c={$USER_DB['Login']}&u={$u}" ;
 }
-
-
-
 require 'header.php'; 
 ?>
 <style>
@@ -202,7 +154,7 @@ require 'header.php';
                                         </div>
 <?php if(check_purview('theme_in',1)){ ?> 
                                         <div class="layui-col-xs3 layuimini-qiuck-module">
-                                            <a href="javascript:;" layuimini-content-href="theme_home" data-title="主题设置" data-icon="fa fa-magic">
+                                            <a href="javascript:;" layuimini-content-href="theme" data-title="主题设置" data-icon="fa fa-magic">
                                                 <i class="fa fa-magic"></i>
                                                 <cite>主题设置</cite>
                                             </a>
@@ -227,9 +179,9 @@ require 'header.php';
                                             </a>
                                         </div>
                                         <div class="layui-col-xs3 layuimini-qiuck-module">
-                                            <a href="javascript:;" layuimini-content-href="UserPassword" data-title="修改密码" data-icon="fa fa-key">
-                                                <i class="fa fa-key"></i>
-                                                <cite>修改密码</cite>
+                                            <a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">
+                                                <i class="fa fa-diamond"></i>
+                                                <cite>购买授权</cite>
                                             </a>
                                         </div>
                                     </div>
@@ -242,7 +194,7 @@ require 'header.php';
                         <div class="layui-card">
                             <div class="layui-card-header">
                                 <div style="display: flex; justify-content: space-between;">
-                                    <div><i class="fa fa-line-chart icon"></i>报表统计</div>
+                                    <div id="tongji" style="cursor: pointer;"><i class="fa fa-line-chart icon" ></i>报表统计</div>
                                     <div>
                                         <button class="layui-btn layui-btn-primary echarts" style="border: none;display:none;"><span>最近7天</span><i class="layui-icon layui-icon-down layui-font-12"></i></button>
                                     </div>
@@ -288,7 +240,7 @@ require 'header.php';
 <?php }?>
                             <tr>
                                 <td>用户交流</td>
-                                <td><a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=LaIzFK2hfTYBZGR0cKvW3xZL6aNgcSXH&jump_from=webapi&authKey=LHh1NtAiGdK0wNyoZiHWrzAZTWWq26YgAwX0Ak7rBWchh6Y5ocUX/0cCXLMXvq/k" title="TwoNav - 技术交流">QQ群：695720839</a>
+                                <td><a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=dMXOVXaYcnKMVmPsqBqpeSxcszy-z4vT&jump_from=webapi&authKey=SQArXAovtNKkH4VGv2Uy6p9wITMQxtjx8W2xLxCKkw3IOwXqQ9H34k4K9o1p4DVQ" title="TwoNav - 技术交流2">QQ群：621815595</a>
                                </td>
                             </tr>
                             <tr>
@@ -309,8 +261,8 @@ require 'header.php';
                         </table>
                     </div>
                 </div>
-                <?php echo_notice($data); //官方公告?>
-                <?php echo_message($data); //作者心语?>
+                <?php echo_notice_link($data); //最新动态 ?>
+                <?php echo_notice_text($data); //官方公告 ?>
             </div>
         </div>
     </div>
@@ -359,6 +311,27 @@ if($USER_DB['UserGroup'] == 'root'){
           }
         });
         
+        $('#tongji').on('click', function(){
+            $.post('./index.php?c=api&method=read_data&date='+home_echarts+'&type=tongji_ip_list&u='+u,function(data,status){
+                if(data.code == 1){
+                    var content = '<table class="layui-table" border="1"><thead><tr><th>日期</th><th>IP列表</th></tr></thead><tbody>';
+                    $.each(data.data, function (date, ipAddresses) {
+                        content += '<tr><td>' + date + '</td><td>';
+                        ipAddresses.sort((ip1, ip2) => ip1.localeCompare(ip2, undefined, { numeric: true })); //IP排序
+                        $.each(ipAddresses, function (index, ipAddress) {
+                            content += ipAddress + '<br>';
+                        });
+                        content += '</td></tr>';
+                    });
+                    content += '</tbody></table>';
+                    layer.open({
+                        title: '访问IP列表',
+                        content: content,
+                        area: ['100%', '100%']
+                    });
+                }
+            });
+        });
         //加载报表统计
         function load_echarts(){
             var echartsRecords = echarts.init(document.getElementById('echarts-records'), 'walden');

templates/admin/page/link_list.php

@@ -73,8 +73,9 @@
 <?php }?> 
 <?php if($global_config['offline']  != 1 ){ ?> 
         <button class="layui-btn layui-btn-sm layui-btn-normal layui-btn-danger layui-hide-xs" lay-event="testing" id="testing">检测</button>
-<?php }?> 
         <button class="layui-btn layui-btn-sm layui-btn-normal layui-btn-danger layui-hide-xs" lay-event="msg_pull" id="msg_pull">识别</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal layui-btn-danger layui-hide-xs" lay-event="push" id="push">推送</button>
+<?php }?> 
         <button class="layui-btn layui-btn-sm layui-btn-normal layui-btn-danger" layuimini-content-href="link_sort" data-title="链接排序">排序模式</button>
     </div>
 </script>
@@ -113,6 +114,7 @@
         </div>
     </script>
 </ul>
+<?php if($global_config['offline']  != 1 ){ ?> 
 <ul class="msg_pull" style="margin-top: 18px;display:none;padding-right: 10px;padding-left: 10px;">
     <form class="layui-form layuimini-form" lay-filter="msg_pull">
         <pre class="layui-code" id="tip" >提示: 自动识别仅针对http/https有效,且不能保证百分百成功!未成功识别时不会对链接信息进行修改!大批量识别前建议先备份数据,效果不理想时可以回退!</pre>
@@ -163,5 +165,30 @@
         </div>
     </form>
 </ul>
+<ul class="push" style="margin-top: 18px;display:none;padding-right: 10px;padding-left: 10px;">
+    <form class="layui-form layuimini-form" lay-filter="push">
+        <pre class="layui-code" >使用API推送功能会达到怎样效果
+及时发现：可以缩短百度爬虫发现您站点新链接的时间，使新发布的页面可以在第一时间被百度收录
+保护原创：对于网站的最新原创内容，使用API推送功能可以快速通知到百度，使内容可以在转发之前被百度发现
+百度官方说明: https://ziyuan.baidu.com/linksubmit/index
+注意事项: 推送的URL是静态格式,所以请务必正确配置好伪静态!
+伪静态配置: 请前往站长工具>生成伪静态,并复制内容配置到服务器 (仅针对Nginx)
+</pre>
+        <div class="layui-form-item">
+            <label class="layui-form-label">接口地址</label>
+                <div class="layui-input-block">
+                    <input type="text" name="push_api" id="push_api" placeholder="请输入接口调用地址如 http://data.zz.baidu.com/urls?site=lm21.top&token=xxxxxx" 
+                    value="<?php echo get_db("user_config", "v", ["k" => "baidu_push_api","uid"=>UID]); ?>" class="layui-input">
+                </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn layui-btn-warm" type="button" id="close" >关闭</button>
+                <button class="layui-btn layui-btn-normal" lay-submit lay-filter="start_push" id="start_push">开始</button>
+            </div>
+        </div>
+    </form>
+</ul>
+<?php }?> 
 </body>
 </html>

templates/admin/page/root/default_setting.php

@@ -9,7 +9,7 @@ $LoginConfig = unserialize( get_db("global_config", "v", ["k" => "LoginConfig"])
     <div class="layuimini-main">
     <form class="layui-form" lay-filter="form">
         <div class="layui-form layuimini-form layui-form-pane">
-            <blockquote class="layui-elem-quote layui-text" style="">1.本页功能<a href="https://gitee.com/tznb/OneNav/wikis/%E8%AE%A2%E9%98%85%E6%9C%8D%E5%8A%A1%E6%8C%87%E5%BC%95" target="_blank">授权用户</a>专享<br />2.用户注册后默认使用此方案<br />3.此功能不会修改现有用户的配置<br />4.如果您不理解选项的作用请勿乱改   </blockquote>
+            <blockquote class="layui-elem-quote layui-text" style="">1.本页功能<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享<br />2.用户注册后默认使用此方案<br />3.此功能不会修改现有用户的配置<br />4.如果您不理解选项的作用请勿乱改   </blockquote>
             <fieldset class="layui-elem-field layui-field-title"><legend>安全设置</legend></fieldset>
             
             <div class="layui-form-item">
@@ -141,11 +141,10 @@ $LoginConfig = unserialize( get_db("global_config", "v", ["k" => "LoginConfig"])
                 <label class="layui-form-label">链接图标</label>
                 <div class="layui-input-inline" >
                     <select name="link_icon">
-                        <option value="0" selected>离线图标</option>
-                        <!--<option value="1" >本地服务(支持缓存)</option>-->
-                        <option value="2" >favicon.rss.ink (小图标)</option>
-                        <option value="4" >api.15777.cn</option>
-                        <option value="5" >favicon.cccyun.cc</option>
+                        <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>
                     </select>
                 </div>

templates/admin/page/root/icon_set.php

@@ -8,7 +8,7 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
     <form class="layui-form" lay-filter="form">
         <div class="layui-form layuimini-form layui-form-pane">
             <blockquote class="layui-elem-quote layui-text" style="">
-                1.此功能<a href="https://gitee.com/tznb/OneNav/wikis/%E8%AE%A2%E9%98%85%E6%9C%8D%E5%8A%A1%E6%8C%87%E5%BC%95" target="_blank">授权用户</a>专享,请仔细阅读本页说明<br />
+                1.此功能<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享,请仔细阅读本页说明<br />
                 2.缓存时间视自身需求而定,希望及时更新则短一点(实际上站点很少会更新图标),建议值: 604800 (7天)<br />
                 3.修改缓存时间可能不会立即生效,因为浏览器已经缓存的图标会等过期后再刷新 (可以清理浏览器缓存来强制刷新)<br />
                 4.用户需在站点设置>链接图标>选择本地服务或本地服务(伪静态),后者需要从站长工具生成伪静态并正确配置<br />

templates/admin/page/root/mail_set.php

@@ -8,7 +8,7 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
     <form class="layui-form" lay-filter="form">
         <div class="layui-form layuimini-form layui-form-pane">
             <blockquote class="layui-elem-quote layui-text" style="">
-                1.此功能<a href="https://gitee.com/tznb/OneNav/wikis/%E8%AE%A2%E9%98%85%E6%9C%8D%E5%8A%A1%E6%8C%87%E5%BC%95" target="_blank">授权用户</a>专享
+                1.此功能<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享
             </blockquote>
             
             <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>SMTP 配置</legend></fieldset>
@@ -56,9 +56,9 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
             <div class="layui-form-item">
                 <label class="layui-form-label">发送人</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="sender" lay-verify="required" lay-reqtext="发送人邮箱不能为空" placeholder='' autocomplete="off" class="layui-input">
+                    <input type="text" name="sender" lay-verify="required" lay-reqtext="发送人名称不能为空" placeholder='' autocomplete="off" class="layui-input">
                 </div>
-                <div class="layui-form-mid layui-word-aux">例如: TwoNav书签&lt;test@qq.com&gt;</div>
+                <div class="layui-form-mid layui-word-aux">例如: TwoNav</div>
             </div>
             
             <div class="layui-form-item">

templates/admin/page/root/sys_setting.php

@@ -4,6 +4,15 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
 ?>
 <style>
 .layui-btn-container .layui-btn{border-width: 1px; border-style: solid; border-color: #FF5722!important; color: #FF5722!important;background: none;height: 30px; line-height: 30px; padding: 0 10px; font-size: 12px;}
+.footer{
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    padding: 10px;
+    background-color: #fff;
+    border-top: 1px solid #e6e6e6;
+}
 </style>
 <body>
 <div class="layuimini-container">
@@ -12,10 +21,11 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
             <button type="button" class="layui-btn" layuimini-content-href="root/default_setting" data-title="默认设置">默认设置</button>
             <button type="button" class="layui-btn" layuimini-content-href="root/mail_set" data-title="邮件配置">邮件配置</button>
             <button type="button" class="layui-btn" layuimini-content-href="root/icon_set" data-title="图标配置">图标配置</button>
+            <button type="button" class="layui-btn" layuimini-content-href="expand/sitemap" data-title="站点地图">站点地图</button>
         </div>
     <form class="layui-form" lay-filter="form">
         <div class="layui-form layuimini-form layui-form-pane">
-            <blockquote class="layui-elem-quote layui-text" style="">1.带*号的选项属<a href="https://gitee.com/tznb/OneNav/wikis/%E8%AE%A2%E9%98%85%E6%9C%8D%E5%8A%A1%E6%8C%87%E5%BC%95" target="_blank">授权用户</a>专享<br />2.原OneNav Extend的部分配置已下放到用户组配置中<br />3.如果您不理解选项的作用请勿乱改   </blockquote>
+            <blockquote class="layui-elem-quote layui-text" style="">1.带*号的选项属<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享<br />2.如果您不理解选项的作用请勿乱改   </blockquote>
             
             <div class="layui-form-item">
                 <label class="layui-form-label">默认用户</label>
@@ -119,7 +129,28 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
                         <option value="1" >开启</option>
                     </select>
                 </div>
-                <div class="layui-form-mid layui-word-aux">开启将禁止服务器访问互联网,部分功能将被禁用(如:更新提示,公告,在线主题,链接识别,书签克隆等)</div>
+                <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="Update_Source">
+                        <option value="0" selected="">自动</option>
+                        <option value="1">国内-1</option>
+                        <option value="2">国内-2</option>
+                        <option value="3">海外-3</option>
+                    </select>
+                </div>
+                <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">
+                    <input type="number" name="Update_Overtime" autocomplete="off" value="3" class="layui-input">
+                </div>
+                <div class="layui-form-mid layui-word-aux">默认3秒,范围3-60 (非必要请勿修改)</div>
             </div>
             
             <div class="layui-form-item">
@@ -143,7 +174,19 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
                 </div>
                 <div class="layui-form-mid layui-word-aux">开启时将关闭主页/登录/注册等服务,站长账号不受影响(网站升级迁移时适用)</div>
             </div>
-
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label required">静态链接</label>
+                <div class="layui-input-inline">
+                    <select name="static_link">
+                        <option value="0" selected="">关闭</option>
+                        <option value="1" >开启-UN</option>
+                        <option value="2" >开启-UID</option>
+                    </select>
+                </div>
+                <div class="layui-form-mid layui-word-aux">开启后部分动态链接将改为静态链接 (请确保伪静态生效中,选定后不建议更改)</div>
+            </div>
+            
             <div class="layui-form-item">
                 <label class="layui-form-label required">强制私有</label>
                 <div class="layui-input-inline">
@@ -198,26 +241,6 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
                 </div>
                 <div class="layui-form-mid layui-word-aux">请勿开启!请勿开启!请勿开启!</div>
             </div>
-
-            <div class="layui-form-item layui-hide">
-                <label class="layui-form-label">资源接口</label>
-                <div class="layui-input-inline">
-                    <select name="Update_Source">
-                        <option value="0" selected="">自动</option>
-                        <option value="lm21">主线路</option>
-                        <option value="gitee">备用线路(gitee)</option>
-                    </select>
-                </div>
-                <div class="layui-form-mid layui-word-aux">备用资源不定期更新,非必要请勿使用!</div>
-            </div>
-            
-            <div class="layui-form-item layui-hide">
-                <label class="layui-form-label">资源超时</label>
-                <div class="layui-input-inline">
-                    <input type="number" name="Update_Overtime" autocomplete="off" value="3" class="layui-input">
-                </div>
-                <div class="layui-form-mid layui-word-aux">默认3秒,范围3-60</div>
-            </div>
             
             <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>扩展功能</legend></fieldset>
              <blockquote class="layui-elem-quote layui-text" style="">注:开关后请刷新整个页面</blockquote>
@@ -317,8 +340,8 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
                 <div class="layui-form-mid layui-word-aux">是否允许默认用户组使用自定义代码!允许存在安全隐患!</div>
             </div>
             
-            <div class="layui-form-item">
-                <div class="layui-input-block"><button class="layui-btn layui-btn-normal" lay-submit lay-filter="save">确认保存</button></div>
+            <div class="footer">
+                <button class="layui-btn layui-btn-normal" lay-submit lay-filter="save" style=" margin-left: 10px; ">确认保存</button>
             </div>
         </div>
     </form>

templates/admin/page/root/tool.php

@@ -34,7 +34,7 @@ require(dirname(__DIR__).'/header.php');
         <pre class="layui-code" id="console_log" >
 1.功能都集中在上方的按钮了,需要那个就点击那个!
 2.一键诊断和phpinfo用于帮助站长和开发者快速了解服务器环境
-3.生成伪静态(伪静态无需求可不设置,安全设置最好设置下)
+3.生成伪静态(仅针对Nginx,安全配置必选,其他规则按需,Apache已内置规则无需设置,其他环境不支持)
 4.数据库升级: 手动安装更新时,若有说明需更新数据库,则需要手动点击此按钮!自动更新时无需干预,特殊情况除外!
 5.清理缓存: 用于清理特定情况下产生的临时数据 (仅清理60分钟前的数据)
         产生原因1:用户在添加链接页面上传了图标且未点击删除图标或添加链接,而是直接关闭了页面
@@ -46,10 +46,10 @@ require(dirname(__DIR__).'/header.php');
 </div>
 
 
-<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
+<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js?v=<?php echo $Ver;?>"></script>
 <script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
-<script src = "<?php echo $libs?>/Other/ClipBoard.min.js"></script>
-<script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
+<script src = "<?php echo $libs?>/Other/ClipBoard.min.js?v=<?php echo $Ver;?>"></script>
+<script src = '<?php echo $libs?>/jquery/jquery.md5.js?v=<?php echo $Ver;?>'></script>
 <?php load_static('js');?>
 <script>
 layui.use(['layer','form','miniTab'], function () {
@@ -69,23 +69,28 @@ layui.use(['layer','form','miniTab'], function () {
     });
     //一键诊断
     $('.diagnose').on('click', function(){
+        layer.load(0);
         $("#console_log").text("");
         $("#console_log").append("浏览器UA：" + navigator.userAgent +"\n");
         $("#console_log").append("客户端时间：" +  timestampToTime(Math.round(new Date() / 1000) ) +"\n");
         $.post(get_api('read_data','diagnostic_log'),function(data,status){
+            layer.closeLast('loading');
             $("#console_log").append(data.msg);
+        }).fail(function(xhr, textStatus, errorThrown) {  
+            layer.closeLast('loading');
+            layer.alert('请求失败');
         });
     });
     
     //连通测试
     $('.connectivity_test').on('click', function(){
+        layer.load(0);
         $("#console_log").text("");
         $("#console_log").append("浏览器UA：" + navigator.userAgent +"\n");
         $("#console_log").append("客户端时间：" +  timestampToTime(Math.round(new Date() / 1000) ) +"\n");
         
         var urls = [
-          ['主线路', 'https://update.lm21.top/connectivity_test.txt'],
-          ['备用线路(Gitee)', 'https://gitee.com/tznb/twonav_updata/raw/master/connectivity_test.txt']
+          ['资源节点-码云', 'https://gitee.com/tznb/TwoNav_Resource/raw/master/connectivity_test.txt']
         ];
         urls.forEach(function(route) {
           var routeName = route[0];
@@ -95,12 +100,13 @@ layui.use(['layer','form','miniTab'], function () {
             url: get_api('read_data', 'connectivity_test'),
             type: 'POST',
             data: { url: url },
-            async: false,
+            //async: false,
             success: function(data, status) {
-              $("#console_log").append(data.msg + "\n");
-            },
-            error: function(jqXHR, textStatus, errorThrown) {
-              $("#console_log").append(routeName + ": 请求 " + url + " 发生错误：" + errorThrown + "\n");
+                layer.closeLast('loading');
+                $("#console_log").append(data.msg + "\n");
+            },error: function(jqXHR, textStatus, errorThrown) {
+                layer.closeLast('loading');
+                $("#console_log").append(routeName + ": 请求 " + url + " 发生错误：" + errorThrown + "\n");
             }
           });
         });
@@ -133,35 +139,45 @@ layui.use(['layer','form','miniTab'], function () {
     $('.rewrite').on('click', function(){
         let pathname = window.location.pathname;
         $("#console_log").text("");
+        
         $("#console_log").append(`#安全规则(必选)\n`);
         $("#console_log").append(`location ^~ ${pathname}data/ {location ~* \\.(db|db3|php|sql|tar|gz|zip|info|log|json)$ {return 403;}}\n`);
         $("#console_log").append(`location ^~ ${pathname}templates/ {location ~* \\.(php|tar|gz|zip|info|log|json)$ {return 403;}}\n`);
-        $("#console_log").append(`#重写规则(可选)\n`);
-        $("#console_log").append(`rewrite ^${pathname}login$ ${pathname}index.php?c=login break;\n`);
-        $("#console_log").append(`rewrite ^${pathname}admin$ ${pathname}index.php?c=admin break;\n`);
-        $("#console_log").append(`rewrite ^${pathname}ico/(.+) ${pathname}index.php?c=icon&url=$1 break;\n`);
-        $("#console_log").append(`rewrite ^${pathname}([A-Za-z0-9]+)$ ${pathname}index.php?u=$1 break;\n`);
-        $("#console_log").append(`rewrite ^${pathname}(.+)/(click)/([A-Za-z0-9]+)$ ${pathname}index.php?c=$2&id=$3&u=$1 break;\n`);
-        $("#console_log").append(`rewrite ^${pathname}(.+)/(click)/(.+) ${pathname}$3 break;\n`);
+        if(pathname == '/'){
+            $("#console_log").append(`#重写规则(可选)\n`);
+            $("#console_log").append(`location / {\n    if ($uri ~* ^/index\.php$) { break; }\n    if ($uri ~* ^/(templates|static|data|system)/) { break; }\n    try_files $uri $uri/ /rewrite.php?$query_string;\n}\n`);
+        }else{
+            $("#console_log").append(`#检测到程序运行在非根目录,此环境仅提供安全规则!部分与伪静态相关的功能将不可用!\n`);
+        }
 
     });
     //清理缓存
     $('.CleanCache').on('click', function(){
+        layer.load(0);
         $.post(get_api('other_root','CleanCache'),function(data,status){
+            layer.closeLast('loading');
              if(data.code == 1){
                 layer.msg(data.msg,{icon: 1})
             } else{
                 layer.msg(data.msg,{icon: 5});
             }
+        }).fail(function(xhr, textStatus, errorThrown) {  
+            layer.closeLast('loading');
+            layer.alert('请求失败');
         });
     });
     //数据库升级
     $('.db_upgrade').on('click', function(){
+        layer.load(0);
         $("#console_log").text("");
         $("#console_log").append(`正在处理中,请勿操作页面...\n`);
         $.post(get_api("other_upsys"),{"i":4,"pattern":"manual"}, function(data, status) {
+            layer.closeLast('loading');
             $("#console_log").text("");
             $("#console_log").append(`${data.msg}\n`);
+        }).fail(function(xhr, textStatus, errorThrown) {  
+            layer.closeLast('loading');
+            layer.alert('请求失败');
         });
     });
 });

templates/admin/page/root/user_control.php

@@ -35,6 +35,7 @@ $user_groups = select_db('user_group',['id','code','name'],'');
 <script type="text/html" id="user_tool">
         <div class="layui-btn-group">
             <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="Del">删除</button>
+            <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="Del_OTP" title="移除OTP双重验证">移除OTP验证</button>
             <button class="layui-btn layui-btn-sm" lay-event="register" <?php  echo $global_config['RegOption'] == 0? 'style = "display:none;"':'' ?> >注册账号</button>
             <button class="layui-btn layui-btn-sm" lay-event="set_UserGroup">设用户组</button>
             <button class="layui-btn layui-btn-sm" lay-event="username_retain">账号保留</button>
@@ -57,13 +58,22 @@ layui.use(['table','layer','form'], function () {
     var limit = localStorage.getItem(u + "_limit") || 50;
     var api = get_api('read_user_list','list');
     var IDs = [];
+    var static_link = 0;
+    
     
     var cols = [[
       {type:'checkbox'} //开启复选框
       ,{field:'ID',title:'ID',width:60,sort:true,event:'login_entry',style:'cursor: pointer;color: #3c78d8;'}
       ,{title:'操作',toolbar:'#line_tool',width:70}
       ,{field:'User',title:'账号',minWidth:120,sort:true,templet:function(d){
-          return '<a style="color:#3c78d8" title="打开用户主页" target="_blank" href="./?u='+d.User+'">'+d.User+'</a>'
+        if(static_link == 1){
+            url = `./${d.User}.html`;
+        }else if(static_link == 2){
+            url = `./${d.ID}.html`;
+        }else{
+            url = `./index.php?&u=${d.User}`;
+        }
+          return '<a style="color:#3c78d8" title="打开用户主页" target="_blank" href="'+url+'">'+d.User+'</a>'
       }}
       ,{field:'UserGroupName',title:'用户组',minWidth:90,sort:true}
       ,{field:'Email',title:'Email',minWidth:170,sort:true,event:'set_email',style:'cursor: pointer;color: #3c78d8;'}
@@ -163,6 +173,16 @@ layui.use(['table','layer','form'], function () {
         }else if(event == 'set_UserGroup'){
             IDs = tableIds;
             index = layer.open({type: 1,scrollbar: false,shadeClose: true,title: '修改用户组',area : ['100%', '100%'],content: $('.set_UserGroup')});
+        }else if(event == 'Del_OTP'){
+            layer.alert("以下账号将被移除OTP双重验证,确定继续吗?<br />"+table_Users,{icon:3,title:'确认操作',anim: 2,closeBtn: 0,btn: ['确定','取消']},function () {
+                $.post(get_api('write_user_info','Del_OTP'),{ID:tableIds},function(data,status){
+                    if(data.code == 1){
+                        layer.msg(data.msg,{icon: 1})
+                    } else{
+                        layer.msg(data.msg,{icon: 5});
+                    }
+                });
+            });
         }
     });
     //行工具
@@ -192,9 +212,13 @@ layui.use(['table','layer','form'], function () {
                 });
             });
         }else if(obj.event == 'login_entry'){
-            window.open('./index.php?c=' + data.Login + '&u=' + data.User);
-        }else if(obj.event == 'homepage'){
-            window.open('./index.php?&u=' + data.User);
+            if(static_link == 1){
+                window.open(`./login-${data.User}-${data.Login}.html`);
+            }else if(static_link == 2){
+                window.open(`./login-${data.ID}-${data.Login}.html`);
+            }else{
+                window.open('./index.php?c=' + data.Login + '&u=' + data.User);
+            }
         }else if(obj.event == 'ip'){
             query_ip(data.RegIP);
         }

templates/admin/page/root/vip.php

@@ -3,23 +3,39 @@ if($USER_DB['UserGroup'] != 'root'){$content='您没有权限访问此页面'; r
 $title='授权管理';require(dirname(__DIR__).'/header.php'); 
 $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); 
 $HTTP_HOST = preg_replace('/:\d+$/','',$_SERVER['HTTP_HOST']); //去除端口号
+$Notice = get_db('global_config','v',['k'=>'notice']);
+if(!empty($Notice)){
+    $data = json_decode($Notice, true);
+}
 ?>
 <body>
 <div class="layuimini-container">
   <div class="layuimini-main">
     <div class="layui-form layuimini-form layui-form-pane">
-        <blockquote class="layui-elem-quote layui-text">
-            <li>1. 查询授权时当前域名必须和订阅填写一致</li>
-            <li>2. 其他二级域名使用时请手动输入订单号/邮箱保存</li>
-            <li>3. 授权未绑定邮箱时邮箱留空,已绑定时请输入正确邮箱</li>
-            <li>4. 如有其他疑问联系技术支持</li>
+        <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>2. 返回概要页面 > 刷新 > 更新系统 ( 不更新还是免费版 )</li>
+            <li>3. 更新成功后就是授权版的系统了,可使用全部功能</li>
+            <li>4. 禁止传播/破解授权版源代码,违者封授权并追责</li>
         </blockquote>
-        <h3 style = "margin-bottom:1em;">当前域名：<font color="red"><?php echo $HTTP_HOST; ?></font> (订阅时填写)</h3>
+        <blockquote class="layui-elem-quote layui-text" style="color:red" >
+            <li> 温馨提示: </li>
+            <li>授权是跟当前访问的域名或IP绑定的,通常建议绑定域名</li>
+            <li>初次保存授权时会自动激活卡密并绑定当前域名或IP</li>
+            <li>请不要在临时域名或临时IP中激活授权 (特殊情况请提前说明)</li>
+            <li>授权针对顶级域名授权,如授权www.nav.cn时,dh.nav.cn可以正常使用</li>
+            <li>绑定IP时部分功能会无法使用,如二级域名功能</li>
+            <li>激活后修改域名或IP需扣除修改次数(年授权需付费修改)</li>
+            <li>如有疑问请联系技术支持QQ: 271152681</li>
+        </blockquote>
+        <h3 style = "margin-bottom:1em;">当前域名：<font color="red"><?php echo $HTTP_HOST; ?></font></h3>
         
         <div class="layui-form-item">
-            <label class="layui-form-label">订单号</label>
+            <label class="layui-form-label">授权卡密</label>
             <div class="layui-input-block">
-                <input type="text" id = "order_id" name="order_id" value="<?php echo $subscribe['order_id']; ?>" required  autocomplete="off" placeholder="请输入订单号" class="layui-input">
+                <input type="text" id = "order_id" name="order_id" value="<?php echo $subscribe['order_id']; ?>" required  autocomplete="off" placeholder="请输入授权号或卡密" class="layui-input">
             </div>
         </div>
 
@@ -43,27 +59,55 @@ $HTTP_HOST = preg_replace('/:\d+$/','',$_SERVER['HTTP_HOST']); //去除端口号
             <input type="text" name="end_time" id = "end_time" readonly="readonly" value = "<?php echo date("Y-m-d H:i:s",$subscribe['end_time']); ?>" autocomplete="off" placeholder="订阅到期时间" class="layui-input">
             </div>
         </div>
-
+        
+        <div class="layui-form-item" style = "">
+            <label class="layui-form-label">授权类型</label>
+            <div class="layui-input-block">
+                <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="set_subscribe">保存设置</button>
-            <button class="layui-btn layui-btn-warm" lay-submit lay-filter="reset_subscribe">删除</button>
-            <button class="layui-btn layui-btn-danger" id="help" sort_id="7968669">购买授权</button>
-            <button class="layui-btn" lay-submit lay-filter="get_subscribe">查询授权</button>
+            <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-bg-purple" type="button" id="validate" style="<?php echo empty($subscribe['order_id']) ? 'display:none;':''; ?>">正版验证</button>
         </div>
 
         <fieldset class="layui-elem-field layui-field-title" style="margin-top:30px;"><legend>授权用户专享</legend></fieldset>
         <blockquote class="layui-elem-quote layui-text">
-          <li>1. 可使用一键更新功能</li>
-          <li>2. 可使用二级域名绑定账号功能</li>
-          <li>3. 可使用链接检测功能</li>
-          <li>4. 可自定义版权/用户组/默认配置等</li>
-          <li>5. 可使用邀请码注册功能</li>
-          <li>6. 可使用本地备份功能</li>
-          <li>7. 可无限次数下载主题和系统更新</li>
-          <li>8. 解锁全部功能和服务</li>
-          <li>9. 更多专属功能开发中</li>
-          <li>10. 可帮助TwoNav持续发展</li>
-          <li>#. 技术支持:QQ 271152681  </li>
+            <ul>
+                <li>在线更新系统 ( 免费版只能手动更新 )</li>
+                <li>在线下载和更新主题模板</li>
+                <li>批量更新链接标题/关键字/描述/图标</li>
+                <li>批量识别链接是否可以访问</li>
+                <li>可使用本地备份功能支持回滚等操作</li>
+                <li>扩展功能:收录管理/留言管理/文章管理/链接扩展字段</li>
+                <li>可配置邮件服务用于注册时发送验证</li>
+                <li>可配置初始设置 (新用户注册后的默认配置) </li>
+                <li>可配置本地获取图标服务并支持缓存防盗链等配置</li>
+                <li>可开启全站私有模式降低因用户添加违规链接导致封站的风险</li>
+                <li>可自定义用户组权限,对不可信的用户禁止使用高危功能(如自定义代码)</li>
+                <li>可自定义主页版权信息,可使用二级域名直接访问用户主页</li>
+                <li>可自定义全局header代码和footer代码</li>
+                <li>可限制用户添加链接标题描述等长度</li>
+                <li>可设置保留账号,支持正字表达式 (保留账号列表不可以被用户注册)</li>
+                <li>可设置生成注册码/配置注册提示等 (如需关注公众号或付费购买注册码才可以注册)</li>
+                <li>支持生成sitemap.xml网站地图用于优化SEO,提高收录效果</li>
+                <li>支持百度推送API(链接列表和文章列表),提高收录效果</li>
+                <li>还有其他细节就不逐一举例了,TwoNav的发展离不开大家的支持</li>
+                <li>未来还会增加更多专属功能, 技术支持:QQ 271152681  </li>
+            </ul>
         </blockquote>
     </div>
   </div>
@@ -76,25 +120,11 @@ layui.use(['jquery','form'], function () {
     var form = layui.form;
     var layer = layui.layer;
     var $ = layui.jquery;
-
-    //查询订阅
-    form.on('submit(get_subscribe)', function(data){
-        layer.load(2, {shade: [0.1,'#fff']});
-        $.get('https://api.lm21.top/api.php?fn=get_subscribe',data.field,function(data,status){
-            layer.closeAll('loading');
-            if(data.code == 200) {
-                $("#order_id").val(data.data.order_id);
-                $("#end_time").val(timestampToTime(data.data.end_time));
-                layer.msg(data.msg, {icon: 1,time: 10000});
-            }else{
-                layer.msg(data.msg, {icon: 5,time: 10000});
-            }
-        });
-        return false; 
-    });
-    
+    var vcode;
+    $("#sys").val('<?php echo empty($subscribe['sys']) ? 'biaozhun':$subscribe['sys']; ?>');
+    form.render('select');
     //保存订阅
-    form.on('submit(set_subscribe)', function(data){
+    form.on('submit(save_key)', function(data){
         var order_id = data.field.order_id;
         if(order_id.length < 20){
             layer.msg('订单号错误,请核对', {icon: 5});
@@ -105,42 +135,103 @@ layui.use(['jquery','form'], function () {
             return false;
         }
         layer.load(2, {shade: [0.1,'#fff']});
-        $.get('https://api.lm21.top/api.php?fn=check_subscribe',data.field,function(data,status){
+        $.post(get_api('other_services','save_key'),{'order_id':data.field.order_id,'email':data.field.email,'sys':data.field.sys},function(data,status){
             layer.closeAll('loading');
             if(data.code == 200) {
+                $("#order_id").val(data.data.order_id);
                 $("#end_time").val(timestampToTime(data.data.end_time));
-                set_subscribe(order_id,data.data.email,data.data.end_time,data.data.domain);
+                $("#type_name").val(data.data.type_name);
+                layer.msg(data.msg, {icon: 1,time: 10000});
             }else{
-                layer.msg(data.msg, {icon: 5});
+                layer.alert(data.msg,{icon:5,title:'保存结果',anim: 2,closeBtn: 0,btn: ['我知道了']});
             }
+        }).fail(function () {
+            layer.msg('请求失败', {icon: 5});
         });
-        console.log(data.field) 
+    });
+    
+    //购买授权
+    form.on('submit(buy_vip)', function(data){
+        let url = $(this).attr('data-url');
+        url = url.length > 0 ? url : 'https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990';
+        window.open($(this).attr('data-url'));
         return false;
     });
     
     //清空订阅信息
-    form.on('submit(reset_subscribe)', function(data){
-        var order_id = data.field.order_id;
-        layer.load(2, {shade: [0.1,'#fff']});
-        $("#order_id").val('');
-        $("#email").val('');
-        $("#end_time").val('1970-01-01 08:00:00');
-        set_subscribe('','','0','');
-        layer.closeAll('loading');
+    form.on('submit(del_key)', function(data){
+        vcode = randomnum(6);
+        index = layer.prompt({formType: 0,value: '',title: '请输入验证码: ' + vcode,shadeClose: false,"success":function(){
+            $("input.layui-layer-input").on('keydown',function(e){
+                if(e.which == 13) {
+                    del_key(data);
+                }
+            });
+        }},function(){
+            del_key(data)
+        }); 
         return false;
     });
-  
-    //存储到数据库中
-    function set_subscribe(order_id,email,end_time,domain) {
-        $.post(get_api('write_subscribe'),{order_id:order_id,email:email,end_time:end_time,domain:domain},function(data,status){
-            if(data.code == 1) {
-                layer.msg(data.msg, {icon: 1});
+    
+    function del_key(data){
+        layer.close(index);
+        if($("input.layui-layer-input").val() != vcode){
+            layer.msg('验证码错误', {icon: 5});
+            return false; 
+        }
+        var order_id = data.field.order_id;
+        if(order_id.length < 20){
+            layer.msg('订单号错误,请核对', {icon: 5});
+            return false;
+        }
+        if(data.field.email.length == 0){
+            layer.msg('邮箱不能为空,请核对', {icon: 5});
+            return false;
+        }
+        layer.load(2, {shade: [0.1,'#fff']});
+        $.post(get_api('other_services','del_key'),{'order_id':data.field.order_id,'email':data.field.email},function(data,status){
+            layer.closeAll('loading');
+            if(data.code == 200) {
+                $("#order_id").val('');
+                $("#email").val('');
+                $("#end_time").val('1970-01-01 08:00:00');
+                $("#type_name").val('');
+                layer.msg(data.msg, {icon: 1,time: 10000});
             }else{
-                layer.msg(data.msg, {icon: 5});
+                layer.alert(data.msg,{icon:5,title:'保存结果',anim: 2,closeBtn: 0,btn: ['我知道了']});
             }
+        }).fail(function () {
+            layer.msg('请求失败', {icon: 5});
         });
     }
     
+    // 正版验证
+    $('#validate').on('click', function(){
+        vcode = randomnum(6);
+        index = layer.prompt({formType: 0,value: '',title: '请输入验证码: ' + vcode,shadeClose: false,"success":function(){
+            $("input.layui-layer-input").on('keydown',function(e){
+                if(e.which == 13) {
+                    validate();
+                }
+            });
+        }},function(){
+            validate()
+        });
+    });
+    
+    function validate() {
+        layer.close(index);
+        if($("input.layui-layer-input").val() != vcode){
+            layer.msg('验证码错误', {icon: 5});
+            return false; 
+        }
+        $.post(get_api('other_services','validate'),function(data,status){
+            layer.closeAll('loading');
+            layer.alert(data.msg,{icon:(data.code == 200 ? 1 : 5),title:'验证结果',anim: 2,closeBtn: 0,btn: ['我知道了']});
+        }).fail(function () {
+            layer.msg('请求失败', {icon: 5});
+        });
+    }
 });
 </script>
 </body>

templates/admin/page/set_transit.php

@@ -4,7 +4,7 @@
     <div class="layuimini-main">
         <form class="layui-form" lay-filter="form">
         <div class="layui-form layuimini-form layui-form-pane">
-            <blockquote class="layui-elem-quote layui-text">注意: 存在备用链接时停留时间可能无效!</blockquote>
+            <blockquote class="layui-elem-quote layui-text">注意: 存在备用链接时停留时间可能无效,需模板支持!</blockquote>
             <div class="layui-form-item">
                 <label class="layui-form-label">访客停留</label>
                 <div class="layui-input-inline">
@@ -33,7 +33,7 @@
             </div>
             
             <div class="layui-form-item">
-                <div class="layui-input-block"><button class="layui-btn layui-btn-normal" lay-submit lay-filter="save">保存</button></div>
+                <div class="layui-input-block"><button class="layui-btn layui-btn-warm" type="button" id="close" >关闭</button><button class="layui-btn layui-btn-normal" lay-submit lay-filter="save">保存</button></div>
             </div>
         </div>
     </form>
@@ -60,6 +60,10 @@ layui.use(['jquery','form'], function () {
         });
         return false;
     }); 
+    //关闭按钮
+    $(document).on('click', '#close', function() {
+        parent.layer.close(parent.layer.getFrameIndex(window.name));
+    });
 });
 </script>
 </body>

templates/admin/page/set_verify.php

@@ -0,0 +1,58 @@
+<?php $title='验证页面 - 设置'; require 'header.php'; ?>
+<body>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <form class="layui-form" lay-filter="form">
+        <div class="layui-form layuimini-form layui-form-pane">
+            <blockquote class="layui-elem-quote layui-text">注意事项: 需模板支持,提示内容以http开头则打开网页,其他内容则弹出提示<br />使用场景: 加密链接/加密分类/二级密码/书签分享等</blockquote>
+            
+            <div class="layui-form-item layui-form-text">
+                <label class="layui-form-label">加密链接</label>
+                <div class="layui-input-block">
+                    <textarea name="link_tip" class="layui-textarea" placeholder='查看加密链接或分类时提示如何获取密码,可为空'></textarea>
+                </div>
+            </div>
+            
+            <div class="layui-form-item layui-form-text">
+                <label class="layui-form-label">书签分享</label>
+                <div class="layui-input-block">
+                    <textarea name="share_tip" class="layui-textarea" placeholder='获取书签分享提取码的提示,可为空'></textarea>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-input-block"><button class="layui-btn layui-btn-warm" type="button" id="close" >关闭</button><button class="layui-btn layui-btn-normal" lay-submit lay-filter="save">保存</button></div>
+            </div>
+        </div>
+    </form>
+    </div>
+</div>
+<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
+<?php load_static('js.layui');?>
+<script>
+layui.use(['jquery','form'], function () {
+        var form = layui.form,
+            layer = layui.layer;
+            
+    //表单赋值
+    form.val('form', <?php echo json_encode(unserialize( get_db("user_config", "v", ["k" => "s_verify_page","uid"=>$USER_DB['ID']]) ));?>);
+    
+    //监听提交
+    form.on('submit(save)', function (data) {
+        $.post('./index.php?c=api&method=write_verify_page&u='+u,data.field,function(data,status){
+            if(data.code == 1) {
+                layer.msg(data.msg, {icon: 1});
+            }else{
+                layer.msg(data.msg, {icon: 5});
+            }
+        });
+        return false;
+    }); 
+    //关闭按钮
+    $(document).on('click', '#close', function() {
+        parent.layer.close(parent.layer.getFrameIndex(window.name));
+    });
+});
+</script>
+</body>
+</html>

templates/admin/page/theme.php

@@ -0,0 +1,36 @@
+<?php $title='主题管理';$awesome=true; define('referrer','same-origin'); require 'header.php';?>
+<style>
+.tab-header .layui-btn.layui-this{border-color: #1E9FFF; color: #1E9FFF;}
+.screenshot{
+    width: 99%;  
+    height: 99%;  
+    max-width: 100%;  
+    max-height: 100%;   
+    aspect-ratio:16/9;
+}
+.layui-btn-container .layui-btn {
+    margin-right: 5px;
+}
+#default #del {display: none;}
+</style>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <div class="tab-header layui-btn-container" id="tab" style="margin-left: 5px;"></div>
+        <div class="layui-bg-gray" style="padding: 1px;" >
+            <div class="layui-row layui-col-space15"></div>
+        </div>
+    </div>
+</div>
+<script src="<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
+<script src="<?php echo $libs;?>/jquery/jquery.lazyload.min.js"></script>
+<script src="./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
+<?php load_static('js');?>
+<script>
+    const is_admin = <?php echo $USER_DB['UserGroup'] === 'root' ? 'true' : 'false'; ?>;
+    const theme_set = <?php echo check_purview('theme_set',1) ? 'true' : 'false'; ?>;
+    const apply = <?php echo check_purview('apply',1) ? 'true' : 'false'; ?>;
+    const guestbook = <?php echo check_purview('guestbook',1) ? 'true' : 'false'; ?>;
+    const article = <?php echo check_purview('article',1) ? 'true' : 'false'; ?>;
+    const loginAddress = '<?php echo $USER_DB['Login']; ?>';
+</script>
+<script src="./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>

templates/admin/page/theme_article.php

@@ -1,83 +0,0 @@
-<?php $title='文章模板';$awesome=true; require 'header.php'; 
-$site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
-?>
-<style type="text/css">
-.screenshot{
-    width: 99%;  
-    height: 99%;  
-    max-width: 100%;  
-    max-height: 100%;   
-    aspect-ratio:16/9;
-}
-#default #del {display: none;}
-</style> 
-<body>
-<div class="layuimini-container">
-  <div class="layuimini-main">
-    <blockquote class="layui-elem-quote layuimini-form" style="margin-top: 0px;border-left: 5px solid <?php echo $cache?"#1e9fff":($global_config['offline']?"":"#639d11") ?>;padding: 6px;">
-        <span class="layui-breadcrumb" lay-separator="|">
-            <a href="./index.php?c=admin&page=theme_article&cache=no&u=<?php echo U;?>">刷新数据</a>
-        </span>
-    </blockquote>
-    <div class="layui-bg-gray" style="padding: 1px;" >
-        <div class="layui-row layui-col-space15">
-<?php 
-$Space = '                            ';//占位符,强迫症想让输出的源码好看点而已...
-foreach ($themes as $key => $theme) { 
-$online = !empty($theme['info']['md5']); //在线主题!
-if($s_templates['article'] == $key){
-    $icon ='<i class="fa fa-magic" style="color: #03a9f4;" title = "正在使用"></i> ';
-}else{
-    $icon ='';
-}
-$color = ($s_templates['article'] == $key ?"color: #03a9f4;":"");
-?>
-            <!--主题卡片--> 
-            <div class="layui-col-xs layui-col-sm4 layui-col-md3 ">
-                <div class="layui-card">
-                    <div class="layui-card-header"> 
-                        <div style="float:left; cursor:pointer;<?php echo $color; ?>" title="<?php echo $key; ?>"><?php echo $icon.$theme['info']['name']; ?></div>
-                        <div style="float:right;cursor:pointer;" title="<?php echo $theme['info']['update']; ?>"><?php echo $theme['info']['version']; ?></div>
-                    </div>
-                    <div class="layui-card-body">
-                        <div class="img-list"><img class="screenshot" layer-src="<?php echo $theme['info']['screenshot']; ?>" data-original="<?php echo $theme['info']['screenshot']; ?>"></div>
-                    </div>
-                    <div class="layui-card-header" style="height: 1px;"></div>
-                    <div class="layui-card-header" style="height: auto;" id="article">
-                        <div class="layui-btn-group" id="<?php echo $key;?>">
-<?php 
-    if($online){ //如果是在线主题则显示下载
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="dw">下载</button>'."\n";
-    }elseif($theme['info']['up'] == 1){ //如果有更新则同时显示下载和使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="up">更新</button>'."\n";
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }else{ //其他情况仅显示使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="detail">详情</button>'."\n";
-    if($theme['info']['config'] == '1'){ //支持配置的主题显示配置
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="config">配置</button>'."\n";
-    }
-    if($USER_DB['UserGroup'] === 'root' && !$online){ //管理员&本地主题>显示删除
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="del">删除</button>'."\n";
-    }
-?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!--主题卡片End-->
-<?php }?>            
-            
-        </div> 
-    </div>
-  </div>
-</div>
-<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs;?>/jquery/jquery.lazyload.min.js"></script>
-<script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
-<?php load_static('js');?>
-<script>var datas = <?php echo json_encode($themes)?>;</script>
-<script src = "./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>
-</body>
-</html>

templates/admin/page/theme_guide.php

@@ -1,84 +0,0 @@
-<?php $title='引导页模板';$awesome=true; require 'header.php'; if($USER_DB['UserGroup'] != 'root'){$content='您没有权限访问此页面'; require(DIR.'/templates/admin/page/404.php');exit;}?>
-<style type="text/css">
-.screenshot{
-    width: 99%;  
-    height: 99%;  
-    max-width: 100%;  
-    max-height: 100%;   
-    aspect-ratio:16/9;
-}
-#default #del {display: none;}
-</style> 
-<body>
-<div class="layuimini-container">
-  <div class="layuimini-main">
-    <blockquote class="layui-elem-quote layuimini-form" style="margin-top: 0px;border-left: 5px solid <?php echo $cache?"#1e9fff":($global_config['offline']?"":"#639d11") ?>;padding: 6px;">
-        <span class="layui-breadcrumb" lay-separator="|">
-            <a href="./index.php?c=admin&page=theme_guide&cache=no&u=<?php echo U;?>" >刷新数据</a>
-        </span>
-    </blockquote>
-    <div class="layui-bg-gray" style="padding: 1px;" >
-        <div class="layui-row layui-col-space15">
-<?php 
-$Space = '                            ';//占位符,强迫症想让输出的源码好看点而已...
-foreach ($themes as $key => $theme) { 
-$online = !empty($theme['info']['md5']); //在线主题!
-if($global_templates['guide'] == $key){
-    $icon ='<i class="fa fa-magic" style="color: #03a9f4;" title = "正在使用"></i> ';
-}else{
-    $icon ='';
-}
-$color = ($global_templates['guide'] == $key ?"color: #03a9f4;":"");
-?>
-            <!--主题卡片--> 
-            <div class="layui-col-xs layui-col-sm4 layui-col-md3 ">
-                <div class="layui-card">
-                    <div class="layui-card-header"> 
-                        <div style="float:left; cursor:pointer;<?php echo $color; ?>" title="<?php echo $key; ?>"><?php echo $icon.$theme['info']['name']; ?></div>
-                        <div style="float:right;cursor:pointer;" title="<?php echo $theme['info']['update']; ?>"><?php echo $theme['info']['version']; ?></div>
-                    </div>
-                    <div class="layui-card-body">
-                        <div class="img-list"><img class="screenshot" layer-src="<?php echo $theme['info']['screenshot']; ?>" data-original="<?php echo $theme['info']['screenshot']; ?>"></div>
-                    </div>
-                    <div class="layui-card-header" style="height: 1px;"></div>
-                    <div class="layui-card-header" style="height: auto;" id="guide">
-                        <div class="layui-btn-group" id="<?php echo $key;?>">
-<?php 
-    if($online){ //如果是在线主题则显示下载
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="dw">下载</button>'."\n";
-    }elseif($theme['info']['up'] == 1){ //如果有更新则同时显示下载和使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="up">更新</button>'."\n";
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }else{ //其他情况仅显示使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="detail">详情</button>'."\n";
-    if(!$online){ //本地主题显示预览
-        //echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="preview">预览</button>'."\n";
-    }
-    if($theme['info']['config'] == '1'){ //支持配置的主题显示配置
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="config">配置</button>'."\n";
-    }
-    if($USER_DB['UserGroup'] === 'root' && !$online){ //管理员&本地主题>显示删除
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="del">删除</button>'."\n";
-    }
-?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!--主题卡片End-->
-<?php }?>            
-            
-        </div> 
-    </div>
-  </div>
-</div>
-<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs;?>/jquery/jquery.lazyload.min.js"></script>
-<script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
-<?php load_static('js');?>
-<script>var datas = <?php echo json_encode($themes)?>;</script>
-<script src = "./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>
-</body>
-</html>

templates/admin/page/theme_home.php

@@ -1,94 +0,0 @@
-<?php $title='主题设置';$awesome=true; require 'header.php'; ?>
-<style type="text/css">
-.screenshot{
-    width: 99%;  
-    height: 99%;  
-    max-width: 100%;  
-    max-height: 100%;   
-    aspect-ratio:16/9;
-}
-#default #del {display: none;}
-</style> 
-<body>
-<div class="layuimini-container">
-  <div class="layuimini-main">
-    <blockquote class="layui-elem-quote layuimini-form" style="margin-top: 0px;border-left: 5px solid <?php echo $cache?"#1e9fff":($global_config['offline']?"":"#639d11") ?>;padding: 6px;">
-        <span class="layui-breadcrumb" lay-separator="|">
-            <a href="./index.php?c=admin&page=theme_home&cache=no&u=<?php echo U;?>" >刷新数据</a>
-            <a href="javascript:;" layuimini-content-href="theme_login" data-title="登录模板">登录模板</a>
-            <a href="javascript:;" layuimini-content-href="theme_transit" data-title="过渡模板">过渡模板</a>
-            <a href="javascript:;" layuimini-content-href="theme_article" data-title="文章模板">文章模板</a>
-            <?php  if($USER_DB['UserGroup'] === 'root'){echo '<a href="javascript:;" layuimini-content-href="theme_register" data-title="注册模板">注册模板</a>';} ?>
-            <?php  if($USER_DB['UserGroup'] === 'root'){echo '<a href="javascript:;" layuimini-content-href="theme_guide" data-title="引导页模板">引导页模板</a>';} ?>
-        </span>
-    </blockquote>
-    <div class="layui-bg-gray" style="padding: 1px;" >
-        <div class="layui-row layui-col-space15">
-<?php 
-$Space = '                            ';//占位符,强迫症想让输出的源码好看点而已...
-foreach ($themes as $key => $theme) { 
-$online = !empty($theme['info']['md5']); //在线主题!
-if($s_templates['home_pc'] == $key && $s_templates['home_pad'] == $key){
-    $icon ='<i class="layui-icon layui-icon-cellphone" style="color: #03a9f4;" title = "移动终端正在使用此主题"> </i><i class="fa fa-tv" style="color: #03a9f4;" title = "PC终端正在使用此主题"></i> ';
-}elseif($s_templates['home_pc'] == $key){
-    $icon ='<i class="fa fa-tv" style="color: #03a9f4;" title = "PC终端正在使用此主题"></i> ';
-}elseif($s_templates['home_pad'] == $key){
-    $icon ='<i class="layui-icon layui-icon-cellphone" style="color: #03a9f4;" title = "移动终端正在使用此主题"></i> ';
-}else{
-    $icon ='';
-}
-$color = ($s_templates['home_pc'] == $key || $s_templates['home_pad'] == $key ?"color: #03a9f4;":"");
-?>
-            <!--主题卡片--> 
-            <div class="layui-col-xs layui-col-sm4 layui-col-md3 ">
-                <div class="layui-card">
-                    <div class="layui-card-header"> 
-                        <div style="float:left; cursor:pointer;<?php echo $color; ?>" title="<?php echo $key; ?>"><?php echo $icon.$theme['info']['name']; ?></div>
-                        <div style="float:right;cursor:pointer;" title="<?php echo $theme['info']['update']; ?>"><?php echo $theme['info']['version']; ?></div>
-                    </div>
-                    <div class="layui-card-body">
-                        <div class="img-list"><img class="screenshot" layer-src="<?php echo $theme['info']['screenshot']; ?>" data-original="<?php echo $theme['info']['screenshot']; ?>"></div>
-                    </div>
-                    <div class="layui-card-header" style="height: 1px;"></div>
-                    <div class="layui-card-header" style="height: auto;" id="home">
-                        <div class="layui-btn-group" id="<?php echo $key;?>">
-<?php 
-    $theme_set = check_purview('theme_set',1);
-    if($online){ //如果是在线主题则显示下载
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="dw">下载</button>'."\n";
-    }elseif($theme['info']['up'] == 1){ //如果有更新则同时显示下载和使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="up">更新</button>'."\n";
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }else{ //其他情况仅显示使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="detail">详情</button>'."\n";
-    if(!$online){ //本地主题显示预览
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="preview">预览</button>'."\n";
-    }
-    if($theme['info']['config'] == '1' && $theme_set){ //支持配置的主题显示配置
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="config">配置</button>'."\n";
-    }
-    if($USER_DB['UserGroup'] === 'root' && !$online){ //管理员&本地主题>显示删除
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="del">删除</button>'."\n";
-    }
-?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!--主题卡片End-->
-<?php }?>            
-            
-        </div> 
-    </div>
-  </div>
-</div>
-<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs;?>/jquery/jquery.lazyload.min.js"></script>
-<script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
-<?php load_static('js');?>
-<script>var datas = <?php echo json_encode($themes)?>;</script>
-<script src = "./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>
-</body>
-</html>

templates/admin/page/theme_login.php

@@ -1,87 +0,0 @@
-<?php $title='登录模板';$awesome=true; require 'header.php'; ?>
-<style type="text/css">
-.screenshot{
-    width: 99%;  
-    height: 99%;  
-    max-width: 100%;  
-    max-height: 100%;   
-    aspect-ratio:16/9;
-}
-#default #del {display: none;}
-</style> 
-<body>
-<div class="layuimini-container">
-  <div class="layuimini-main">
-    <blockquote class="layui-elem-quote layuimini-form" style="margin-top: 0px;border-left: 5px solid <?php echo $cache?"#1e9fff":($global_config['offline']?"":"#639d11") ?>;padding: 6px;">
-        <span class="layui-breadcrumb" lay-separator="|">
-            <a href="./index.php?c=admin&page=theme_login&cache=no&u=<?php echo U;?>" >刷新数据</a>
-            <a href="javascript:;" layuimini-content-href="theme_home" data-title="主页模板">主页模板</a>
-            <a href="javascript:;" layuimini-content-href="theme_transit" data-title="过渡模板">过渡模板</a> 
-            <a target="_blank" href="./index.php?c=<?php echo $USER_DB['Login']?>&u=<?php echo U?>" >注:登录样式只有使用您的专属登录入口时有效 <点击预览></a>
-        </span>
-    </blockquote>
-    <div class="layui-bg-gray" style="padding: 1px;" >
-        <div class="layui-row layui-col-space15">
-<?php 
-$Space = '                            ';//占位符,强迫症想让输出的源码好看点而已...
-foreach ($themes as $key => $theme) { 
-$online = !empty($theme['info']['md5']); //在线主题!
-if($s_templates['login'] == $key){
-    $icon ='<i class="fa fa-magic" style="color: #03a9f4;" title = "正在使用此主题"></i> ';
-}else{
-    $icon ='';
-}
-$color = ($s_templates['login'] == $key ?"color: #03a9f4;":"");
-?>
-            <!--主题卡片--> 
-            <div class="layui-col-xs layui-col-sm4 layui-col-md3 ">
-                <div class="layui-card">
-                    <div class="layui-card-header"> 
-                        <div style="float:left; cursor:pointer;<?php echo $color; ?>" title="<?php echo $key; ?>"><?php echo $icon.$theme['info']['name']; ?></div>
-                        <div style="float:right;cursor:pointer;" title="<?php echo $theme['info']['update']; ?>"><?php echo $theme['info']['version']; ?></div>
-                    </div>
-                    <div class="layui-card-body">
-                        <div class="img-list"><img class="screenshot" layer-src="<?php echo $theme['info']['screenshot']; ?>" data-original="<?php echo $theme['info']['screenshot']; ?>"></div>
-                    </div>
-                    <div class="layui-card-header" style="height: 1px;"></div>
-                    <div class="layui-card-header" style="height: auto;" id="login">
-                        <div class="layui-btn-group" id="<?php echo $key;?>">
-<?php 
-    if($online){ //如果是在线主题则显示下载
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="dw">下载</button>'."\n";
-    }elseif($theme['info']['up'] == 1){ //如果有更新则同时显示下载和使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="up">更新</button>'."\n";
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }else{ //其他情况仅显示使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="detail">详情</button>'."\n";
-    if(!$online){ //本地主题显示预览
-        //echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="preview">预览</button>'."\n";
-    }
-    if($theme['info']['config'] == '1'){ //支持配置的主题显示配置
-        //echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="config">配置</button>'."\n";
-    }
-    if($USER_DB['UserGroup'] === 'root' && !$online){ //管理员&本地主题>显示删除
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="del">删除</button>'."\n";
-    }
-?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!--主题卡片End-->
-<?php }?>            
-            
-        </div> 
-    </div>
-  </div>
-</div>
-<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs;?>/jquery/jquery.lazyload.min.js"></script>
-<script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
-<?php load_static('js');?>
-<script>var datas = <?php echo json_encode($themes)?>;</script>
-<script src = "./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>
-</body>
-</html>

templates/admin/page/theme_register.php

@@ -1,86 +0,0 @@
-<?php $title='注册模板';$awesome=true; require 'header.php'; if($USER_DB['UserGroup'] != 'root'){$content='您没有权限访问此页面'; require(DIR.'/templates/admin/page/404.php');exit;}?>
-<style type="text/css">
-.screenshot{
-    width: 99%;  
-    height: 99%;  
-    max-width: 100%;  
-    max-height: 100%;   
-    aspect-ratio:16/9;
-}
-#default #del {display: none;}
-</style> 
-<body>
-<div class="layuimini-container">
-  <div class="layuimini-main">
-    <blockquote class="layui-elem-quote layuimini-form" style="margin-top: 0px;border-left: 5px solid <?php echo $cache?"#1e9fff":($global_config['offline']?"":"#639d11") ?>;padding: 6px;">
-        <span class="layui-breadcrumb" lay-separator="|">
-            <a href="./index.php?c=admin&page=theme_register&cache=no&u=<?php echo U;?>" >刷新数据</a>
-            <a href="javascript:;" layuimini-content-href="theme_home" data-title="主页模板">主页模板</a>
-            <a href="javascript:;" layuimini-content-href="theme_login" data-title="登录模板">登录模板</a>
-        </span>
-    </blockquote>
-    <div class="layui-bg-gray" style="padding: 1px;" >
-        <div class="layui-row layui-col-space15">
-<?php 
-$Space = '                            ';//占位符,强迫症想让输出的源码好看点而已...
-foreach ($themes as $key => $theme) { 
-$online = !empty($theme['info']['md5']); //在线主题!
-if($global_templates['register'] == $key){
-    $icon ='<i class="fa fa-magic" style="color: #03a9f4;" title = "正在使用"></i> ';
-}else{
-    $icon ='';
-}
-$color = ($global_templates['register'] == $key ?"color: #03a9f4;":"");
-?>
-            <!--主题卡片--> 
-            <div class="layui-col-xs layui-col-sm4 layui-col-md3 ">
-                <div class="layui-card">
-                    <div class="layui-card-header"> 
-                        <div style="float:left; cursor:pointer;<?php echo $color; ?>" title="<?php echo $key; ?>"><?php echo $icon.$theme['info']['name']; ?></div>
-                        <div style="float:right;cursor:pointer;" title="<?php echo $theme['info']['update']; ?>"><?php echo $theme['info']['version']; ?></div>
-                    </div>
-                    <div class="layui-card-body">
-                        <div class="img-list"><img class="screenshot" layer-src="<?php echo $theme['info']['screenshot']; ?>" data-original="<?php echo $theme['info']['screenshot']; ?>"></div>
-                    </div>
-                    <div class="layui-card-header" style="height: 1px;"></div>
-                    <div class="layui-card-header" style="height: auto;" id="register">
-                        <div class="layui-btn-group" id="<?php echo $key;?>">
-<?php 
-    if($online){ //如果是在线主题则显示下载
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="dw">下载</button>'."\n";
-    }elseif($theme['info']['up'] == 1){ //如果有更新则同时显示下载和使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="up">更新</button>'."\n";
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }else{ //其他情况仅显示使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="detail">详情</button>'."\n";
-    if(!$online){ //本地主题显示预览
-        //echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="preview">预览</button>'."\n";
-    }
-    if($theme['info']['config'] == '1'){ //支持配置的主题显示配置
-        //echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="config">配置</button>'."\n";
-    }
-    if($USER_DB['UserGroup'] === 'root' && !$online){ //管理员&本地主题>显示删除
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="del">删除</button>'."\n";
-    }
-?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!--主题卡片End-->
-<?php }?>            
-            
-        </div> 
-    </div>
-  </div>
-</div>
-<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs;?>/jquery/jquery.lazyload.min.js"></script>
-<script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
-<?php load_static('js');?>
-<script>var datas = <?php echo json_encode($themes)?>;</script>
-<script src = "./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>
-</body>
-</html>

templates/admin/page/theme_transit.php

@@ -1,89 +0,0 @@
-<?php $title='过渡模板';$awesome=true; require 'header.php'; 
-$site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
-$tip = $site['link_model'] == 'Transition';
-?>
-<style type="text/css">
-.screenshot{
-    width: 99%;  
-    height: 99%;  
-    max-width: 100%;  
-    max-height: 100%;   
-    aspect-ratio:16/9;
-}
-#default #del {display: none;}
-</style> 
-<body>
-<div class="layuimini-container">
-  <div class="layuimini-main">
-    <blockquote class="layui-elem-quote layuimini-form" style="margin-top: 0px;border-left: 5px solid <?php echo $cache?"#1e9fff":($global_config['offline']?"":"#639d11") ?>;padding: 6px;">
-        <span class="layui-breadcrumb" lay-separator="|">
-            <a href="./index.php?c=admin&page=theme_transit&cache=no&u=<?php echo U;?>">刷新数据</a>
-            <a href="javascript:;" layuimini-content-href="set_transit" data-title="设置过渡页面">设置</a><?php if(!$tip){echo '
-            <a href="javascript:;" layuimini-content-href="SiteSetting" data-title="站点设置">注:请将站点设置>链接模式>改为过渡页面</a>';}?> 
-        </span>
-    </blockquote>
-    <div class="layui-bg-gray" style="padding: 1px;" >
-        <div class="layui-row layui-col-space15">
-<?php 
-$Space = '                            ';//占位符,强迫症想让输出的源码好看点而已...
-foreach ($themes as $key => $theme) { 
-$online = !empty($theme['info']['md5']); //在线主题!
-if($s_templates['transit'] == $key){
-    $icon ='<i class="fa fa-magic" style="color: #03a9f4;" title = "正在使用"></i> ';
-}else{
-    $icon ='';
-}
-$color = ($s_templates['transit'] == $key ?"color: #03a9f4;":"");
-?>
-            <!--主题卡片--> 
-            <div class="layui-col-xs layui-col-sm4 layui-col-md3 ">
-                <div class="layui-card">
-                    <div class="layui-card-header"> 
-                        <div style="float:left; cursor:pointer;<?php echo $color; ?>" title="<?php echo $key; ?>"><?php echo $icon.$theme['info']['name']; ?></div>
-                        <div style="float:right;cursor:pointer;" title="<?php echo $theme['info']['update']; ?>"><?php echo $theme['info']['version']; ?></div>
-                    </div>
-                    <div class="layui-card-body">
-                        <div class="img-list"><img class="screenshot" layer-src="<?php echo $theme['info']['screenshot']; ?>" data-original="<?php echo $theme['info']['screenshot']; ?>"></div>
-                    </div>
-                    <div class="layui-card-header" style="height: 1px;"></div>
-                    <div class="layui-card-header" style="height: auto;" id="transit">
-                        <div class="layui-btn-group" id="<?php echo $key;?>">
-<?php 
-    if($online){ //如果是在线主题则显示下载
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="dw">下载</button>'."\n";
-    }elseif($theme['info']['up'] == 1){ //如果有更新则同时显示下载和使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="up">更新</button>'."\n";
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }else{ //其他情况仅显示使用
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="set">使用</button>'."\n";
-    }
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="detail">详情</button>'."\n";
-    if(!$online){ //本地主题显示预览
-        //echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="preview">预览</button>'."\n";
-    }
-    if($theme['info']['config'] == '1'){ //支持配置的主题显示配置
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="config">配置</button>'."\n";
-    }
-    if($USER_DB['UserGroup'] === 'root' && !$online){ //管理员&本地主题>显示删除
-        echo $Space.'<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" id="del">删除</button>'."\n";
-    }
-?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!--主题卡片End-->
-<?php }?>            
-            
-        </div> 
-    </div>
-  </div>
-</div>
-<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs;?>/jquery/jquery.lazyload.min.js"></script>
-<script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
-<?php load_static('js');?>
-<script>var datas = <?php echo json_encode($themes)?>;</script>
-<script src = "./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>
-</body>
-</html>

templates/admin/page/updatelog.php

@@ -2,6 +2,250 @@
 <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.12-20240308</h4>
+            <ul>
+                <li>[优化] 后台概要页支持时间差异较大提示,避免因时间错误导致的各种问题</li>
+                <li>[新增] 站点设置新增重复链接选项,解决部分用户需要添加相同链接的问题</li>
+                <li>[升级] Layui组件由2.9.2升级到2.9.7</li>
+                <li>[变更] 默认配置调整,概要页QQ群改为免费用户群(授权用户可凭授权加入会员群)</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.11-20240119</h4>
+            <ul>
+                <li>[修复] 链接识别遇到中文域名时提示URL无效</li>
+                <li>[修复] 链接模式为隐私保护(header)时中文域名无法跳转</li>
+                <li>[修复] 主链优先设为强制优先时不起作用</li>
+                <li>[优化] 一键诊断缺少intl扩展模块时给出提醒</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.09-20231220</h4>
+            <ul>
+                <li>[修复] 紧急修复一个影响登录的bug,影响范围:v2.1.08版本 + MySQL数据库</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.08-20231219</h4>
+            <ul>
+                <li>[升级] Layui组件由2.9.0升级到2.9.2</li>
+                <li>[修复] Atool工具和用户管理中强制修改用户密码时未将已登录的终端踢下线的bug</li>
+                <li>[优化] 概要页面更新内容直接从服务器获取并显示,不需要在跳转到Gitee上查看</li>
+                <li>[优化] 主题管理:可更新时在右上显示一个问号,点击可以查看更新内容</li>
+                <li>[变更] 普通账号不在支持自定义登录模板,只有站长号可以选择和配置模板</li>
+                <li>[优化] 系统设置的保存按钮改为悬浮在页面底部,避免老是要滚动到底部去点保存的问题</li>
+                <li>[修复] 链接列表手机端不显示删除按钮的问题</li>
+                <li>[修复] 书签分享特定条件下存在的bug</li>
+                <li>[修复] 安全设置>登录保持设为浏览器关闭会导致无法登录的bug</li>
+                <li>[修复] OTP双重认证使用公用登录入口时无法输入验证码的问题 ( 需更新登录模板 )</li>
+                <li>[模板] [12.02]爱导航V1: 配置选项新增分类收缩,可选仅图标/分类/菜单/目录,用于解决部分手机端用户不知道点这个图标展开分类的问题</li>
+                <li>[模板] [12.02]百素New: 新增拖拽排序功能、修复未加载用户header和全局header的bug、新增搜索框背景自定义支持</li>
+                <li>[模板] [12.20]花森主页: 调整本地添加链接时判断是否为URL的条件,仅检测http(s)://开头</li>
+                <li>[修复] [12.20]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">
+            <h4 class="layui-timeline-title">v2.1.06-20231114</h4>
+            <ul>
+                <li>[修复] 开启离线模式时概要页依旧获取在线数据,V0921</li>
+                <li>[优化] 为部分操作添加处理中的效果( 防止网络极差的用户以为没点到而重复点击 )</li>
+                <li>[新增] 内置用户组新增:访客 (代号:visitor,处于该用户组的账号登录后跳转到默认用户的主页,配合引导页使用实现需注册登录才能访问站点)</li>
+                <li>[备注] 由于访客无权限进入后台,所以也无法自助修改密码</li>
+                <li>[新增] 在用户组列表中显示内置用户组 ( 默认/访客/站长 )</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">
+            <h4 class="layui-timeline-title">v2.1.05-20231107</h4>
+            <ul>
+                <li>[修复] 使用MySQL/MariaDB数据库时记录访客IP错误</li>
+                <li>[修复] 注册模板/引导页模板配置无法正常读取</li>
+                <li>[模板] 主页模板新增 > Snavigation ( 简约型的模板,点击时间显示书签数据 )</li>
+                <li>[模板] 引导页模板新增 > 無名の主页</li>
+                <li>[模板] WebStack-Hugo > 搜索栏新增站内搜索选项,用于解决同时开启站内搜索和搜索热词时遮挡问题</li>
+                <li>[模板] 挽风导航V1.0 > CSS样式细节优化 </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.04-20231101</h4>
+            <ul>
+                <li>[修复] 连续添加分类时未正确添加到所选的父分类中</li>
+                <li>[修复] 使用MySQL/MariaDB数据库时文章图片可能不显示的bug</li>
+                <li>[优化] 二级域名功能支持已知的双后缀顶级域名(例如example.com.cn)</li>
+                <li>[新增] Docker镜像增加intl模块</li>
+                <li>[模板] WebStack-Hugo > 修复过渡页模板logo设置无效</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.03-20231020</h4>
+            <ul>
+                <li>[修复] 站点地图时间格式问题</li>
+                <li>[修复] 后台我的主页地址错误</li>
+                <li>[变更] 移除授权管理页查询授权功能 ( 如需查询请联系客服 )</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">
+            <h4 class="layui-timeline-title">v2.1.02-20231013</h4>
+            <ul>
+                <li>[优化] IP统计的记录方式,提高性能和稳定性</li>
+                <li>[修复] 未在系统设置保存过设置时因缺少参数而导致部分页面加载异常</li>
+                <li>[安装] 数据库类型选项新增MariaDB,其他细节调整</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">
+            <h4 class="layui-timeline-title">v2.1.01-20231003</h4>
+            <ul>
+                <li>[优化] 已部署国内服务器并接入了CDN加速和3个资源节点</li>
+                <li>[新增] 系统设置>资源节点,可选自动/国内1/国内2/海外1</li>
+                <li>[新增] 系统设置>请求超时,默认为3秒,范围3-60</li>
+                <li>[新增] 后台>安全设置(右上角账号下拉)>新增管理入口选项,可选隐藏/显示/登录时显示</li>
+                <li>[优化] 静态链接(伪静态)处理方案,支持选择UN(用户名)或UID(用户ID)作为用户标识</li>
+                <li>[优化] 百度推送/站点地图静态链接格式调整</li>
+                <li>[优化] 后台的部分前台链接支持伪静态链接</li>
+                <li>[修复] 注册模板无法切换、其他已知的bug</li>
+                <li>[模板] 所有模板更新至2.1.0</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">
+            <h4 class="layui-timeline-title">v2.0.41-20230921</h4>
+            <ul>
+                <li>[优化] 后台>概要页面改为异步加载,避免因网络不好时出现页面打开慢的问题</li>
+                <li>[新增] 后台>授权管理页面新增正版验证按钮/显示授权类型/相关验证逻辑调整</li>
+                <li>[修复] 文章功能全局开关为关闭时前台依然输出文章链接的bug</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">
+            <h4 class="layui-timeline-title">v2.0.40-20230919</h4>
+            <ul>
+                <li>[变更] 优化资源节点,提高系统更新速度,主题下载速度,预览图加载速度! </li>
+                <li>[变更] 为保障授权用户的权益,本版开始请求下载主题/更新系统时服务器将验证授权</li>
+                <li>[变更] 开源版(免费版)与授权版(标准版/高级版)将分开维护,以避免某些人非法获取权限,这对付费用户是极不公平的</li>
+                <li>[新增] 特定操作时清理缓存,避免因版本不一致造成的问题</li>
+                <li>[新增] 请求服务器时携带本地系统版本号以便于服务器返回相匹配的资源</li>
+                <li>[新增] 导出导入页面的导入功能支持iTab的数据( 扩展名为: itabdata )</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.0.39-20230913</h4>
+            <ul>
+                <li>[升级] Layui组件由 v2.8.10 升级到 v2.8.17</li>
+                <li>[优化] 站点地图支持生成文章页面链接</li>
+                <li>[新增] 系统设新增静态链接选项,开启后部分动态链接将改为静态链接 (请确保伪静态生效中,仅针对前台内容)</li>
+                <li>[优化] 挽风导航V1:文章图片点击放大,新增两处自定义代码,添加返回顶部功能!主页增加一处自定义代码,修复全局底部代码无效,磨砂风格支持</li>
+                <li>[修复] 使用Mysql数据库在访问注册页面/引导时报错</li>
+                <li>[修复] 全局类模板配置保存位置错误</li>
+                <li>[修复] 站点地图HTTPS访问时携带443端口的问题 #I80I6K</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">
+            <h4 class="layui-timeline-title">v2.0.38-20230906</h4>
+            <ul>
+                <li>[变更] 初始化安装默认关闭防XSS和SQL(个人使用没必要开启,会导致自定义代码时被拦截)</li>
+                <li>[变更] 后台概要页获取IP列表时对IP进行排序,以方便观察非正常访问的IP(如爬虫)</li>
+                <li>[变更] Nginx部分伪静态规则由程序接管,避免更新规则时用户需手动配置伪静态 (需将生成的规则重新配置到服务器)</li>
+                <li>[变更] 授权管理页面内容更新</li>
+                <li>[新增] 系统设置中新增站点地图入口,可配置生成sitemap.xml站点地图的参数! (首次使用请看顶部说明)</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">
+            <h4 class="layui-timeline-title">v2.0.37-20230831</h4>
+            <ul>
+                <li>[变更] 优化前端前置处理代码,让模板调用数据更加灵活</li>
+                <li>[新增] 支持更换验证模板/收录模板/留言模板</li>
+                <li>[新增] 验证模板支持设置提示内容,如获取密码的提示</li>
+                <li>[新增] 挽风导航V1的收录模板和留言模板</li>
+                <li>[新增] 4个简约风格的验证模板</li>
+                <li>[修复] 文章编辑器输入HTML代码时在编辑存在异常的问题</li>
+                <li>[修复] 文章标题/摘要存在HTML标签时被解析的问题</li>
+                <li>[修复] WebStack-Hugo主页模板4个已知问题</li>
+                <li>[修复] 特定情况下安装时使用MySQL数据库可能乱码的问题</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.0.36-20230824</h4>
+            <ul>
+                <li>[修复] 判断是否显示收录的逻辑错误(导致设为无需审核时不显示)</li>
+                <li>[变更] 移除2个链接图标API,因稳定性欠佳</li>
+                <li>[修复] WebStack-Hugo主页模板悬停提示不显示</li> 
+                <li>[新增] 挽风导航主页模板(内置文章模板/拟态风格),注:内置文章模板在预览状态下是不生效的!</li>
+                <li>[新增] 挽风导航登录模板/过度模板</li>
+                <li>[新增] 后台概要页可以点击报表统计获取访问的IP列表</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">
+            <h4 class="layui-timeline-title">v2.0.35-20230816</h4>
+            <ul>
+                <li>[新增] Atool工具箱增加关闭OTP双重验证选项(删OTP),用于解决站长丢失OTP令牌造成无法登录</li>
+                <li>[新增] 用户管理支持关闭OTP双重验证选项,用于站长帮助用户关闭OTP双重验证</li>
+                <li>[优化] 邮件配置发送人只填发送人名称未按要求格式填写邮箱时由系统自动完成拼接</li>
+                <li>[优化] 文章管理特定情况造成缺少资源时提醒用户如何解决</li>
+                <li>[模板] 新增爱导航V1主页模板,轻量化设计简洁不卡顿/支持缓存/自适应/站内搜索,适合书签多的用户使用</li>
+                <li>[模板] WebStack-Hugo主页模板新增:夜间背景图/炫彩横幅</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/apply/default/index.php

@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+<head>
+	<meta charset="utf-8" />
+	<title>申请收录</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+	<link rel='stylesheet' href='<?php echo $layui['css']; ?>'>
+	<style>
+	    body{background-color:rgba(0, 0, 51, 0.8);}
+		.title{max-width: 400px;height: auto;margin-left: auto;margin-right: auto;margin-top:5em;}
+		.title h1{color:#FFFFFF;text-align: center;}
+		 .required {color: red;margin-left: 5px;float: right;}
+	</style>
+</head>
+<body>
+<div class="layui-container">
+<div class="layui-row">
+<div class="title">
+<h1>申请收录</h1>
+</div>
+<div class="layui-col-lg6 layui-col-md-offset3" style ="margin-top:3em;">
+<form class="layui-form layui-form-pane" action="" lay-filter="apply">
+    
+  <div class="layui-form-item" style="color: #fbfbfb;">
+    <?php echo $apply['Notice'];?>
+  </div>
+<div class="layui-form-item">
+  <label class="layui-form-label">网站标题<span class="required">*</span></label>
+  <div class="layui-input-block">
+    <input type="text" name="title" required lay-verify="required" placeholder="例如 百度一下" autocomplete="off" class="layui-input">
+  </div>
+</div>
+<div class="layui-form-item">
+  <label class="layui-form-label">网站链接<span class="required">*</span></label>
+  <div class="layui-input-block">
+    <input type="url" name="url" required lay-verify="required|url" placeholder="例如 https://www.baidu.com" autocomplete="off" class="layui-input">
+  </div>
+</div>
+
+  <div class="layui-form-item">
+    <label class="layui-form-label">网站分类<span class="required">*</span></label>
+    <div class="layui-input-block">
+      <select name="category_id" lay-verify="required" lay-search>
+        <option ></option>
+        <?php echo_category(false);//输出公开分类 ?>
+      </select>
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">网站图标</label>
+    <div class="layui-input-block">
+      <input type="url" name="iconurl" lay-verify="url" placeholder="例如 https://www.baidu.com/favicon.ico" autocomplete="off" class="layui-input">
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">网站描述</label>
+    <div class="layui-input-block">
+      <input type="text" name="description"  placeholder="例如 搜索引擎" autocomplete="off" class="layui-input">
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">联系邮箱</label>
+    <div class="layui-input-block">
+      <input type="text" name="email" placeholder="例如 admin@qq.com" autocomplete="off" class="layui-input">
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <button class="layui-btn" lay-submit lay-filter="submit" style = "width:100%;">提交</button>
+  </div>
+  </form>
+  <?php if( is_login() ) { echo 
+  '<div class="layui-form-item"><button class="layui-btn" lay-submit lay-filter="test" style = "width:100%;">生成测试数据 (自己登录时才显示此按钮)</button></div>'
+  ;} ?> 
+</div>
+</div>
+</div>
+<script src='<?php echo $layui['js']; ?>'></script>
+<script>
+layui.use(['form','layer'], function(){
+    var form = layui.form;
+    var $ = layui.jquery;
+
+    form.on('submit(submit)', function(data){
+        $.post('',data.field,function(re,status){
+            if(re.code == 1) {
+                layer.msg(re.msg, {icon: 1});
+            }else{
+                layer.msg(re.msg, {icon: 5});
+            }
+        });
+        return false; 
+    });<?php if( is_login() ) { echo '
+    //生成测试数据
+    form.on("submit(test)", function(data){
+        form.val("apply", {
+                "title": "百度一下"
+                ,"url": "https://"+ Math.round(new Date()) +".baidu.com"
+                ,"iconurl": "https://www.baidu.com/favicon.ico"
+                ,"description": "搜索引擎"
+                ,"email": "admin@qq.com"
+            });
+        return false; 
+    });' ;} ?> 
+});
+</script>
+</body>
+</html>

templates/apply/default/info.json

@@ -0,0 +1,8 @@
+{
+	"name":	"默认模板",
+	"description":	"默认",
+	"homepage":	"https://gitee.com/tznb/TwoNav",
+	"version":	"2.1.0",
+	"update":	"2023/09/28",
+	"author":	"TwoNav"
+}

templates/article/default/index.php

@@ -19,7 +19,7 @@
     <span class="mdui-btn mdui-btn-icon mdui-ripple mdui-ripple-white" mdui-drawer="{target: '#main-drawer', swipe: true}">
       <i class="mdui-icon material-icons">menu</i>
     </span>
-    <a href="" class="mdui-typo-headline mdui-hidden-xs"><?php echo $site['logo'];?></a>
+    <a href="<?php echo $urls['home'];?>" class="mdui-typo-headline mdui-hidden-xs"><?php echo $site['logo'];?></a>
     <a href="" class="mdui-typo-title"><?php echo $data['title'];?></a>
     <div class="mdui-toolbar-spacer"></div>
   </div>

templates/article/default/info.json

@@ -1,9 +1,9 @@
 {
-    "name":"默认",
+    "name":"默认模板",
     "description":"系统默认的文章模板,支持代码段上色,支持自适应!",
     "homepage":"https://gitee.com/tznb/TwoNav",
-    "version":"2.0.0",
-    "update":"2023/07/01",
+    "version":"2.1.0",
+    "update":"2023/09/28",
     "author":"TwoNav",
     "screenshot":"https://img.lm21.top/article_default.jpg",
     "config": {

templates/guestbook/default/index.php

@@ -0,0 +1,87 @@
+<?php ?>
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <title><?php echo $site['title'];?> - 极简留言板</title>
+  <link rel='stylesheet' href='<?php echo $layui['css']; ?>'>
+  <style>    
+    .layui-form-item {
+        margin-bottom: 10px;
+        height: 38px;
+    }
+  </style>
+</head>
+<body>
+<div>
+<!-- 内容主体区域 -->
+
+<div class="layui-row" style = "margin-top:18px;">
+    
+  <div class="layui-container">
+  <div class="layui-col-lg10 ">
+  <form class="layui-form">
+  <fieldset class="layui-elem-field layui-field-title " style="margin-top: 30px;"><legend>极简留言板</legend></fieldset>
+  <div class="layui-form-item">
+    <label class="layui-form-label">反馈类型</label>
+    <div class="layui-input-inline">
+      <select lay-verify="required"  id="type" name="type" lay-search >
+        <option value="投诉建议" >投诉建议</option>
+        <option value="问题反馈" selected="" >问题反馈</option>
+        <option value="商务合作" >商务合作</option>
+        <option value="其他" >其他</option>
+      </select>
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">联系方式</label>
+    <div class="layui-input-inline" >
+        <input  id = "contact" name="contact" value = "" placeholder="仅管理员可见" required  lay-verify="required" class="layui-input" maxlength="64">
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">标题</label>
+    <div class="layui-input-block" >
+        <input  id = "title" name="title" value = "" placeholder="" required  lay-verify="required" class="layui-input" maxlength="128">
+    </div>
+  </div>
+  <div class="layui-form-text">
+    <label class="layui-form-label">内容</label>
+    <div class="layui-input-block">
+        <textarea id = "content" name="content"  rows = "10" class="layui-textarea" required  lay-verify="required" maxlength="2048"></textarea>
+    </div>
+  </div>
+  <div class="layui-form-item" style="padding-top: 10px;">
+    <div class="layui-input-block">
+      <button class="layui-btn" lay-submit lay-filter="Submit">提交</button>
+    </div>
+  </div>
+</form>
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
+  <legend><?php echo $copyright;?></legend>
+  <!--非订阅用户请勿去除版权,谢谢-->
+</fieldset>
+</div>
+<!-- 内容主题区域END -->
+</div>
+<script src = '<?php echo $libs?>/jquery/jquery-3.6.0.min.js'></script>
+<script src = '<?php echo $layui['js']; ?>'></script>
+<script>
+layui.use(['form'], function(){
+    var form = layui.form;
+    form.on('submit(Submit)', function(data){
+        $.post('',data.field,function(data,status){
+            if(data.code == 1) {
+                layer.msg(data.msg, {icon: 1});
+                setTimeout(() => {location.reload();}, 1000);
+            }else{
+                layer.msg(data.msg, {icon: 5});
+            }
+        });
+        return false;
+    });
+});
+</script>
+</body>
+</html>

templates/guestbook/default/info.json

@@ -0,0 +1,8 @@
+{
+	"name":	"默认模板",
+	"description":	"默认",
+	"homepage":	"https://gitee.com/tznb/TwoNav",
+	"version":	"2.1.0",
+	"update":	"2023/09/28",
+	"author":	"TwoNav"
+}

templates/guide/default/config.php

@@ -15,14 +15,14 @@
     <div class="layui-form-item layui-form-text">
         <label class="layui-form-label">页内标题</label>
         <div class="layui-input-block">
-            <input type="text" name="title" placeholder="留空则使用默认用户站点配置的主标题" autocomplete="off" class="layui-input">
+            <input type="text" name="title" placeholder="留空则使用:默认设置>站点设置>主标题" autocomplete="off" class="layui-input">
         </div>
     </div>
 
     <div class="layui-form-item layui-form-text">
         <label class="layui-form-label">页内描述</label>
         <div class="layui-input-block">
-            <input type="text" name="p1" placeholder="留空则使用默认用户站点配置的描述" autocomplete="off" class="layui-input">
+            <input type="text" name="p1" placeholder="留空则使用:默认设置>站点设置>站点描述" autocomplete="off" class="layui-input">
         </div>
     </div>
 

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;?>">
@@ -18,8 +18,8 @@
 		<header id="header">
 			<div class="content">
 				<div class="inner">
-					<h3><?php echo empty($theme_config['title'])?$site['title']:$theme_config['title'];?></h3>
-					<p><?php echo empty($theme_config['p1'])?$site['description']:$theme_config['p1']; ?></p>
+					<h3><?php echo empty($theme_config['title'])?$s_site['title']:$theme_config['title'];?></h3>
+					<p><?php echo empty($theme_config['p1'])?$s_site['description']:$theme_config['p1']; ?></p>
 				</div>
 			</div>
 			<nav>

templates/guide/default/info.json

@@ -1,9 +1,9 @@
 {
-	"name":	"默认",
+	"name":	"默认模板",
 	"description":	"模板来自于html5up.net",
 	"homepage":	"https://gitee.com/tznb/TwoNav",
-	"version":	"2.0.0",
-	"update":	"2023/04/25",
+	"version":	"2.1.1",
+	"update":	"2023/11/27",
 	"author":	"TwoNav",
 	"config": {
         "title":"",

templates/home/default/index.php

@@ -21,7 +21,6 @@ if ($DescrRowNumber <= 0 ){
 }else{
     $DescrRowNumber = 2; $DescrHeight= 48; $Card = 120; // 超出范围则设为2行
 }
-
 ?>
 <!DOCTYPE html>
 <html lang="zh-ch">
@@ -141,20 +140,22 @@ body{
 		<?php } ?>
 	    <div class="mdui-divider"></div>
 <?php if(is_guestbook()){ ?>
-    	<a href="./index.php?c=guestbook&u=<?php echo $u?>" target="_blank">
+    	<a href="<?php echo $urls['guestbook']?>" target="_blank">
 			<li class="mdui-list-item mdui-ripple">
 				<div class="mdui-list-item-content category-name"><i class="fa fa-commenting-o"></i> 在线留言</div>
 			</li>
 		</a>
 <?php } ?>
 <?php if (is_apply()) { ?>
-    	<a href="./index.php?c=apply&u=<?php echo $u?>" target="_blank">
+    	<a href="<?php echo $urls['apply']?>" target="_blank">
 			<li class="mdui-list-item mdui-ripple">
 				<div class="mdui-list-item-content category-name"><i class="fa fa-pencil"></i> 申请收录</div>
 			</li>
 		</a>
 <?php } ?>
-        <a href="./index.php?c=admin&u=<?php echo $u?>"><li class="mdui-list-item mdui-ripple"><div class="mdui-list-item-content category-name CFC"><i class="fa fa-user-circle"></i>系统管理</div></li></a>
+<?php if (admin_inlet()) { ?>
+        <a href="<?php echo $urls['admin']?>"><li class="mdui-list-item mdui-ripple"><div class="mdui-list-item-content category-name CFC"><i class="fa fa-user-circle"></i>系统管理</div></li></a>
+<?php } ?>
 	</ul>
 
 	</div>
@@ -228,8 +229,7 @@ body{
 	 
 	<!-- footerend -->
 <script>
-var u = '<?php echo $u?>';
-var t = '<?php echo str_replace("./templates/", "", $theme);?>';
+var u = '<?php echo is_login ? $u : ''?>';
 var is_login = <?php echo is_login?'true':'false'; ?>;
 </script>
 <script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>

templates/home/default/info.json

@@ -1,9 +1,9 @@
 {
     "name":"默认主题(加强)",
     "description":"默认主题(加强)",
-    "homepage":"https://gitee.com/tznb/OneNav",
-    "version":"2.0.3",
-    "update":"2023/07/31",
+    "homepage":"https://gitee.com/tznb/TwoNav",
+    "version":"2.1.0",
+    "update":"2023/09/28",
     "author":"落幕",
     "screenshot":"https://s3.bmp.ovh/imgs/2022/04/17/8cac968a8cc8135c.png",
     "config": {

templates/home/default/static/embed.js

@@ -109,7 +109,7 @@ $("#config").click(function(){
         area : ['550px' , '99%'],
         anim: 5,
         offset: 'rt',
-        content: './index.php?c=admin&page=config_home&u='+u+'&theme='+t+'&fn=home'
+        content: './index.php?c=admin&page=config_home&u='+u+'&theme=default&fn=home'
     });
 });
 

templates/login/default/index.php

@@ -1,10 +1,9 @@
-<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
-$LoginConfig = unserialize($USER_DB['LoginConfig']);?>
+<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}?>
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="UTF-8">
-    <title>TwoNav - 登录</title>
+    <title><?php echo $OEM['program_name'];?> - 登录</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta http-equiv="Access-Control-Allow-Origin" content="*">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -12,7 +11,7 @@ $LoginConfig = unserialize($USER_DB['LoginConfig']);?>
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">
     <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
-    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.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>
@@ -23,7 +22,7 @@ $LoginConfig = unserialize($USER_DB['LoginConfig']);?>
 <div class="main-body">
     <div class="login-main">
         <div class="login-top">
-            <span>TwoNav 系统管理</span>
+            <span><?php echo $OEM['program_name'];?> 系统管理</span>
             <span class="bg1"></span>
             <span class="bg2"></span>
         </div>
@@ -31,26 +30,20 @@ $LoginConfig = unserialize($USER_DB['LoginConfig']);?>
             <div class="center">
                 <div class="item">
                     <span class="icon layui-icon layui-icon-username"></span>
-                    <input type="text" name="User" lay-verify="required"  placeholder="请输入账号">
+                    <input type="text" name="username" lay-verify="required"  placeholder="请输入账号">
                 </div>
 
                 <div class="item">
                     <span class="icon layui-icon layui-icon-password"></span>
-                    <input type="password" name="Password" lay-verify="required"  placeholder="请输入密码">
+                    <input type="password" name="password" lay-verify="required"  placeholder="请输入密码">
                     <span class="bind-password icon icon-4"></span>
                 </div>
-<?php if(!empty($LoginConfig['totp_key'])){ ?>
-                <div class="item">
-                    <span class="icon layui-icon layui-icon-vercode"></span>
-                    <input type="text" name="otp_code" lay-verify="required"  placeholder="请输入OTP验证码">
-                </div>
-<?php }?>
             </div>
             <div class="tip">
 <?php
     //若为默认值则显示注册入口
     if($global_config['Register'] == 'register' && $global_config['RegOption'] > 0){
-        echo '<a href="./?c=register" class="forget">没有账号？立即注册</a>';
+        echo '<a href="'.$urls['register'].'" class="forget">没有账号？立即注册</a>';
     } 
 ?>
             </div>
@@ -83,28 +76,73 @@ $LoginConfig = unserialize($USER_DB['LoginConfig']);?>
         });
 
 
-        // 进行登录操作
-        form.on('submit(login)', function (data) {
-            data = data.field;
-            if (data.User == '') {
-                layer.msg('用户名不能为空');
-                return false;
-            }
-            if (data.Password == '') {
-                layer.msg('密码不能为空');
-                return false;
-            }
-            data.Password = $.md5(data.Password);
-            $.post('./index.php?c=<?php echo $c; ?>&u='+data.User,data,function(re,status){
-                if(re.code == 1) {
-                    window.location.href = re.url;
+        //账号登录
+        form.on('submit(login)', function($form) {
+            let url = `./?c=auth&mode=uname&t=` + Math.round(new Date() / 1000);
+            form_data = $form.field;form_data.keep = 'on';
+            form_data.password = $.md5(form_data.password);
+            let load = layer.msg('正在登录..', {icon: 16,shade: [0.1, '#f5f5f5'],scrollbar: false,offset: 'auto',time: 60*1000});
+            $.post(url,form_data,function(data,status){
+                layer.close(load);
+                if(data.code == 1) {
+                    layer.msg('登录成功', {icon: 1,shade: [0.1, '#f5f5f5'],scrollbar: false,offset: 'auto',time: 888,
+                        end: function() {
+                            window.location.href = data.url;
+                        }
+                    });
+                }else if(data.code == 2){
+                    //双重认证
+                    layer.open({
+                        type: 1,
+                        title: false,
+                        content: $('.OTP'),
+                        move: '.move',
+                        success: function(layero, index, that){
+                            //监听回车事件
+                            $('input[name="otp_code"]').keydown(function(event) {
+                                if (event.which === 13) {
+                                    $('button[lay-filter="validate_otp"]').click();
+                                }
+                            });
+                            //监听点击事件
+                            form.on('submit(validate_otp)', function ($form2) {
+                                form_data.otp_code = $form2.field.otp_code
+                                let load = layer.msg('正在验证..', {icon: 16,shade: [0.1, '#f5f5f5'],scrollbar: false,offset: 'auto',time: 60*1000});
+                                $.post(url,form_data,function(data,status){
+                                    layer.close(load);
+                                    if(data.code == 1) {
+                                        layer.msg('登录成功', {icon: 1,shade: [0.1, '#f5f5f5'],scrollbar: false,offset: 'auto',time: 888,
+                                            end: function() {
+                                                window.location.href = data.url;
+                                            }
+                                        });
+                                    }else{
+                                        layer.msg(data.msg, {icon: 5});
+                                    }
+                                });
+                                return false; 
+                            }); 
+                        }
+                    });
                 }else{
-                    layer.msg(re.msg, {icon: 5});
+                    layer.msg(data.msg, {icon: 5});
                 }
             });
-            return false;
+            return false; 
         });
     });
 </script>
 </body>
-</html>
+</html>
+<ul class="OTP" style="display:none;">
+    <div class="layui-form layuimini-form layui-form-pane" style="padding: 20px 30px;">
+        <div class="move" style="height: 30px;margin-bottom: 15px;text-align: center;font-size: 21px;">动态口令认证</div>
+        <div class="layui-form-item">
+          <div class="layui-input-group" style="width: 100%;">
+            <input type="text" name="otp_code" lay-verify="required" lay-reqtext="请输入动态口令" placeholder="请输入动态口令" style="text-align: center;" class="layui-input" lay-affix="clear">
+          </div>
+        </div>
+        <div class="layui-input-block" style="margin-left: 1px;"><button type="button" class="layui-btn layui-btn-fluid" lay-submit lay-filter="validate_otp">验证并登录</button></div>
+        <div style="margin-top: 16px;font-size: 13px;color: #777;">* 如果您无法认证,请联系站长处理</div>
+    </div>
+</ul>

templates/login/default/info.json

@@ -1,8 +1,8 @@
 {
-	"name":	"默认",
+	"name":	"默认模板",
 	"description":	"默认",
 	"homepage":	"https://gitee.com/tznb/TwoNav",
-	"version":	"2.0.4",
-	"update":	"2023/08/09",
+	"version":	"2.1.1",
+	"update":	"2023/12/20",
 	"author":	"TwoNav"
 }

templates/register/default/index.php

@@ -9,7 +9,7 @@ if(!empty($mail_config)){
 <html>
 <head>
     <meta charset="UTF-8">
-    <title>TwoNav - 注册</title>
+    <title><?php echo $OEM['program_name'];?> - 注册</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta http-equiv="Access-Control-Allow-Origin" content="*">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -28,7 +28,7 @@ if(!empty($mail_config)){
 <div class="main-body">
     <div class="login-main">
         <div class="login-top">
-            <span>TwoNav 注册账号</span>
+            <span><?php echo $OEM['program_name'];?> 注册账号</span>
             <span class="bg1"></span>
             <span class="bg2"></span>
         </div>
@@ -72,7 +72,7 @@ if(!empty($mail_config)){
         if($global_config['RegOption'] == 2 && !empty($reg_tips)){ 
             echo '                <a href="javascript:;" onclick = "Get_Invitation(\''.base64_encode($reg_tips).'\')">获取注册码</a>'."\n";
         }
-        echo '                <a href="./?c=login" class="forget">已有账号？立即登录</a>'."\n";
+        echo '                <a href="'.$urls['login'].'" class="forget">已有账号？立即登录</a>'."\n";
     } 
 ?>
             </div>

templates/register/default/info.json

@@ -1,8 +1,8 @@
 {
-	"name":	"默认",
+	"name":	"默认模板",
 	"description":	"默认",
 	"homepage":	"https://gitee.com/tznb/TwoNav",
-	"version":	"2.0.0",
-	"update":	"2023/03/15",
+	"version":	"2.1.0",
+	"update":	"2023/09/28",
 	"author":	"TwoNav"
 }