From 7f74902a8df2440e23da02dc66876b1f707361e0 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: Wed, 24 May 2023 15:20:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=AF=B9=E8=AF=9D=E6=A1=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/file_manage_view.php | 8 +-- src/admin/module_main.php | 18 ++--- src/admin/module_upload.php | 6 +- src/admin/mychannel_edit.php | 36 +++++----- src/admin/sys_data_done.php | 2 +- src/admin/sys_info.php | 2 +- src/admin/sys_repair.php | 60 +++++++--------- src/admin/templets/ad_main.htm | 4 +- src/admin/templets/album_add.htm | 8 +-- src/admin/templets/album_edit.htm | 8 +-- src/admin/templets/archives_add.htm | 8 +-- src/admin/templets/archives_edit.htm | 8 +-- src/admin/templets/archives_sg_add.htm | 8 +-- src/admin/templets/archives_sg_edit.htm | 8 +-- src/admin/templets/article_add.htm | 8 +-- src/admin/templets/article_edit.htm | 8 +-- src/admin/templets/article_keywords_main.htm | 4 +- .../templets/article_keywords_select.htm | 8 +-- src/admin/templets/content_i_list.htm | 4 +- src/admin/templets/content_list.htm | 4 +- src/admin/templets/content_s_list.htm | 4 +- src/admin/templets/content_select_list.htm | 4 +- src/admin/templets/content_sg_list.htm | 4 +- src/admin/templets/diy_main.htm | 4 +- src/admin/templets/erradd.htm | 4 +- src/admin/templets/feedback_main.htm | 4 +- src/admin/templets/freelist_main.htm | 4 +- src/admin/templets/friendlink_main.htm | 8 +-- src/admin/templets/friendlink_type.htm | 8 +-- src/admin/templets/index.htm | 18 ++--- src/admin/templets/log_list.htm | 4 +- src/admin/templets/media_main.htm | 4 +- src/admin/templets/member_main.htm | 4 +- src/admin/templets/member_operations.htm | 4 +- src/admin/templets/member_pm.htm | 4 +- src/admin/templets/member_pmall.htm | 4 +- src/admin/templets/member_pmone.htm | 4 +- src/admin/templets/mychannel_main.htm | 4 +- src/admin/templets/plus_main.htm | 4 +- src/admin/templets/soft_add.htm | 8 +-- src/admin/templets/soft_edit.htm | 8 +-- src/admin/templets/spec_add.htm | 8 +-- src/admin/templets/spec_edit.htm | 8 +-- src/admin/templets/stepselect_main.htm | 8 +-- src/admin/templets/sys_info.htm | 4 +- src/admin/templets/tags_main.htm | 14 ++-- src/admin/templets/templets_one.htm | 8 +-- src/admin/templets/vote_main.htm | 4 +- src/admin/tpl.php | 8 +-- src/static/web/css/admin.css | 39 ++++++++++ src/system/common.func.php | 4 +- src/system/common.inc.php | 2 +- src/system/libraries/oxwindow.class.php | 71 ++++++++----------- src/theme/apps/win_templet.htm | 2 +- 54 files changed, 264 insertions(+), 250 deletions(-) diff --git a/src/admin/file_manage_view.php b/src/admin/file_manage_view.php index a552dcf8..c9dafc87 100644 --- a/src/admin/file_manage_view.php +++ b/src/admin/file_manage_view.php @@ -29,8 +29,8 @@ if ($fmdo == "rename") { $win->AddHidden("activepath", $activepath); $win->AddHidden("filename", $filename); $win->AddTitle("修改文件名，当前路径：$ndirstring"); - $win->AddItem("旧名称：", ""); - $win->AddItem("新名称：", ""); + $win->AddItem("旧名称：", ""); + $win->AddItem("新名称：", ""); $winform = $win->GetWindow("ok"); $win->Display(); } @@ -46,7 +46,7 @@ else if ($fmdo == "newdir") { $win->AddHidden("activepath", $activepath); $win->AddHidden("token", make_hash()); $win->AddTitle("当前目录 $activepathname "); - $win->AddItem("新目录：", ""); + $win->AddItem("新目录：", ""); $winform = $win->GetWindow("ok"); $win->Display(); } @@ -62,7 +62,7 @@ else if ($fmdo == "move") { $win->AddTitle("新位置前面不加'/'表示相对于当前位置，加'/'表示相对于根目录"); $win->AddItem("被移动文件：", $filename); $win->AddItem("当前位置：", $activepath); - $win->AddItem("新位置：", ""); + $win->AddItem("新位置：", ""); $winform = $win->GetWindow("ok"); $win->Display(); } diff --git a/src/admin/module_main.php b/src/admin/module_main.php index ba437055..4c95e89f 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -272,8 +272,7 @@ if ($action == '') { $win->AddTitle("模块管理 - 删除{$infos['name']}"); $win->AddHidden('hash', $hash); $win->AddHidden('action', 'delok'); - $msg = " - + $msg = " @@ -299,8 +298,7 @@ if ($action == '') { - -
模块名称： {$infos['name']}
删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除
"; + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); $win->Display(); @@ -332,8 +330,7 @@ if ($action == '') { $win->AddTitle("模块管理 - 卸载{$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'uninstallok'); - $msg = " - + $msg = " @@ -367,8 +364,7 @@ if ($action == '') { - -
模块名称： {$infos['name']}
"; + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); $win->Display(); @@ -455,8 +451,7 @@ if ($action == '') { $win->Init("", "js/blank.js", ""); $wecome_info = "模块管理"; $win->AddTitle("模块管理 - {$infos['name']}"); - $msg = " - + $msg = " @@ -486,8 +481,7 @@ if ($action == '') { - -
模块名称： {$infos['name']}
"; + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index 780be2dc..700e60ff 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -57,8 +57,7 @@ if ($action == 'upload') { $wecome_info = "模块管理 - 上传模块插件"; $win->AddTitle('请选择上传的模块插件文件'); $win->AddHidden("action", 'upload'); - $msg = " - + $msg = " @@ -69,8 +68,7 @@ if ($action == 'upload') { - -
文件格式：
选择文件：
"; + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow('ok', ''); $win->Display(); diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 8da6bb70..ab9ccba9 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -52,8 +52,7 @@ if ($dopost == "show") { $win->AddHidden("cid", $id); $win->AddHidden("id", $id); $win->AddHidden("dopost", 'copysave'); - $msg = " - + $msg = " @@ -75,8 +74,7 @@ if ($dopost == "show") { - -
新模型id：
"; + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); $win->Display(); @@ -264,18 +262,24 @@ if ($dopost == "show") { $win->Init("", "js/blank.js", ""); $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 - 修改 -

"; + $msg = " + + 文档模板：{$defaulttemplate}/article_{$row['nid']}.htm + 修改 + + + + + 列表模板：{$defaulttemplate}/list_{$row['nid']}.htm + 修改 + + + + + 封面栏目模板：{$defaulttemplate}/index_{$row['nid']}.htm + 修改 + + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", ""); $win->Display(); diff --git a/src/admin/sys_data_done.php b/src/admin/sys_data_done.php index a11dd250..3815b5b5 100644 --- a/src/admin/sys_data_done.php +++ b/src/admin/sys_data_done.php @@ -251,7 +251,7 @@ else if ($dopost == 'redat') { function PutInfo($msg1, $msg2) { global $cfg_soft_lang; - $msginfo = "系统提示

系统提示

{$msg1}{$msg2}
"; + $msginfo = "系统提示

系统提示

{$msg1}{$msg2}
"; echo $msginfo.""; } function RpLine($str) diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index acf29f7f..132f4d46 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -147,7 +147,7 @@ EOT; exit; } if ($i == 1) { - echo '搜索不到参数'; + echo '搜索不到参数'; } exit; } else if ($dopost == 'make_encode') { diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index 52560ef2..73d0fdbc 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -17,18 +17,18 @@ if (empty($dopost)) { $win->mainTitle = "系统修复工具"; $wecome_info = "系统修复工具"; $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); - $msg = " - + $msg = " -
由于手动升级时会员没运行指定的SQL语句，或自动升级的遗漏处理或处理出错，会导致一些错误，使用本工具会自动检测并处理，本工具目前主要执行下面动作：
1、修复/优化数据表
2、更新缓存
3、检测系统变量一致性
- 4、检测微表与主表数据一致性
-
常规检测 + 4、检测微表与主表数据一致性
"; + + 常规检测 + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); @@ -41,18 +41,16 @@ else if ($dopost == 1) { $win->mainTitle = "系统修复工具"; $wecome_info = "系统修复工具 - 检测数据结构"; $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); - $msg = " - + $msg = " - -
- 已完成数据结构完整性检测 - 如果您系统有下面几种问题之一，请检测微表正确性：
- 1、获取主键失败，无法进行后续操作
- 2、更新数据库#@__archivess表时出错
- 3、列表显示数据目与实际文档数不一致
-
检测数据 + 已完成数据结构完整性检测：
+ 1、获取主键失败，无法进行后续操作
+ 2、更新数据库#@__archivess表时出错
+ 3、列表显示数据目与实际文档数不一致
"; + + 检测数据 + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); @@ -101,10 +99,10 @@ else if ($dopost == 2) { } $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny`"); if ($row['dd'] == $allarcnum) { - $msg .= "修正记录成功
"; + $msg .= "修正记录成功
"; } else { - $msg .= "修正记录失败，建议进行高级综合检测
"; - $errall = "结合性检测 "; + $msg .= "修正记录失败，建议进行高级综合检测
"; + $errall = "结合性检测 "; } } UpDateCatCache(); @@ -113,14 +111,12 @@ else if ($dopost == 2) { $win->mainTitle = "系统修复工具"; $wecome_info = "系统修复工具 - 检测微表正确性"; $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); - $msg = " - - + $msg = " + -
- {$msg}
- {$errall} -
{$msg}
"; + + {$errall} + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); @@ -162,14 +158,12 @@ else if ($dopost == 3) { $win->mainTitle = "系统修复工具"; $wecome_info = "系统修复工具 - 高级综合检测修复"; $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); - $msg = " - - - -
- 完成所有修复操作，移除错误记录{$errnum}条
- 完成修正 -
"; + $msg = " + 完成所有修复操作，移除错误记录{$errnum}条 + + + 完成修正 + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow('hand', ''); $win->Display(); diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index bf2f9db4..09a27312 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -55,8 +55,8 @@ {/dede:datalist} - - {dede:pagelist listsize='6'/} + + {dede:pagelist listsize='6'/} diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 35ff2d8d..4be23bc7 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -30,8 +30,8 @@ - - + +
发布图片文档
发布图片文档
@@ -359,8 +359,8 @@
- - + + diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 916a59bb..ff454ca8 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -29,8 +29,8 @@ - - + +
修改图片文档
修改图片文档
@@ -401,8 +401,8 @@
- - + + diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 3dedfe1f..c1267816 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -24,8 +24,8 @@ - - + +
发布自定义文档
发布自定义文档
@@ -294,8 +294,8 @@
- - + + diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index 0dd3b1bc..9bd13b32 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -24,8 +24,8 @@ - - + +
修改自定义文档
修改自定义文档
@@ -286,8 +286,8 @@
- - + + diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index 762e38f2..a44b802e 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -24,8 +24,8 @@ - - + + - - + diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index 79e292e3..167551f1 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -25,8 +25,8 @@
发布分类文档
发布分类文档
@@ -123,8 +123,8 @@
+
- - + + - - + diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 88d459da..9b7444ed 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -24,8 +24,8 @@
修改分类文档
修改分类文档
@@ -125,8 +125,8 @@
+
- - + +
发布文档
发布文档
@@ -308,8 +308,8 @@
- - + + diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index 1ae8602b..5cdeeaee 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -25,8 +25,8 @@ - - + +
修改文档
修改文档
@@ -291,8 +291,8 @@
- - + + diff --git a/src/admin/templets/article_keywords_main.htm b/src/admin/templets/article_keywords_main.htm index 65e273d5..aec40d69 100644 --- a/src/admin/templets/article_keywords_main.htm +++ b/src/admin/templets/article_keywords_main.htm @@ -12,8 +12,8 @@
- - +
+
diff --git a/src/admin/templets/article_keywords_select.htm b/src/admin/templets/article_keywords_select.htm index a88a6568..768c427a 100644 --- a/src/admin/templets/article_keywords_select.htm +++ b/src/admin/templets/article_keywords_select.htm @@ -12,8 +12,8 @@ - - +