v2.0.37-20230830

2025-08-10 08:51:49 +00:00 · 2023-08-30 12:49:45 +08:00
parent 5c7136ff0f
commit 1fe39f83f4
37 changed files with 1278 additions and 573 deletions
--- a/system/Register.php
+++ b/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;
 }

--- a/system/admin.php
+++ b/system/admin.php
@@ -11,7 +11,9 @@ if(!is_login){
    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,7 +66,7 @@ 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]);
@@ -178,64 +180,6 @@ if( $page == 'theme_home' || $page == 'theme_login' || $page == 'theme_transit'
    }
 }

-
-//菜单接口
-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'] > 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/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']));
--- a/system/api.php
+++ b/system/api.php
@@ -680,10 +680,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,'保存成功']);
@@ -1175,20 +1171,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(){
@@ -1358,10 +1355,137 @@ function other_testing_link(){
    msgA(['code' => 0 ,'StatusCode'=> $code]);
 }

+//读主题信息
+function read_theme(){
+    global $global_config;
+    global $USER_DB;
+    // 检查权限
+    if(!check_purview('theme_in',1)){
+        msg(-1,'无权限');
+    }
+    
+    $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'){ 
+        
+        if(preg_match('/^v.+-(\d{8})$/i',SysVer,$matches)){
+            $sysver = intval( $matches[1] );//取版本中的日期
+        }else{
+            msg(-1,'获取程序版本异常');
+        }
+        
+        //读取缓存
+        $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 = [
+                "lm21" => "https://update.lm21.top/TwoNav/{$request_dir}_template.json",
+                "gitee" => "https://gitee.com/tznb/twonav_updata/raw/master/{$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);
+                }
+            }
+        }
+    }
+    
+    //取正在使用的模板
+    $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 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,"离线模式禁止下载主题!");} //离线模式
@@ -1466,6 +1590,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,18 +1607,8 @@ 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;
        }
        //更新数据
        update_db('user_config',['v'=>$s_templates],['uid'=>UID,'k'=>'s_templates'],[1,'设置成功']);
@@ -1508,7 +1627,7 @@ 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
@@ -1836,6 +1955,59 @@ function read_data(){
            $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'],
+              ]
+            ]);
+        }
+        $init = array( 'homeInfo'=>['title'=>'概要','href'=>'home'],'logoInfo'=>['title'=>'TwoNav','image'=>'./templates/admin/img/logo.png','href'=>'./?u='.U],'menuInfo'=>$menu);
+        msgA($init);
    }
 }

@@ -1887,3 +2059,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;
+}
--- a/system/click.php
+++ b/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'];
@@ -72,7 +61,9 @@ if(!$is_login){
        $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';
+            $c = 'verify';
+            require DIR."/system/templates.php";
+            require $index_path;
            exit();
        }
    }
@@ -81,7 +72,9 @@ if(!$is_login){
        $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';
+            $c = 'verify';
+            require DIR."/system/templates.php";
+            require $index_path;
            exit();
        }
    }
@@ -90,39 +83,22 @@ if(!$is_login){
        $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';
+            $c = 'verify';
+            require DIR."/system/templates.php";
+            require $index_path;
            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??[]);
+//通用数据初始化
+require DIR."/system/templates.php";

 //如果主题信息声明支持扩展字段
 if($global_config['link_extend'] == 1 && check_purview('link_extend',1) && in_array($theme_info['support']['link_extend'],["true","1"])){
@@ -154,11 +130,11 @@ if(!empty($link['url_standby'])) {
        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;
    }
 }
@@ -185,11 +161,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;
-}
--- a/system/expand/apply.php
+++ b/system/expand/apply.php
@@ -18,7 +18,8 @@ if ( $apply['apply'] == 0 ){
 }
 //get请求载入页面
 if($_SERVER['REQUEST_METHOD'] === 'GET'){
-    require DIR.'/templates/admin/page/expand/apply-user.php';
+    require DIR."/system/templates.php";
+    require($index_path);
    exit;
 }
 //载入提示页
--- a/system/expand/article.php
+++ b/system/expand/article.php
@@ -1,65 +1,28 @@
 <?php if(!defined('DIR')){Not_Found();}AccessControl();
-if($global_config['article'] < 1 | !check_purview('article',1)){ 
-    Not_Found();
-}

-$id = intval($_GET['id']);
+//判断全局开关和用户权限
+if($global_config['article'] < 1 || !check_purview('article',1)) Not_Found();
+
 //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);
+//取GET参数中的id
+$id = intval($_GET['id']);
+
+//如果id为空,则显示404
+if(empty($id)) Not_Found();
+
+//通用数据初始化
+require DIR."/system/templates.php";
+
+//读取文章内容
+$data = get_article_content($id);

 //查找失败时显示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';
-}
+if(empty($data)) Not_Found();

 //统计点击数
 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;
