From dea2be97992de3429d95995afe707bb900f7297c 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: Tue, 6 Dec 2022 15:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF=E8=B5=84?=
=?UTF-8?q?=E6=BA=90=EF=BC=8C=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/admin/album_testhtml.php | 2 +-
src/admin/content_tj.php | 50 ---------------------
src/admin/dialog/config.php | 2 +-
src/admin/dialog/select_images.php | 10 ++---
src/admin/dialog/select_media.php | 2 +-
src/admin/dialog/select_media_post.php | 1 -
src/admin/dialog/select_mimages.php | 4 +-
src/admin/dialog/select_soft.php | 4 +-
src/admin/dialog/select_templets.php | 4 +-
src/admin/index_body.php | 2 +-
src/admin/index_testenv.php | 14 +++---
src/admin/module_upload.php | 16 +++----
src/admin/mychannel_edit.php | 13 +++---
src/admin/templets/content_tj.htm | 43 ------------------
src/admin/templets/freelist_main.htm | 4 +-
src/admin/templets/member_main.htm | 2 +-
src/admin/templets/search_keywords_main.htm | 4 +-
src/admin/tpl.php | 7 ++-
src/apps/advancedsearch.php | 2 +-
19 files changed, 45 insertions(+), 141 deletions(-)
delete mode 100644 src/admin/content_tj.php
delete mode 100644 src/admin/templets/content_tj.htm
diff --git a/src/admin/album_testhtml.php b/src/admin/album_testhtml.php
index a8be3e3d..512d5b7a 100644
--- a/src/admin/album_testhtml.php
+++ b/src/admin/album_testhtml.php
@@ -11,7 +11,7 @@
require_once(dirname(__FILE__)."/config.php");
AjaxHead();
$myhtml = UnicodeUrl2Gbk(stripslashes($myhtml));
-echo "
";
diff --git a/src/admin/content_tj.php b/src/admin/content_tj.php
deleted file mode 100644
index 58fa3160..00000000
--- a/src/admin/content_tj.php
+++ /dev/null
@@ -1,50 +0,0 @@
-GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` ");
-$row2 = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__feedback` ");
-$row3 = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__member` ");
-/**
- * 获取文档
- *
- * @param object $dsql
- * @param string $ordertype 排序类型
- * @return string
- */
-function GetArchives($dsql, $ordertype)
-{
- $starttime = time() - (24 * 3600 * 30);
- if ($ordertype == 'monthFeedback' || $ordertype == 'monthHot') {
- $swhere = " where senddate>$starttime ";
- } else {
- $swhere = "";
- }
- if (preg_match("#feedback#", $ordertype)) {
- $ordersql = " ORDER BY scores DESC ";
- } else {
- $ordersql = " ORDER BY click DESC ";
- }
- $query = "SELECT id,title,click,scores FROM `#@__archives` $swhere $ordersql LIMIT 0,30 ";
- $dsql->SetQuery($query);
- $dsql->Execute('ga');
- while ($row = $dsql->GetObject('ga')) {
- if (preg_match("#feedback#i", $ordertype)) {
- $moreinfo = "[id}'>评论:{$row->scores}]";
- } else {
- $moreinfo = "[点击:{$row->click}]";
- }
- echo "·";
- echo cn_substr($row->title, 30)."{$moreinfo}
\r\n";
- }
-}
-include DedeInclude('templets/content_tj.htm');
-?>
\ No newline at end of file
diff --git a/src/admin/dialog/config.php b/src/admin/dialog/config.php
index 044e2cc4..05343756 100644
--- a/src/admin/dialog/config.php
+++ b/src/admin/dialog/config.php
@@ -21,7 +21,7 @@ $s_scriptName = $dedeNowurls[0];
$cuserLogin = new userLogin();
if ($cuserLogin->getUserID() <= 0) {
if (empty($adminDirHand)) {
- ShowMsg("提示:需输入后台管理目录才能登录
", "javascript:;");
+ ShowMsg("提示:需要输入后台管理目录才能登录
", "javascript:;");
exit();
}
$adminDirHand = HtmlReplace($adminDirHand, 1);
diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php
index 5fe9a075..a66b4a0a 100644
--- a/src/admin/dialog/select_images.php
+++ b/src/admin/dialog/select_images.php
@@ -146,11 +146,11 @@ html{background:#f5f5f5}
- 上传:
-
-
- 宽:
- 高:
+
选择:
+
+
+
宽:
+
高:
diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php
index a813dfd5..a58605f3 100644
--- a/src/admin/dialog/select_media.php
+++ b/src/admin/dialog/select_media.php
@@ -78,7 +78,7 @@ html{background:#f5f5f5}
- 上传:
+
选择:
diff --git a/src/admin/dialog/select_media_post.php b/src/admin/dialog/select_media_post.php
index e1b5d3d8..e4f92fc0 100644
--- a/src/admin/dialog/select_media_post.php
+++ b/src/admin/dialog/select_media_post.php
@@ -13,7 +13,6 @@ $cfg_softtype = $cfg_mediatype."|mp4";
$cfg_soft_dir = $cfg_other_medias;
$bkurl = 'select_media.php';
$uploadmbtype = "多媒体文件类型";
-
if (empty($activepath)) {
$activepath = '';
$activepath = str_replace('.', '', $activepath);
diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php
index 0c140340..8205cce2 100644
--- a/src/admin/dialog/select_mimages.php
+++ b/src/admin/dialog/select_mimages.php
@@ -41,9 +41,9 @@ button+button{margin-left:10px}
diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php
index c12b102a..6aae5e10 100644
--- a/src/admin/dialog/select_soft.php
+++ b/src/admin/dialog/select_soft.php
@@ -82,8 +82,8 @@ html{background:#f5f5f5}
- 上传:
- 改名:
+
选择:
+
改名:
diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php
index c810e021..447ef798 100644
--- a/src/admin/dialog/select_templets.php
+++ b/src/admin/dialog/select_templets.php
@@ -63,8 +63,8 @@ html{background:#f5f5f5}
- 上传:
- 改名:
+
选择:
+
改名:
diff --git a/src/admin/index_body.php b/src/admin/index_body.php
index dc14ffb3..71afd46e 100644
--- a/src/admin/index_body.php
+++ b/src/admin/index_body.php
@@ -51,7 +51,7 @@ else if ($dopost == 'setskin') {
if (trim($row['editcon'])==''){
$row['editcon'] = 'archives_edit.php';
}
- $rowarcrank = $row['arcrank']==-1? "
[未审核]":"";
+ $rowarcrank = $row['arcrank']==-1? "
未审核":"";
$pubdate = GetDateMk($row['pubdate']);
echo "
{$row['title']}{$rowarcrank} | {$pubdate} |
";
}
diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php
index 3fdface3..acdbc77a 100644
--- a/src/admin/index_testenv.php
+++ b/src/admin/index_testenv.php
@@ -126,23 +126,23 @@ if (preg_match("#[\\|/]admin[\\|/]#", $dirname)) {
$safeMsg[] = '后台管理登录默认名称admin,建议您进行修改';
}
if (IsWritable(DEDEDATA.'/common.inc.php')) {
- $safeMsg[] = '数据配置data/common.inc.php文件,需要以管理员权限设置禁止写入和执行';
+ $safeMsg[] = '数据库配置data/common.inc.php文件,建议您以管理员权限设置禁止写入和执行';
}
if (!IsSSL()) {
- $safeMsg[] = '站点尚未启用HTTPS,建议您配置HTTPS';
+ $safeMsg[] = '网址非安全链接,建议您配置HTTPS';
}
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
- $safeMsg[] = 'PHP版本过低会无法正常使用系统,需要升级到PHP7.X';
+ $safeMsg[] = 'PHP版本过低会无法正常使用系统,建议您升级到PHP7.X';
}
if (!DEDEBIZ_SAFE_MODE) {
- $safeMsg[] = '系统运行环境为:开发模式,建议启用安全模式
[查看]';
+ $safeMsg[] = '系统运行环境为开发模式,建议您启用安全模式
查看';
}
$rs = TestAdminPWD();
if ($rs < 0) {
- $linkurl = '
[修改]';
+ $linkurl = '修改';
switch ($rs) {
case -1:
- $msg = "管理员默认名称admin没有修改,建议您修改 {$linkurl}";
+ $msg = "管理员默认名称没有修改,建议您修改 {$linkurl}";
break;
case -2:
$msg = "管理员默认名称和密码没有修改,建议您修改 {$linkurl}";
@@ -159,7 +159,7 @@ if (count($safeMsg) > 0) {
$i = 1;
foreach ($safeMsg as $key => $val) {
?>
-
、
+
、
Clear();
- ShowMsg("您上传的插件不是模块格式文件,
重新上传", "javascript:;");
+ ShowMsg("您上传的插件不是正常模块格式文件,
重新上传", "javascript:;");
exit();
}
if (preg_match("#[^0-9a-zA-Z]#", $infos['hash'])) {
@@ -40,7 +40,7 @@ if ($action == 'upload') {
if ($dm->HasModule($infos['hash']) && empty($delhas)) {
unlink($tmpfilename);
$dm->Clear();
- ShowMsg("您上传的模块已存在,请删除原模块文件或强制删除同名模块上传,
重新上传", "javascript:;");
+ ShowMsg("您上传的模块已存在,请删除原模块文件或强制同名模块上传,
重新上传", "javascript:;");
exit();
}
@unlink($okfile);
@@ -55,19 +55,19 @@ if ($action == 'upload') {
$win->Init("module_upload.php", "js/blank.js", "POST' enctype='multipart/form-data");
$win->mainTitle = "模块管理";
$wecome_info = "
模块管理 > 上传模块";
- $win->AddTitle('请选择要上传的文件');
+ $win->AddTitle('请选择要上传的模块文件');
$win->AddHidden("action", 'upload');
- $msg = "
+ $msg = "";
diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php
index 48b3e82f..831c0193 100644
--- a/src/admin/mychannel_edit.php
+++ b/src/admin/mychannel_edit.php
@@ -298,13 +298,12 @@ else if ($dopost == "gettemplets") {
$win->AddTitle("栏目".$row['typename']."默认模板文件说明");
$defaulttemplate = $cfg_templets_dir.'/'.$cfg_df_style;
$msg = "
- 文档模板:{$defaulttemplate}/article_{$row['nid']}.htm
- [修改]
- 列表模板:{$defaulttemplate}/list_{$row['nid']}.htm
- [修改]
-
- 封面栏目模板:{$defaulttemplate}/index_{$row['nid']}.htm
- [修改]
+ 文档模板:{$defaulttemplate}/article_{$row['nid']}.htm
+ 修改
+ 列表模板:{$defaulttemplate}/list_{$row['nid']}.htm
+ 修改
+ 封面栏目模板:{$defaulttemplate}/index_{$row['nid']}.htm
+ 修改
";
$win->AddMsgItem("$msg");
$winform = $win->GetWindow("hand", "");
diff --git a/src/admin/templets/content_tj.htm b/src/admin/templets/content_tj.htm
deleted file mode 100644
index 8f8596b1..00000000
--- a/src/admin/templets/content_tj.htm
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
- 文档信息统计
-
-
-
-
-
- 文档信息统计 |
-
-
- 综合信息统计: |
- 文档总数: 评论总数: 会员总数: |
-
-
- 栏目信息统计: |
-
-
-
- 栏目名称 |
- 文档总数 |
-
- Execute("aaa","Select channel,count(channel) as dd From `#@__archives` group by channel");
- while($row = $dsql->GetArray("aaa")) $arcs[$row['channel']] = $row['dd'];
- $dsql->Execute("me","Select id,typename From `#@__channeltype`");
- while($row = $dsql->GetObject()){
- ?>
-
- typename?> |
- [id]) ? $arcs[$row->id] : 0 );?>] |
-
-
-
- |
-
-
-
-
\ No newline at end of file
diff --git a/src/admin/templets/freelist_main.htm b/src/admin/templets/freelist_main.htm
index c0c3d09c..4a68b1ed 100644
--- a/src/admin/templets/freelist_main.htm
+++ b/src/admin/templets/freelist_main.htm
@@ -20,7 +20,7 @@
function ReloadPage(ordertype) {
orderby = ordertype;
var listArea = $Obj('rslist');
- var errMsg = "网络通信出错
[点击此重新加载列表]";
+ var errMsg = "网络通信出错
重新加载列表";
fetch("freelist_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype + addget).then(resp=>resp.text()).then((d)=>{
listArea.innerHTML = d;
}).catch((error) => {
@@ -48,7 +48,7 @@
totalrow = totalrow - 1;
var pagenum = Math.ceil(totalrow / pagesize);
if (pagenum <= pageno) pageno = pagenum;
- var errMsg = "网络通信出错
[点击此重新加载列表]";
+ var errMsg = "网络通信出错
重新加载列表";
fetch("freelist_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno).then(resp=>{
if (resp.ok) {
return resp.text()
diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm
index 4fa174ba..3f3d3c09 100644
--- a/src/admin/templets/member_main.htm
+++ b/src/admin/templets/member_main.htm
@@ -69,7 +69,7 @@
性别 |
会员等级 |
会员属性 |
- 地址时间 |
+ 地址时间 |
发布限制 |
操作 |
diff --git a/src/admin/templets/search_keywords_main.htm b/src/admin/templets/search_keywords_main.htm
index 810ffef8..a8cab8ac 100644
--- a/src/admin/templets/search_keywords_main.htm
+++ b/src/admin/templets/search_keywords_main.htm
@@ -21,7 +21,7 @@
function ReloadPage(ordertype) {
orderby = ordertype;
var listArea = $Obj('rslist');
- var errMsg = "网络通信出错
[点击此重新加载列表]";
+ var errMsg = "网络通信出错
重新加载列表";
fetch("search_keywords_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype).then(resp=>{
if (resp.ok) {
return resp.text()
@@ -45,7 +45,7 @@
var kw = $Obj('keyword' + nid).value;
var kws = $Obj('spwords' + nid).value;
var ct = $Obj('count' + nid).value;
- var errMsg = "网络通信出错
[点击此重新加载列表]";
+ var errMsg = "网络通信出错
重新加载列表";
diff --git a/src/admin/tpl.php b/src/admin/tpl.php
index fe8c660b..079e5243 100644
--- a/src/admin/tpl.php
+++ b/src/admin/tpl.php
@@ -124,7 +124,7 @@ else if ($action == 'upload') {
$win->Init("tpl.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
$win->mainTitle = "模块管理";
$wecome_info = "模板管理 > 上传模板";
- $win->AddTitle('请选择要上传的文件');
+ $win->AddTitle('请选择要上传的模块文件');
$win->AddHidden("action", 'uploadok');
$msg = "
@@ -175,8 +175,7 @@ function edittag() { }
else if ($action == 'edittag' || $action == 'addnewtag') {
if ($action == 'addnewtag') {
$democode = '<'."?php
-if (!defined('DEDEINC'))
-{
+if (!defined('DEDEINC')) {
exit(\"Request Error!\");
}
function lib_demotag(&\$ctag,&\$refObj)
@@ -228,7 +227,7 @@ else if ($action == 'savetagfile') {
$msg = "
diff --git a/src/apps/advancedsearch.php b/src/apps/advancedsearch.php
index a9fc8e38..33bc87f5 100755
--- a/src/apps/advancedsearch.php
+++ b/src/apps/advancedsearch.php
@@ -43,7 +43,7 @@ if (empty($sql)) {
$q = stripslashes($q);
$q = preg_replace("#[\|\"\r\n\t%\*\?\(\)\$;,'%<>]#", " ", trim($q));
if (($cfg_notallowstr != '' && preg_match("#".$cfg_notallowstr."#i", $q)) || ($cfg_replacestr != '' && preg_match("#".$cfg_replacestr."#i", $q))) {
- echo "您的信息中存在非法文档,被系统禁止[返回]";
+ echo "您的信息中存在违规文档,被系统禁止";
exit();
}
$q = addslashes($q);