From 77f357061a48a461ade82707f63891b4a534572b Mon Sep 17 00:00:00 2001
From: "MI15\\Win" <10359480+tznb@user.noreply.gitee.com>
Date: Tue, 7 Nov 2023 23:07:03 +0800
Subject: [PATCH] v2.1.05-20231106
---
system/admin.php | 2 +-
system/api.php | 4 +---
system/public.php | 4 ++--
system/version.txt | 2 +-
templates/admin/js/theme.js | 3 +++
templates/admin/page/header.php | 2 +-
templates/admin/page/theme.php | 6 +++---
templates/admin/page/updatelog.php | 18 +++++++++++++++++-
8 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/system/admin.php b/system/admin.php
index 809765d..85d9fcf 100644
--- a/system/admin.php
+++ b/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]);
}
diff --git a/system/api.php b/system/api.php
index ee95bce..11afa84 100644
--- a/system/api.php
+++ b/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]);
diff --git a/system/public.php b/system/public.php
index 90b6df5..bc99148 100644
--- a/system/public.php
+++ b/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
}
}
diff --git a/system/version.txt b/system/version.txt
index 04f4f46..a4bd2ef 100644
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.1.04-20231029
\ No newline at end of file
+v2.1.05-20231106
\ No newline at end of file
diff --git a/templates/admin/js/theme.js b/templates/admin/js/theme.js
index 0dc260d..c69c2df 100644
--- a/templates/admin/js/theme.js
+++ b/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(``);
+ }
datas = r.data;
render_data(r);
} else {
diff --git a/templates/admin/page/header.php b/templates/admin/page/header.php
index dc03eef..c56d87a 100644
--- a/templates/admin/page/header.php
+++ b/templates/admin/page/header.php
@@ -7,7 +7,7 @@
- '."\n";?>
+
'."\n");?>
diff --git a/templates/admin/page/theme.php b/templates/admin/page/theme.php
index 016d935..b02e279 100644
--- a/templates/admin/page/theme.php
+++ b/templates/admin/page/theme.php
@@ -1,4 +1,4 @@
-
+