From 959b9089403a11b4344cc413a193254b10255a70 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, 29 May 2023 11:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=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/module_main.php | 36 +++++-------- src/admin/module_make.php | 8 +-- src/admin/module_upload.php | 9 ++-- src/admin/sys_repair.php | 50 +++++++++---------- src/admin/templets/ad_add.htm | 18 +++---- src/admin/templets/ad_edit.htm | 4 +- .../templets/article_description_main.htm | 37 ++++++++------ src/admin/templets/mychannel_field_add.htm | 2 +- src/admin/templets/mychannel_field_edit.htm | 2 +- src/admin/tpl.php | 1 - src/system/common.func.php | 4 +- 11 files changed, 82 insertions(+), 89 deletions(-) diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 613e05e3..88e10860 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -82,14 +82,14 @@ if ($action == '') { $devInfo = (array)json_decode($devContent); $offUrl = ""; if ($devInfo['dev_type'] == 1) { - $offUrl = "

官方网址：{$devInfo['offurl']}

"; + $offUrl = "官方网址：{$devInfo['offurl']}
"; } $authAt = date("Y-m-d", $devInfo['auth_at']); if (!isset($info['dev_id'])) { $devInfo['dev_name'] = $info['team']."未认证"; $authAt = "未知"; } - ShowMsg("

开发者名称：{$devInfo['dev_name']}

开发者id：{$devInfo['dev_id']}

认证于：{$authAt}", "-1"); + ShowMsg("开发者名称：{$devInfo['dev_name']}
开发者id：{$devInfo['dev_id']}
认证于：{$authAt}", "-1"); exit; } else if ($action == 'setup') { $dm = new DedeModule($mdir); @@ -139,7 +139,7 @@ if ($action == '') { $prvdir .= ""; $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); - $wecome_info = "模块管理"; + $wecome_info = "模块管理 - 安装{$infos['name']}"; $devURL = DEDECDNURL."/developers/{$infos['dev_id']}.json"; $dhd = new DedeHttpDown(); $dhd->OpenUrl($devURL); @@ -149,12 +149,11 @@ if ($action == '') { if (($devInfo['dev_id'] == $infos['dev_id']) && !empty($devInfo['dev_id'])) { $s = "已认证"; } - $win->AddTitle("模块管理 - 安装{$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'setupstart'); $msg = " -
安装时文件列表中涉及的目录前可写入权限，此外后台管理目录和主题目录也必须暂时设置可写入权限
+
文件列表中涉及的目录权限可写入，后台管理目录和主题目录也权限可写入
@@ -266,10 +265,9 @@ if ($action == '') { $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 已认证"; $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); - $wecome_info = "模块管理"; - $win->AddTitle("模块管理 - 删除{$infos['name']}"); - $win->AddHidden('hash', $hash); - $win->AddHidden('action', 'delok'); + $wecome_info = "模块管理 - 删除{$infos['name']}"; + $win->AddHidden("hash", $hash); + $win->AddHidden("action", "delok"); $msg = " 模块名称： {$infos['name']} @@ -295,7 +293,7 @@ if ($action == '') { 浏览 - 删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除 + 删除模块仅删除模块安装后文件，用卸载程序来删除 "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); @@ -324,8 +322,7 @@ if ($action == '') { $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 已认证"; $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); - $wecome_info = "模块管理"; - $win->AddTitle("模块管理 - 卸载{$infos['name']}"); + $wecome_info = "模块管理 - 卸载{$infos['name']}"; $win->AddHidden("hash", $hash); $win->AddHidden("action", 'uninstallok'); $msg = " @@ -409,8 +406,7 @@ if ($action == '') { $dm->Clear(); $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); - $wecome_info = "模块管理"; - $win->AddTitle("模块管理 - 使用说明"); + $wecome_info = "模块管理 - 使用说明"; $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand"); $win->Display(); @@ -443,12 +439,10 @@ if ($action == '') { } else { $setupinfo = "未安装 安装"; } - $dev_id = empty($infos['dev_id'])? "安装{$s}" : "{$infos['dev_id']} 安装{$s}"; $win = new OxWindow(); $win->Init("", "js/blank.js", ""); - $wecome_info = "模块管理"; - $win->AddTitle("模块管理 - {$infos['name']}"); + $wecome_info = "模块管理 - {$infos['name']}"; $msg = " 模块名称： {$infos['name']} @@ -473,15 +467,11 @@ if ($action == '') { 使用协议： 浏览 - - 模块文件： - - "; $win->AddMsgItem("$msg"); - $winform = $win->GetWindow('hand', ''); + $winform = $win->GetWindow("hand", false); $win->Display(); $dm->Clear(); exit(); @@ -501,6 +491,6 @@ if ($action == '') { require_once(dirname(__FILE__).'/templets/module_edit.htm'); exit(); } else if ($action == 'download') { - ShowMsg("暂不支持模块下载功能", "javascript:;"); + ShowMsg("不支持模块下载功能", "javascript:;"); } ?> \ No newline at end of file diff --git a/src/admin/module_make.php b/src/admin/module_make.php index 7209f498..2acff82f 100644 --- a/src/admin/module_make.php +++ b/src/admin/module_make.php @@ -31,7 +31,7 @@ else if ($action == 'make') { $devContent = $dhd->GetHtml(); $devInfo = (array)json_decode($devContent); if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) { - ShowMsg("您的开发者账号已经过期，请登录www.dedebiz.com重新申请", "-1"); + ShowMsg("您的开发者账号已经过期，请登录DedeBIZ申请续费", "-1"); exit(); } $filelist = str_replace("\r", "\n", trim($filelist)); @@ -78,7 +78,7 @@ else if ($action == 'make') { $dm = new DedeModule($mdir); if ($dm->HasModule($hashcode)) { $dm->Clear(); - ShowMsg("您指定同名模块已经存在，因此不能创建项目，如果您要更新这个模块，请先删除：module/{$hashcode}.xml", "-1"); + ShowMsg("您指定同名模块已经存在，您要更新这个模块先删除：module/{$hashcode}.xml", "-1"); exit(); } $readmef = $setupf = $uninstallf = ''; @@ -162,7 +162,7 @@ $filelist fwrite($fp, "\r\n"); fwrite($fp, "\r\n"); fclose($fp); - ShowMsg("成功对一个新模块进行编译", "module_main.php"); + ShowMsg("成功更新一个模块插件", "module_main.php"); exit(); } //修改项目 @@ -307,7 +307,7 @@ $filelist fwrite($fp, $fxml); fclose($fp); } - ShowMsg("成功对模块重新编译", "module_main.php"); + ShowMsg("成功更新一个模块插件", "module_main.php"); exit(); }//ClearAllLink(); ?> \ No newline at end of file diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index 700e60ff..27a5567a 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -30,7 +30,7 @@ if ($action == 'upload') { if (empty($infos['hash'])) { unlink($tmpfilename); $dm->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); @@ -53,7 +53,6 @@ if ($action == 'upload') { } else { $win = new OxWindow(); $win->Init("module_upload.php", "js/blank.js", "POST' enctype='multipart/form-data"); - $win->mainTitle = "模块管理"; $wecome_info = "模块管理 - 上传模块插件"; $win->AddTitle('请选择上传的模块插件文件'); $win->AddHidden("action", 'upload'); @@ -63,11 +62,11 @@ if ($action == 'upload') { 已有模块： - + 选择文件： - + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow('ok', ''); diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index 6a7bfb78..79e9b0e6 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -13,10 +13,9 @@ CheckPurview('sys_ArcBatch'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); if (empty($dopost)) { $win = new OxWindow(); - $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); - $win->mainTitle = "系统修复工具"; + $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); $wecome_info = "系统修复工具"; - $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); + $win->AddTitle('系统修复工具用于检测和修复系统数据错误'); $msg = " 由于手动升级时会员没运行指定的SQL语句，或自动升级的遗漏处理或处理出错，会导致一些错误，使用本工具会自动检测并处理，本工具目前主要执行下面动作：
@@ -27,20 +26,19 @@ if (empty($dopost)) { - 常规检测 + 开始检测 "; $win->AddMsgItem("$msg"); - $winform = $win->GetWindow('hand', ''); + $winform = $win->GetWindow("hand", false); $win->Display(); exit(); } //数据结构常规检测 else if ($dopost == 1) { $win = new OxWindow(); - $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); - $win->mainTitle = "系统修复工具"; + $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); $wecome_info = "系统修复工具 - 检测数据结构"; - $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); + $win->AddTitle('系统修复工具用于检测和修复系统数据错误'); $msg = " 已完成数据结构完整性检测：
@@ -49,10 +47,10 @@ else if ($dopost == 1) { 3、列表显示数据目与实际文档数不一致 - 检测数据 + 下一步 "; $win->AddMsgItem("$msg"); - $winform = $win->GetWindow('hand', ''); + $winform = $win->GetWindow("hand", false); $win->Display(); exit(); } @@ -62,7 +60,7 @@ else if ($dopost == 2) { $allarcnum = 0; $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__archives`"); $allarcnum = $arcnum = $row['dd']; - $msg .= "#@__archives 表总记录数：{$arcnum}
"; + $msg .= "#@__archives表总记录数：{$arcnum}
"; $shtables = array(); $dsql->Execute('me', "SELECT addtable FROM `#@__channeltype` WHERE id < -1 "); while ($row = $dsql->GetArray('me')) { @@ -79,15 +77,15 @@ 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); - $msg .= "两者记录不一致，尝试进行简单修正
"; + $msg .= "两者记录不一致，尝试进行简单修复
"; //导入普通模型微数据 $sql = "INSERT INTO `#@__arctiny` (id,typeid,typeid2,arcrank,channel,senddate,sortrank,mid) SELECT id,typeid,typeid2,arcrank,channel,senddate,sortrank,mid FROM `#@__archives` "; $dsql->ExecuteNoneQuery($sql); @@ -99,18 +97,17 @@ 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(); $win = new OxWindow(); - $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); - $win->mainTitle = "系统修复工具"; - $wecome_info = "系统修复工具 - 检测微表正确性"; - $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); + $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); + $wecome_info = "系统修复工具 - 检测微表数据"; + $win->AddTitle('系统修复工具用于检测和修复系统数据错误'); $msg = " {$msg} @@ -118,7 +115,7 @@ else if ($dopost == 2) { {$errall} "; $win->AddMsgItem("$msg"); - $winform = $win->GetWindow('hand', ''); + $winform = $win->GetWindow("hand", false); $win->Display(); exit(); } @@ -155,17 +152,16 @@ else if ($dopost == 3) { } $win = new OxWindow(); $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); - $win->mainTitle = "系统修复工具"; - $wecome_info = "系统修复工具 - 高级综合检测修复"; - $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); + $wecome_info = "系统修复工具 - 高级检测"; + $win->AddTitle('系统修复工具用于检测和修复系统数据错误'); $msg = " 完成所有修复操作，移除错误记录{$errnum}条 - 完成修正 + 完成修复 "; $win->AddMsgItem("$msg"); - $winform = $win->GetWindow('hand', ''); + $winform = $win->GetWindow("hand", false); $win->Display(); exit(); } diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index a355be8b..c3e5eee4 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -11,7 +11,7 @@ - +
@@ -20,18 +20,18 @@ - + @@ -91,7 +91,7 @@ - + @@ -101,7 +101,7 @@
广告管理 - 添加广告位置广告管理 - 添加广告
-
广告代码的调用方法“{dede:myad name='广告位标识'/}”
+
广告代码标签“{dede:myad name='广告位标识'/}”调用
广告位标识： - （使用英文或数字表示的简洁标识） + （使用英文或数字表示标识）
过期显示文档：过期显示：
+
@@ -109,7 +109,7 @@
广告代码：请填写广告代码，支持网页代码