v2.1.05-20231106

index.php

@@ -48,15 +48,6 @@ if(!in_array($c,[$global_config["Register"],'ico','icon'])){
         $_GET['u'] = $global_config['static_link'] == 2 ? get_db("global_user", "User", ["ID"=>$UUID]) : $UUID;
     }
     $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);
-            }
-        }
-    }
     $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

system/admin.php

@@ -69,7 +69,7 @@ if($page == 'config_home'){
         msg(-1,"参数错误");
     }
     if(in_array($_GET['fn'],['guide','register'])){
-        $theme_config_db = get_db('user_config','v',['k'=>'theme_'.$theme,'uid'=>UID]);
+        $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]);
     }

system/api.php

@@ -1547,12 +1547,10 @@ function read_data(){
             $date = date('Ymd', strtotime("-$i days"));
             $dates[] = $date;
         }
-        
         $dates = array_reverse($dates);
         $day_data = [];
         foreach ($dates as $date) {
-            $list = get_db('user_count', 'e', ['uid' => UID, 'k' => $date, 't' => 'ip_list']);
-            $list = unserialize($list);
+            $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]);

system/api_root.php

@@ -456,7 +456,8 @@ function other_services(){
         'order_id' => isset($_POST['order_id']) ? $_POST['order_id'] : "",
         'sysver'   => SysVer,
         'ip'       => Get_IP(),
-        'method'   => $_GET['type']
+        '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']);
     // 判断操作类型
@@ -514,7 +515,7 @@ function other_services(){
         //如果不为空,则解析数据
         if(!empty($Notice)){
             $data = json_decode($Notice, true);
-            $cache_time = 60; //缓存时间(秒);
+            $cache_time = Debug ? 0 : 60; //缓存时间(秒);
             $reload = time() > $data["download_time"] + $cache_time; //是否更新
         }else{
             $reload = true; //需要刷新
@@ -531,6 +532,7 @@ function other_services(){
                 $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;
             }
         }

system/public.php

@@ -732,8 +732,8 @@ function send_email($config){
 //统计访问ip数
 function count_ip(){
     $ip = Get_IP(); $k = date('Ymd'); $t = 'access_ip';
-    if(!has_db('user_count',['uid'=>UID,'k'=>$k,'t'=>$t,'v'=>$ip])){
-        insert_db("user_count",['uid'=>UID,'k'=>$k,'t'=>$t,'v'=>$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
     }
 }

system/version.txt

@@ -1 +1 @@
-v2.1.03-20231019
+v2.1.05-20231106

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/theme.js

@@ -104,6 +104,9 @@ layui.use(function(){
         $.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 {

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/root/vip.php

@@ -56,7 +56,18 @@ if(!empty($Notice)){
                 <input type="text" name="type_name" id ="type_name" value="<?php echo $subscribe['type_name'] ?? ''; ?>" autocomplete="off" placeholder="若未正确显示请点击保存设置" class="layui-input">
             </div>
         </div>
-
+<?php if(get_db('global_config','v',["k" => "sys_switch"]) == 'show' && $subscribe['type'] == '3'){ ?>
+        <div class="layui-form-item">
+            <label class="layui-form-label">版本切换</label>
+            <div class="layui-input-inline" >
+                <select name="sys" id="sys">
+                    <option value="biaozhun" selected>标准版</option>
+                    <option value="gaoji" >高级版</option>
+                </select>
+            </div>
+            <div class="layui-form-mid layui-word-aux">希望使用的系统版本 ( 下次更新时 )</div>
+        </div>
+<?php } ?>
         <div class="layui-btn-group">
             <button class="layui-btn layui-btn-normal" lay-submit lay-filter="save_key">保存</button>
             <button class="layui-btn layui-btn-danger" lay-submit lay-filter="buy_vip" data-url="<?php echo empty($data['pay_rul']) ?'':$data['pay_rul']?>" >购买授权</button>
@@ -100,7 +111,8 @@ layui.use(['jquery','form'], function () {
     var layer = layui.layer;
     var $ = layui.jquery;
     var vcode;
-    
+    $("#sys").val('<?php echo empty($subscribe['sys']) ? 'biaozhun':$subscribe['sys']; ?>');
+    form.render('select');
     //保存订阅
     form.on('submit(save_key)', function(data){
         var order_id = data.field.order_id;
@@ -113,7 +125,7 @@ layui.use(['jquery','form'], function () {
             return false;
         }
         layer.load(2, {shade: [0.1,'#fff']});
-        $.post(get_api('other_services','save_key'),{'order_id':data.field.order_id,'email':data.field.email},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);

templates/admin/page/theme.php

@@ -1,4 +1,4 @@
-<?php $title='主题管理';$awesome=true; require 'header.php';?>
+<?php $title='主题管理';$awesome=true; define('referrer','same-origin'); require 'header.php';?>
 <style>
 .tab-header .layui-btn.layui-this{border-color: #1E9FFF; color: #1E9FFF;}
 .screenshot{
@@ -25,7 +25,6 @@
 <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 src="./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>
 <script>
     const is_admin = <?php echo $USER_DB['UserGroup'] === 'root' ? 'true' : 'false'; ?>;
     const theme_set = <?php echo check_purview('theme_set',1) ? 'true' : 'false'; ?>;
@@ -33,4 +32,5 @@
     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>
+<script src="./templates/admin/js/theme.js?v=<?php echo $Ver;?>"></script>

templates/admin/page/updatelog.php

@@ -5,7 +5,34 @@
     <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-20231019</h4>
+            <h4 class="layui-timeline-title">v2.1.05-20231106</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>