From a00a61755522f48c4d26a237693c7b643ed45185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Mon, 6 Mar 2023 10:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8F=90=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/index_testenv.php |  4 ++--
 src/admin/sys_cache_up.php  | 16 ++++++++--------
 src/apps/stow.php           |  1 -
 src/data/admin/ver.txt      |  2 +-
 src/data/admin/verifies.txt |  2 +-
 src/user/edit_baseinfo.php  |  1 -
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php
index e7443edf..94a7da21 100644
--- a/src/admin/index_testenv.php
+++ b/src/admin/index_testenv.php
@@ -123,7 +123,7 @@ if (!function_exists('IsWritable')) {
 $safeMsg = array();
 $dirname = str_replace('index_body.php', '', strtolower($_SERVER['PHP_SELF']));
 if (preg_match("#[\\|/]admin[\\|/]#", $dirname)) {
-	$safeMsg[] = '后台管理登录默认名称admin，建议您进行修改';
+	$safeMsg[] = '后台管理登录名称为admin，建议您进行修改';
 }
 if (IsWritable(DEDEDATA.'/common.inc.php')) {
 	$safeMsg[] = '数据库配置data/common.inc.php文件，建议您以管理员权限设置禁止写入和执行';
@@ -135,7 +135,7 @@ if (version_compare(PHP_VERSION, '5.3.0', '<')) {
 	$safeMsg[] = 'php版本过低会无法正常使用后台，建议您升级到php7.x';
 }
 if (!DEDEBIZ_SAFE_MODE) {
-	$safeMsg[] = '系统运行环境为开发模式，建议您启用安全模式 <a href="index_body.php?dopost=safe_mode" class="btn btn-success btn-xs">查看</a>';
+	$safeMsg[] = '系统运行环境为开发模式，建议您启用安全模式 <a href="index_body.php?dopost=safe_mode" class="btn btn-success btn-xs">详情</a>';
 }
 $rs = TestAdminPWD();
 if ($rs < 0) {
diff --git a/src/admin/sys_cache_up.php b/src/admin/sys_cache_up.php
index d2af1216..4b63cd24 100644
--- a/src/admin/sys_cache_up.php
+++ b/src/admin/sys_cache_up.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * 清除缓存
+ * 清理缓存
  *
  * @version        $id:sys_cache_up.php 16:22 2010年7月20日 tianya $
  * @package        DedeBIZ.Administrator
@@ -16,14 +16,14 @@ if ($dopost == "ok") {
     if (empty($uparc)) $uparc = 0;
     if ($step == -1) {
         if ($uparc == 0) sleep(1);
-        ShowMsg("成功更新所有缓存", "javascript:;");
+        ShowMsg("全部缓存清理已完成", "javascript:;");
         exit();
     }
     //更新栏目缓存
     else if ($step == 1) {
         UpDateCatCache();
         ClearOptCache();
-        ShowMsg("成功更新栏目缓存及后台栏目选项，准备更新枚举缓存", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc");
+        ShowMsg("正在清理栏目缓存，下一步清理枚举缓存", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc");
         exit();
     }
     //更新枚举缓存
@@ -31,7 +31,7 @@ if ($dopost == "ok") {
         include_once(DEDEINC."/enums.func.php");
         WriteEnumsCache();
         //WriteAreaCache(); 已过期
-        ShowMsg("成功更新枚举缓存，准备更新调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc");
+        ShowMsg("正在清理枚举缓存，下一步清理调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc");
         exit();
     }
     //清理arclist调用缓存、过期会员浏览历史、过期短信、陈旧的流量统计数据
@@ -39,13 +39,13 @@ if ($dopost == "ok") {
         echo '<meta http-equiv="Content-Type" content="text/html; charset='.$cfg_soft_lang.'">';
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`");
         $msg = array();
-        $msg[] = "成功更新arclist调用缓存，准备清理过期会员浏览历史";
+        $msg[] = "正在清理arclist调用缓存，下一步清理过期会员浏览历史";
         $oldtime = time() - (90 * 24 * 3600);
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE sendtime<'$oldtime' ");
-        $msg[] = "成功清理过期短信，准备修正错误文档，这可能要占较长的时间";
+        $msg[] = "正在清理过期短信，下一步修正错误文档，可能要占较长时间";
         $limit = date('Ymd', strtotime('-15 days'));
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__statistics_detail` WHERE created_date < '$limit'");
-        $msg[] = "成功清空15天之前的流量统计数据";
+        $msg[] = "正在清理15天之前流量统计";
         echo DedeAlert(implode("<br/>",$msg), ALERT_INFO, TRUE);
         if ($uparc == 1) {
             echo "<script>location='sys_cache_up.php?dopost=ok&step=9';</script>";
@@ -56,7 +56,7 @@ if ($dopost == "ok") {
     }
     //修正错误文档
     else if ($step == 9) {
-        ShowMsg('修正错误文档操作已经取消，后台系统中系统修复工具中操作', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000);
+        ShowMsg('清理错误文档已取消，到系统修复工具进行操作', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000);
         exit();
     }
 }
diff --git a/src/apps/stow.php b/src/apps/stow.php
index 71ada78d..148abf94 100755
--- a/src/apps/stow.php
+++ b/src/apps/stow.php
@@ -17,7 +17,6 @@ if ($aid == 0) {
 }
 require_once(DEDEINC."/memberlogin.class.php");
 $ml = new MemberLogin();
-
 if ($ml->M_ID == 0) {
     ShowMsg('只有会员才允许收藏操作', 'javascript:window.close();');
     exit();
diff --git a/src/data/admin/ver.txt b/src/data/admin/ver.txt
index 3d42732e..284f50ce 100644
--- a/src/data/admin/ver.txt
+++ b/src/data/admin/ver.txt
@@ -1 +1 @@
-20221201
\ No newline at end of file
+20230306
\ No newline at end of file
diff --git a/src/data/admin/verifies.txt b/src/data/admin/verifies.txt
index 3d42732e..284f50ce 100644
--- a/src/data/admin/verifies.txt
+++ b/src/data/admin/verifies.txt
@@ -1 +1 @@
-20221201
\ No newline at end of file
+20230306
\ No newline at end of file
diff --git a/src/user/edit_baseinfo.php b/src/user/edit_baseinfo.php
index c94e3937..d4e59051 100755
--- a/src/user/edit_baseinfo.php
+++ b/src/user/edit_baseinfo.php
@@ -82,7 +82,6 @@ if ($dopost == 'save') {
                     exit();
                 } else {
                     $addupquery .= ",email='$email',spacesta='-10'";
-
                 }
             }
         }