-}
+//载入模板
+require $index_path;
--- a/system/expand/guestbook.php
+++ b/system/expand/guestbook.php
@@ -16,23 +16,23 @@ if(!Check_Path("data/user/{$u}/MessageBoard")){

 //POST提交留言
 if($_SERVER['REQUEST_METHOD'] === 'POST'){
-     if($s['allow'] != '1'){ msg(-1015,'提交失败,当前禁止留言!');  }
+     if($s['allow'] != '1'){ msg(-1,'提交失败,当前禁止留言!');  }
     $type = $_POST['type']; //类型
     $contact = $_POST['contact']; //联系方式
     $title = $_POST['title']; //标题
     $content = $_POST['content']; //内容
     if(empty($type)){
-         msg(-1015,'提交失败,类型不能为空');
+         msg(-1,'提交失败,类型不能为空');
     }elseif(empty($contact)){
-         msg(-1015,'提交失败,联系方式不能为空');
+         msg(-1,'提交失败,联系方式不能为空');
     }elseif(empty($title)){
-         msg(-1015,'提交失败,标题不能为空');
+         msg(-1,'提交失败,标题不能为空');
     }elseif(empty($content)){
-         msg(-1015,'提交失败,内容不能为空');
+         msg(-1,'提交失败,内容不能为空');
     }elseif(strlen($type) >= 32 || strlen($contact) >= 64 || strlen($title) >= 128 || strlen($content) >= 2048){
-         msg(-1015,'提交失败,长度超限');
+         msg(-1,'提交失败,长度超限');
     }elseif(ShuLiang("data/user/{$u}/MessageBoard/") > 256){
-         msg(-1015,'提交失败,留言太多了请稍后再试');
+         msg(-1,'提交失败,留言太多了请稍后再试');
     }
     
     $json_arr = array(
@@ -48,9 +48,9 @@ if($_SERVER['REQUEST_METHOD'] === 'POST'){
     $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,'提交成功'); 
+        msg(1,'提交成功'); 
    }else{
-        msg(-1015,'系统错误,提交失败'); //创建目录或写入文件失败,请检查权限
+        msg(-1,'系统错误,提交失败'); //创建目录或写入文件失败,请检查权限
    }
 } 

@@ -67,5 +67,8 @@ function ShuLiang($path){
    }
    return $sl;
 }
-require DIR.'/templates/admin/page/expand/guestbook-user.php';
+
+//通用数据初始化
+require DIR."/system/templates.php";
+require $index_path;
 exit;
--- a/system/index.php
+++ b/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'];//需要的内容
@@ -219,7 +210,7 @@ function get_links($fid) {
            }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];
+            $article_link = ['type'=>'article','id'=>0,'title'=>htmlspecialchars($article['title'],ENT_QUOTES),'url'=>$url,'real_url'=>$url,'description'=> htmlspecialchars($article['summary'],ENT_QUOTES),'ico'=>$icon,'icon'=>$icon];
            //判断靠前还是靠后
            if($site['article_visual'] == '1'){
                array_unshift($links,$article_link);
@@ -239,45 +230,7 @@ function get_links($fid) {
    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 == []){
--- a/system/install.php
+++ b/system/install.php
@@ -161,7 +161,8 @@ $db_config = array(
                '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开发,其他版本兼容性未知,若您需要强制安装请屏蔽检测
--- a/system/login.php
+++ b/system/login.php
@@ -2,15 +2,8 @@

 //如果是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;
+    require DIR."/system/templates.php";
+    require $index_path;
    exit;
 }

--- a/system/templates.php
+++ b/system/templates.php
@@ -3,99 +3,197 @@
 //读取全局模板配置
 $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')){
+    //读取用户模板配置
+    $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" => '默认模板']);
+    }
+    //声明是否已登录
+    define('is_login',is_login()); $is_login = is_login;
 }

-//载入辅助函数
-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'] > 0);
-    }
-    //是否启用留言
-    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/guestbook/';
+}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';
+}

+//模板类型(用于读取配置)
+$templates_type = substr($dir_path, strrpos($dir_path, "/") + 1) ;
+
+//无权限或不存在使用默认
+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')){
+    //主题配置(用户)
+    $theme_config_db = get_db('user_config','v',['t'=>"theme_{$templates_type}",'k'=>$theme,'uid'=>UID]);
+    $theme_config_db = unserialize($theme_config_db);
+}else{
+    //主题配置(用户)
+    $theme_config_db = get_db('global_config','v',['t'=>"theme_{$templates_type}",'k'=>$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'];
+
+if(defined('UID')){
+    //载入站点设置
+    $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';
+}else{
+    //站点图标
+    $favicon = './favicon.ico';
+}
+
+//版权信息
+$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>';
+
+//是否启用收录
+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;
 }

 //获取文章列表
@@ -106,7 +204,6 @@ function get_article_list($category = 0,$limit = 0){
    }else{
        $where['AND']['OR']['state'] = [1,2]; //状态筛选
    }
-    
    //分类筛选
    if($category > 0){
        $where['AND']['category'] = $category;
@@ -126,19 +223,22 @@ function get_article_list($category = 0,$limit = 0){
    //为文章添加分类名称
    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);
    }
    return ['data'=>$datas,'count'=>$count];
 }
+
 //根据文章id获取内容
 function get_article_content($id){
    $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 +277,9 @@ function get_category_list($layer = false){
        }
    }
    return $categorys;
+}
+
+//返回404
+function Not_Found() {
+    header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;
 }
--- a/system/verify.php
+++ b/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,'密码错误!');
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.0.36-20230823
+v2.0.37-20230830