From 92d99ac9ac02cc5d93d7d8ecffde5fbac302b909 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Sun, 10 Apr 2022 23:22:46 +0800 Subject: [PATCH 01/56] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BC=98=E5=8C=96=EF=BC=8C=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A4=B4=E9=83=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/article_template_rand.php | 6 +- src/admin/module_main.php | 10 +-- src/admin/module_make.php | 2 +- src/admin/module_upload.php | 2 +- src/admin/mychannel_main.php | 2 +- src/admin/plus_main.php | 2 +- src/admin/public_guide.php | 2 +- src/admin/sys_repair.php | 28 +++---- src/admin/sys_safetest.php | 2 +- src/admin/templets/album_add.htm | 5 +- src/admin/templets/album_edit.htm | 17 ++--- src/admin/templets/archives_add.htm | 2 +- src/admin/templets/archives_edit.htm | 2 +- src/admin/templets/archives_sg_add.htm | 2 +- src/admin/templets/archives_sg_edit.htm | 2 +- src/admin/templets/article_add.htm | 9 +-- src/admin/templets/article_edit.htm | 5 +- src/admin/templets/article_keywords_main.htm | 2 +- src/admin/templets/article_test_same.htm | 10 +-- src/admin/templets/baidunews.htm | 6 +- src/admin/templets/cards_make.htm | 2 +- src/admin/templets/cards_manmage.htm | 2 +- src/admin/templets/cards_type.htm | 2 +- src/admin/templets/catalog_add.htm | 2 +- src/admin/templets/catalog_add_quick.htm | 4 +- src/admin/templets/catalog_edit.htm | 2 +- src/admin/templets/catalog_main.htm | 4 +- src/admin/templets/content_batch_up.htm | 2 +- src/admin/templets/content_tj.htm | 2 +- src/admin/templets/diy_add.htm | 4 +- src/admin/templets/diy_edit.htm | 8 +- src/admin/templets/diy_edit_content.htm | 3 +- src/admin/templets/diy_field_add.htm | 6 +- src/admin/templets/diy_list.htm | 6 +- src/admin/templets/diy_main.htm | 6 +- src/admin/templets/diy_post.htm | 6 -- src/admin/templets/erradd.htm | 2 +- src/admin/templets/feedback_edit.htm | 3 +- src/admin/templets/feedback_main.htm | 2 +- src/admin/templets/file_manage_main.htm | 6 +- src/admin/templets/freelist_add.htm | 12 +-- src/admin/templets/freelist_edit.htm | 12 +-- src/admin/templets/freelist_main.htm | 36 +++------ src/admin/templets/friendlink_add.htm | 2 +- src/admin/templets/friendlink_edit.htm | 2 +- src/admin/templets/friendlink_main.htm | 2 +- src/admin/templets/log_list.htm | 16 ++-- src/admin/templets/makehtml_archives.htm | 2 +- src/admin/templets/makehtml_freelist.htm | 6 +- src/admin/templets/makehtml_taglist.htm | 2 +- src/admin/templets/media_edit.htm | 4 +- src/admin/templets/member_main.htm | 2 +- src/admin/templets/member_pm.htm | 16 +--- src/admin/templets/member_pmall.htm | 6 +- src/admin/templets/member_pmone.htm | 6 +- src/admin/templets/member_rank.htm | 2 +- src/admin/templets/member_scores.htm | 46 +++++------- src/admin/templets/member_toadmin.htm | 2 +- src/admin/templets/member_type.htm | 2 +- src/admin/templets/member_view.htm | 2 +- src/admin/templets/module_edit.htm | 8 +- src/admin/templets/module_help.htm | 8 +- src/admin/templets/module_main.htm | 13 +--- src/admin/templets/module_make.htm | 10 +-- src/admin/templets/module_upload.htm | 8 +- src/admin/templets/mychannel_add.htm | 75 ++++++------------- src/admin/templets/mychannel_field_add.htm | 11 +-- src/admin/templets/mychannel_field_edit.htm | 2 +- src/admin/templets/mychannel_main.htm | 2 +- src/admin/templets/mychannel_modifysearch.htm | 8 +- src/admin/templets/mynews_add.htm | 2 +- src/admin/templets/mynews_edit.htm | 2 +- src/admin/templets/mynews_main.htm | 2 +- src/admin/templets/mytag_add.htm | 2 +- src/admin/templets/mytag_edit.htm | 2 +- src/admin/templets/mytag_main.htm | 2 +- src/admin/templets/mytag_tag_guide.htm | 2 +- src/admin/templets/plus_main.htm | 2 +- src/admin/templets/search_keywords_main.htm | 2 +- src/admin/templets/shops_delivery.htm | 2 +- src/admin/templets/shops_operations.htm | 2 +- src/admin/templets/shops_operations_cart.htm | 2 +- src/admin/templets/soft_add.htm | 2 +- src/admin/templets/soft_config.htm | 2 +- src/admin/templets/soft_edit.htm | 2 +- src/admin/templets/spec_add.htm | 2 +- src/admin/templets/spec_edit.htm | 2 +- src/admin/templets/stepselect_main.htm | 10 +-- src/admin/templets/sys_admin_user.htm | 8 +- src/admin/templets/sys_admin_user_add.htm | 2 +- src/admin/templets/sys_admin_user_edit.htm | 2 +- src/admin/templets/sys_admin_user_tj.htm | 2 +- src/admin/templets/sys_cache_up.htm | 2 +- src/admin/templets/sys_data.htm | 2 +- src/admin/templets/sys_data_replace.htm | 10 +-- src/admin/templets/sys_data_revert.htm | 2 +- src/admin/templets/sys_group.htm | 2 +- src/admin/templets/sys_group_add.htm | 2 +- src/admin/templets/sys_group_edit.htm | 9 +-- src/admin/templets/sys_info.htm | 2 +- src/admin/templets/sys_info_mark.htm | 2 +- src/admin/templets/sys_info_pay.htm | 2 +- src/admin/templets/sys_passport.htm | 2 +- src/admin/templets/sys_payment.htm | 2 +- src/admin/templets/sys_payment_install.htm | 4 +- src/admin/templets/sys_safetest.htm | 6 +- src/admin/templets/sys_sql_query.htm | 2 +- src/admin/templets/tag_test.htm | 2 +- src/admin/templets/tags_main.htm | 6 +- src/admin/templets/templets_one.htm | 14 ++-- src/admin/templets/templets_one_add.htm | 4 +- src/admin/templets/templets_one_edit.htm | 4 +- src/admin/templets/templets_tagsource.htm | 20 ++--- src/admin/templets/tpl_edit.htm | 2 +- src/admin/templets/vote_add.htm | 3 - src/admin/templets/vote_edit.htm | 2 +- src/admin/templets/vote_getcode.htm | 2 +- src/admin/templets/vote_main.htm | 2 +- src/admin/tpl.php | 2 +- src/static/web/css/admin.css | 2 +- src/system/archive/freelist.class.php | 12 +-- src/system/archive/listview.class.php | 12 +-- src/system/archive/searchview.class.php | 6 +- src/system/archive/sglistview.class.php | 10 +-- src/system/archive/specview.class.php | 8 +- src/system/archive/taglist.class.php | 12 +-- src/system/code/datalist.gb2312.inc | 2 +- src/system/code/datalist.utf-8.inc | 2 +- src/system/libraries/oxwindow.class.php | 6 +- src/user/templets/buy_action_payment.htm | 1 - 130 files changed, 288 insertions(+), 474 deletions(-) diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index 03c9437f..05832561 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -94,9 +94,9 @@ function DoRand(jobname) 如果您想对旧的文章应用随机模板设置，请点击此对旧文章进行处理（必须设置好模板项） -  设置全部 -  取消全部 -  $okmsg + 设置全部 + 取消全部 + $okmsg diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 3316111d..eb77cd6e 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(); @@ -327,7 +327,7 @@ else if ($action == 'del') { 删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除 "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow("ok", ""); $win->Display(); $dm->Clear(); @@ -405,7 +405,7 @@ else if ($action == 'uninstall') { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow("ok", ""); $win->Display(); $dm->Clear(); @@ -461,7 +461,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(); @@ -539,7 +539,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_make.php b/src/admin/module_make.php index 29a19ac1..5e5e288a 100644 --- a/src/admin/module_make.php +++ b/src/admin/module_make.php @@ -99,7 +99,7 @@ else if ($action == 'make') { move_uploaded_file($readme, $mdir."/{$hashcode}-r.html") or die("您没填写说明或上传说明文件"); $readmef = $dm->GetEncodeFile($mdir."/{$hashcode}-r.html", TRUE); } else { - $readmetxt = "

".$readmetxt; + $readmetxt = "

".$readmetxt; $readmetxt = preg_replace("#[\r\n]{1,}#", "
\r\n", $readmetxt); $readmetxt .= "

"; $readmef = base64_encode(trim($readmetxt)); diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index 0c5320a1..74255065 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -95,7 +95,7 @@ if ($action == 'upload') { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow('ok', ''); $win->Display(); exit(); diff --git a/src/admin/mychannel_main.php b/src/admin/mychannel_main.php index 44e765ca..fa2fa40e 100644 --- a/src/admin/mychannel_main.php +++ b/src/admin/mychannel_main.php @@ -22,7 +22,7 @@ $dlist->display(); function GetSta($sta, $id) { if ($sta == 1) { - return ($id != -1 ? "启用 > 禁用" : "固定项目"); + return ($id != -1 ? "启用 > 禁用" : "固定项目"); } else { return "禁用 > 启用"; } diff --git a/src/admin/plus_main.php b/src/admin/plus_main.php index b1dbcde9..00375a6b 100644 --- a/src/admin/plus_main.php +++ b/src/admin/plus_main.php @@ -20,7 +20,7 @@ $dlist->display(); function GetSta($sta, $id, $title) { if ($sta == 1) { - return "   修改   启用 > 禁用   删除"; + return "   修改   启用 > 禁用   删除"; } else { return "   修改   禁用 > 启用   册除"; } diff --git a/src/admin/public_guide.php b/src/admin/public_guide.php index c46a4d03..ab5154df 100644 --- a/src/admin/public_guide.php +++ b/src/admin/public_guide.php @@ -38,7 +38,7 @@ if ($action == 'setdefault') { 您目前想要进行的操作：转到默认发布表单   返回发布向导页 "; } - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow("hand"); $win->Display(); exit(); diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index 6a901d03..4b96b014 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -32,13 +32,13 @@ if (empty($dopost)) { 4、检测微表与主表数据一致性


- 点击此开始进行常规检测> + 常规检测


"; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow('hand', ''); $win->Display(); exit(); @@ -65,13 +65,13 @@ else if ($dopost == 1) { 2、更新数据库archives表时出错
3、列表显示数据目与实际文档数不一致

- 点击此检测微表正确性> + 检测数据


"; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow('hand', ''); $win->Display(); exit(); @@ -104,11 +104,11 @@ else if ($dopost == 2) { } } $msg .= "※总有效记录数：{$allarcnum}
"; - $errall = "完成修正或无错误返回>"; + $errall = "完成修正"; $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); $msg .= "※微统计表记录数：{$row['dd']}
"; if ($row['dd'] == $allarcnum) { - $msg .= "

两者记录一致，无需修正


"; + $msg .= "

两者记录一致，无需修正


"; } else { $sql = " TRUNCATE TABLE `#@__arctiny`"; $dsql->ExecuteNoneQuery($sql); @@ -126,10 +126,10 @@ else if ($dopost == 2) { } $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); if ($row['dd'] == $allarcnum) { - $msg .= "

修正记录成功


"; + $msg .= "

修正记录失败，建议进行高级综合检测


"; - $errall = " 进行高级结合性检测> "; + $msg .= "

修正记录失败，建议进行高级综合检测


"; + $errall = " 结合性检测 "; } } UpDateCatCache(); @@ -150,7 +150,7 @@ else if ($dopost == 2) { "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow('hand', ''); $win->Display(); exit(); @@ -195,7 +195,7 @@ else if ($dopost == 3) { } } $win = new OxWindow(); - $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); + $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); $win->mainTitle = "系统修复工具"; $wecome_info = "系统错误修复工具 > 高级综合检测修复"; $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); @@ -206,13 +206,13 @@ else if ($dopost == 3) { 完成所有修复操作，移除错误记录 {$errnum} 条

- 完成修正或无错误返回> + 完成修正 "; - $win->AddMsgItem("
$msg
"); + $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow('hand', ''); $win->Display(); exit(); -} +} \ No newline at end of file diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index 01f95a61..0ba70b4e 100644 --- a/src/admin/sys_safetest.php +++ b/src/admin/sys_safetest.php @@ -26,7 +26,7 @@ foreach ($filelist as $key => $ff) { $alter = ""; if (count($offFiles) == 0) { $alter = ' - '; +
无法同官方网站文件服务器通信，校验时候无法保证本地文件是否同官方服务器文件是否一致
'; } function TestOneFile($f) { diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 86f8e61e..33250ae1 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -256,9 +256,6 @@ table{border-collapse:separate} - -  图集选项： - @@ -471,7 +468,7 @@ table{border-collapse:separate}
- diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index c5a4540c..0f91d41d 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -351,9 +351,6 @@ table{border-collapse:separate}
+
- - - @@ -452,10 +448,8 @@ table{border-collapse:separate} - - - -