From 52c1c9567127091bb3a70bd660317711c1c0b525 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, 21 Nov 2022 16:22:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/article_description_main.php | 2 +- src/admin/dialog/select_soft_post.php | 4 +- src/admin/file_class.php | 6 +-- src/admin/file_manage_control.php | 2 +- src/admin/makehtml_homepage.php | 2 +- src/admin/media_add.php | 2 +- src/admin/module_main.php | 10 ++-- src/admin/module_upload.php | 4 +- src/admin/mychannel_edit.php | 22 ++++----- src/admin/soft_edit.php | 2 +- src/admin/sys_repair.php | 8 ++-- src/admin/templets/article_add.htm | 2 +- src/admin/templets/diy_main.htm | 2 +- src/admin/templets/media_main.htm | 64 ++++++++++++------------- src/admin/templets/mychannel_edit.htm | 6 +-- src/admin/templets/mychannel_main.htm | 12 ++--- src/admin/templets/soft_add.htm | 4 +- src/admin/templets/soft_edit.htm | 2 +- src/admin/templets_one_add.php | 2 +- src/admin/templets_one_edit.php | 2 +- src/admin/tpl.php | 10 ++-- src/system/libraries/oxwindow.class.php | 2 +- 22 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index 412f2fd5..a523a482 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -140,7 +140,7 @@ if ($dojob == '') { } $dvlen = $tjlen * 1; $tjsta = "
"; - $tjsta .= "
完成处理文档总数$tjlen%"; + $tjsta .= "
完成处理文档总数$tjlen%"; if ($tjnum < $totalnum) { $nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); diff --git a/src/admin/dialog/select_soft_post.php b/src/admin/dialog/select_soft_post.php index 07e04ed2..b199d7da 100644 --- a/src/admin/dialog/select_soft_post.php +++ b/src/admin/dialog/select_soft_post.php @@ -45,7 +45,7 @@ if (!empty($newname)) { if (!preg_match("#\.#", $filename)) $fs = explode('.', $uploadfile_name); else $fs = explode('.', $filename); if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) { - ShowMsg("您指定的文件名被系统禁止", 'javascript:;'); + ShowMsg("指定的文件名已被系统禁止", 'javascript:;'); exit(); } if (!preg_match("#\.#", $filename)) $filename = $filename.'.'.$fs[count($fs) - 1]; @@ -59,7 +59,7 @@ if (!empty($newname)) { $filename = $filename.'.'.$fs[count($fs) - 1]; } if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)[^a-zA-Z0-9]+$#i', trim($filename))) { - ShowMsg("你指定的文件名被系统禁止",'javascript:;'); + ShowMsg("指定的文件名已被系统禁止",'javascript:;'); exit(); } $fullfilename = $cfg_basedir.$activepath.'/'.$filename; diff --git a/src/admin/file_class.php b/src/admin/file_class.php index d1285c99..d96092d5 100644 --- a/src/admin/file_class.php +++ b/src/admin/file_class.php @@ -33,7 +33,7 @@ class FileManagement if ($oldext != $newext) { if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($newname))) { - ShowMsg("您指定的文件名被系统禁止", "javascript:;"); + ShowMsg("指定的文件名已被系统禁止", "javascript:;"); exit(); } } @@ -160,11 +160,11 @@ class FileManagement $this->RmDirFiles($filename); } else { //完善用户体验，by:sumic - ShowMsg("系统禁止删除".$t."", "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("系统禁止删除".$t."", "file_manage_main.php?activepath=".$this->activeDir); exit; } } - ShowMsg("成功删除一个".$t."", "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("成功删除一个".$t."", "file_manage_main.php?activepath=".$this->activeDir); return 0; } } diff --git a/src/admin/file_manage_control.php b/src/admin/file_manage_control.php index 2fa08368..9024f035 100644 --- a/src/admin/file_manage_control.php +++ b/src/admin/file_manage_control.php @@ -56,7 +56,7 @@ else if ($fmdo == "edit") { CheckCSRF(); $filename = str_replace("..", "", $filename); if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($filename))) { - ShowMsg("您指定的文件名被系统禁止", "javascript:;"); + ShowMsg("指定的文件名已被系统禁止", "javascript:;"); exit(); } $file = "$cfg_basedir$activepath/$filename"; diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php index 18fd33f4..f817eed6 100644 --- a/src/admin/makehtml_homepage.php +++ b/src/admin/makehtml_homepage.php @@ -63,7 +63,7 @@ if ($dopost == "view") { $remotepos = empty($remotepos) ? '/index.html' : $remotepos; $serviterm = empty($serviterm) ? "" : $serviterm; if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($position))) { - ShowMsg("您指定的文件名被系统禁止", "javascript:;"); + ShowMsg("指定的文件名已被系统禁止", "javascript:;"); exit(); } $homeFile = DEDEADMIN."/".$position; diff --git a/src/admin/media_add.php b/src/admin/media_add.php index 469d410b..01d2f7d3 100644 --- a/src/admin/media_add.php +++ b/src/admin/media_add.php @@ -53,7 +53,7 @@ if ($dopost == "upload") { CloseFtp(); } if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)[^a-zA-Z0-9]+$#i', trim($filename))) { - ShowMsg("你指定的文件名被系统禁止！",'javascript:;'); + ShowMsg("指定的文件名已被系统禁止",'javascript:;'); exit(); } $fullfilename = $cfg_basedir.$filename; diff --git a/src/admin/module_main.php b/src/admin/module_main.php index d3704ecf..08ea5ea7 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -215,7 +215,7 @@ else if ($action == 'setup') { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); $win->Display(); $dm->Clear(); @@ -326,7 +326,7 @@ else if ($action == 'del') { 删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除 "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); $win->Display(); $dm->Clear(); @@ -404,7 +404,7 @@ else if ($action == 'uninstall') { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); $win->Display(); $dm->Clear(); @@ -460,7 +460,7 @@ else if ($action == 'showreadme') { $win->Init("module_main.php", "js/blank.js", "post"); $wecome_info = "模块管理"; $win->AddTitle("模块管理 > 使用说明"); - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand"); $win->Display(); exit(); @@ -538,7 +538,7 @@ else if ($action == 'view') { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); $dm->Clear(); diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index d56e02f6..17af0811 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -55,7 +55,7 @@ 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 = " @@ -73,7 +73,7 @@ if ($action == 'upload') {
"; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow('ok', ''); $win->Display(); exit(); diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 686c35c2..48b3e82f 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -60,25 +60,25 @@ else if ($dopost == "copystart") { $win->AddHidden("id", $id); $win->AddHidden("dopost", 'copysave'); $msg = " - +
- - + + - + - + - + - +
新栏目id：新栏目id：
新栏目名称：新栏目名称：
新栏目标识：新栏目标识：
新附加表：新附加表：
复制模板：复制模板： @@ -86,7 +86,7 @@ else if ($dopost == "copystart") {
"; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); $win->Display(); exit(); @@ -278,7 +278,7 @@ else if ($dopost == "save") { } $trueTable = str_replace("#@__", $cfg_dbprefix, $addtable); if (!$dsql->IsTable($trueTable)) { - ShowMsg("系统找不到您所指定的表`$trueTable`，请手工创建这个表", "-1"); + ShowMsg("系统找不到您所指定的表`$trueTable`，请您创建这个表", "-1"); exit(); } $dsql->ExecuteNoneQuery($query); @@ -295,7 +295,7 @@ else if ($dopost == "gettemplets") { $wecome_info = "栏目管理::查看模板"; $win = new OxWindow(); $win->Init("", "js/blank.js", ""); - $win->AddTitle("栏目[".$row['typename']."]默认模板文件说明"); + $win->AddTitle("栏目".$row['typename']."默认模板文件说明"); $defaulttemplate = $cfg_templets_dir.'/'.$cfg_df_style; $msg = " 文档模板：{$defaulttemplate}/article_{$row['nid']}.htm @@ -306,7 +306,7 @@ else if ($dopost == "gettemplets") { 封面栏目模板：{$defaulttemplate}/index_{$row['nid']}.htm [修改] "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", ""); $win->Display(); exit(); diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index a1a46ba8..07a94dd9 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -49,7 +49,7 @@ if ($dopost != 'save') { $islocal = $ctag->GetAtt('islocal'); if ($islocal != 1) $needmsg = ""; else $needmsg = ''; - $nForm .= "
软件地址{$newRowStart}： 服务器名称： + $nForm .= "
软件地址{$newRowStart}： 服务器名称： $needmsg
\r\n"; diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index 03e783b7..bb0bb4db 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -31,7 +31,7 @@ if (empty($dopost)) { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); exit(); @@ -60,7 +60,7 @@ else if ($dopost == 1) { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); exit(); @@ -133,7 +133,7 @@ else if ($dopost == 2) { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); exit(); @@ -187,7 +187,7 @@ else if ($dopost == 3) { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); exit(); diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 0a497042..3b1d8b7e 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -28,7 +28,7 @@ return false; } if (document.form1.typeid.value == 0) { - ShowMsg('请选择文档的主类别'); + ShowMsg('请选择文档的主栏目'); return false; } } diff --git a/src/admin/templets/diy_main.htm b/src/admin/templets/diy_main.htm index 927aac65..fce473ad 100644 --- a/src/admin/templets/diy_main.htm +++ b/src/admin/templets/diy_main.htm @@ -27,9 +27,9 @@ {dede:field.table/} 修改 - 删除 导出 预览 + 删除 {/dede:datalist} diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index bccdd672..c9545d87 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -8,40 +8,40 @@ - + diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 0900aa46..1be3d3dd 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -255,13 +255,13 @@ - + 修改 - + 删除 禁止"; } ?> diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index 1925b76f..07f1a01b 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -43,12 +43,12 @@ {/dede:datalist} diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 4164557e..8ecaeafd 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -27,7 +27,7 @@ return false; } if (document.form1.typeid.value == 0) { - ShowMsg('请选择文档的主类别'); + ShowMsg('请选择文档的主栏目'); return false; } } @@ -37,7 +37,7 @@ var endNum = parseInt(document.form1.picnum.value) + startNum - 1; if (endNum > 30) endNum = 30; for (startNum; startNum <= endNum; startNum++) { - upfield.innerHTML += "
软件地址" + startNum + "： 服务器名称：
"; + upfield.innerHTML += "
软件地址" + startNum + "： 服务器名称：
"; } } function ShowHideAddr() { diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 0743f765..630bfa37 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -33,7 +33,7 @@ var endNum = parseInt(document.form1.picnum.value) + startNum; if (endNum > 30) endNum = 30; for (startNum; startNum < endNum; startNum++) { - upfield.innerHTML += "
软件地址" + startNum + "： 服务器名称：
"; + upfield.innerHTML += "
软件地址" + startNum + "： 服务器名称：
"; } } function ShowHideAddr() { diff --git a/src/admin/templets_one_add.php b/src/admin/templets_one_add.php index 0e65beda..67b87c04 100644 --- a/src/admin/templets_one_add.php +++ b/src/admin/templets_one_add.php @@ -18,7 +18,7 @@ if ($dopost == "save") { $filename = preg_replace("#^\/#", "", $nfilename); if (DEDEBIZ_SAFE_MODE) $ismake = 0; //安全模式不允许编译 if (!preg_match('#\.htm$#i', trim($template))) { - ShowMsg("您指定的文件名被系统禁止", "javascript:;"); + ShowMsg("指定的文件名已被系统禁止", "javascript:;"); exit(); } if ($likeid == '') { diff --git a/src/admin/templets_one_edit.php b/src/admin/templets_one_edit.php index 5b97e840..b86db6b4 100644 --- a/src/admin/templets_one_edit.php +++ b/src/admin/templets_one_edit.php @@ -19,7 +19,7 @@ if ($dopost == "saveedit") { $filename = preg_replace("#^\/#", "", $nfilename); if (DEDEBIZ_SAFE_MODE) $ismake = 0; //安全模式不允许编译 if (!preg_match('#\.htm$#i', trim($template))) { - ShowMsg("您指定的文件名被系统禁止", "javascript:;"); + ShowMsg("指定的文件名已被系统禁止", "javascript:;"); exit(); } //如果修改了文件名，删除旧文件 diff --git a/src/admin/tpl.php b/src/admin/tpl.php index a9b1ed12..fe8c660b 100644 --- a/src/admin/tpl.php +++ b/src/admin/tpl.php @@ -124,13 +124,13 @@ 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 = " -
{dede:field.isshow function="GetSta(@me,$fields['id'])"/} {dede:field.issystem function='IsSystem(@me)'/} - - - - - - + + + + + +
+
- - +
请选择文件： + 选择文件： @@ -138,7 +138,7 @@ else if ($action == 'upload') {
"; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow('ok', ''); $win->Display(); exit(); diff --git a/src/system/libraries/oxwindow.class.php b/src/system/libraries/oxwindow.class.php index b105b63d..8c4efb16 100755 --- a/src/system/libraries/oxwindow.class.php +++ b/src/system/libraries/oxwindow.class.php @@ -249,7 +249,7 @@ function ShowMsgWin($msg, $title) $win->Init(); $win->mainTitle = "系统提示"; $win->AddTitle($title); - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand"); $win->Display(); }