From 8443e7bd4304185e1d21640f629b2a9e6c48c422 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: Sat, 6 May 2023 15:25:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=B8=83=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/diy_add.php | 10 ++-- src/admin/diy_edit.php | 4 +- src/admin/diy_field_add.php | 2 +- src/admin/diy_field_edit.php | 7 +-- src/admin/file_class.php | 4 +- src/admin/inc/fieldtype.txt | 1 - src/admin/js/body.js | 2 +- src/admin/makehtml_list_action.php | 2 +- src/admin/media_main.php | 2 +- src/admin/member_pmone.php | 2 +- src/admin/module_main.php | 4 +- src/admin/module_upload.php | 2 +- src/admin/sys_cache_up.php | 2 +- src/admin/sys_info.php | 2 +- src/admin/sys_repair.php | 10 ++-- src/admin/templets/diy_edit_content.htm | 52 +++++++------------ src/admin/templets/diy_field_add.htm | 4 +- src/admin/templets/diy_field_edit.htm | 4 +- src/admin/templets/diy_list.htm | 10 +--- src/admin/templets/diy_main.htm | 4 +- src/admin/templets/diy_post.htm | 2 - src/admin/templets/module_edit.htm | 2 +- src/admin/templets/module_make.htm | 2 +- src/admin/templets/mychannel_field_add.htm | 12 ++--- src/admin/templets/mychannel_field_edit.htm | 5 +- src/admin/templets/sys_safetest.htm | 2 +- src/admin/templets_main.php | 2 +- src/system/archive/archives.class.php | 2 +- src/system/common.func.php | 4 +- src/system/common.inc.php | 2 +- src/system/customfields.func.php | 6 +-- src/system/database/dedesqli.class.php | 6 +-- src/system/database/dedesqlite.class.php | 2 +- src/system/dedetemplate.class.php | 2 +- src/system/uploadsafe.inc.php | 2 +- src/theme/apps/download_links_templet.htm | 10 ++-- src/theme/apps/flink-add.htm | 19 +++---- src/theme/apps/flink-list.htm | 16 +++--- src/theme/apps/heightsearch.htm | 26 +++++----- src/theme/apps/list_diyform.htm | 38 ++++---------- src/theme/apps/post_diyform.htm | 19 ++++--- src/theme/apps/recommend.htm | 20 ++++--- src/theme/apps/showphoto.htm | 12 +++-- src/theme/apps/view_diyform.htm | 31 +++++------ src/theme/apps/view_msg.htm | 22 ++++---- src/theme/apps/view_msg_catalog.htm | 18 ++++--- src/theme/apps/vote.htm | 14 +++-- src/theme/system/channel_addon.htm | 5 +- src/theme/system/channel_article_image.htm | 5 +- src/theme/system/channel_downlinkpage.htm | 2 +- src/theme/system/channel_list.htm | 2 +- src/theme/system/channel_spec_note.htm | 12 ++--- src/theme/system/custom_fields_diy.htm | 4 +- src/theme/system/info_guide.htm | 2 +- src/theme/system/info_link.htm | 18 ++----- src/theme/system/list_fulllist.htm | 18 +++---- src/theme/system/list_sglist.htm | 12 ++--- src/theme/system/memberlist.htm | 5 +- src/theme/system/mynews.htm | 4 +- src/theme/system/part_autochannel.htm | 1 - src/theme/system/part_channelartlist.htm | 18 ++----- src/theme/system/part_imginfolist.htm | 8 +-- src/theme/system/part_imglist.htm | 4 +- src/theme/system/spec_arclist.htm | 2 +- src/theme/system/spec_list.htm | 20 ++++--- src/theme/system/tag_feedback.htm | 2 +- src/theme/system/tag_fieldlist.htm | 4 +- ...plet-pluslist.inc => templet-appslist.inc} | 8 +-- src/theme/templet-dirlist.inc | 2 +- src/theme/templet-filelist.inc | 9 ++-- src/user/templets/album_add.htm | 4 +- src/user/templets/album_edit.htm | 4 +- src/user/templets/archives_add.htm | 4 +- src/user/templets/archives_edit.htm | 4 +- src/user/templets/archives_sg_add.htm | 4 +- src/user/templets/archives_sg_edit.htm | 4 +- src/user/templets/article_add.htm | 4 +- src/user/templets/article_edit.htm | 4 +- src/user/templets/buy.htm | 4 +- src/user/templets/buy_action_payment.htm | 4 +- src/user/templets/soft_add.htm | 4 +- src/user/templets/soft_edit.htm | 4 +- 82 files changed, 285 insertions(+), 358 deletions(-) rename src/theme/{templet-pluslist.inc => templet-appslist.inc} (54%) diff --git a/src/admin/diy_add.php b/src/admin/diy_add.php index 8aae95b9..3a0470c8 100644 --- a/src/admin/diy_add.php +++ b/src/admin/diy_add.php @@ -20,18 +20,18 @@ if (empty($action)) { include(DEDEADMIN."/templets/diy_add.htm"); } else { if (preg_match("#[^0-9-]#", $diyid) || empty($diyid)) { - ShowMsg("'自定义表单id'必须为数字", "-1"); + ShowMsg("自定义表单id必须为数字", "-1"); exit(); } if ($table == "") { - ShowMsg("表名不能为空", "-1"); + ShowMsg("自定义表单表名不能为空", "-1"); exit(); } $public = isset($public) && is_numeric($public) ? $public : 0; $name = dede_htmlspecialchars($name); $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid' OR `table` LIKE '$table' OR name LIKE '$name'"); if (is_array($row)) { - ShowMsg("可能自定义表单的‘diyid’、‘名称’在数据库中已存在,不能重复使用", "-1"); + ShowMsg("自定义表单diyid或名称在数据库中重复", "-1"); exit(); } if ($cfg_dbtype=="sqlite") { @@ -44,7 +44,7 @@ if (empty($action)) { while ($row = $dsql->GetArray("biz")) { if (empty($row[0])) $row[0] = ''; if ($table == $row[0]) { - showmsg('指定的表在数据库中重复', '-1'); + showmsg('指定的自定义表单在数据库中重复', '-1'); exit(); } } @@ -60,7 +60,7 @@ if (empty($action)) { if ($dsql->ExecuteNoneQuery($sql)) { $query = "INSERT INTO `#@__diyforms` (`diyid`,`name`,`table`,`info`,`listtemplate`,`viewtemplate`,`posttemplate`,`public` ) VALUES ('$diyid','$name','$table','','$listtemplate','$viewtemplate','$posttemplate','$public')"; $dsql->ExecuteNoneQuery($query); - showmsg('自定义表单创建成功,请自行添加字段', 'diy_main.php'); + showmsg('自定义表单创建成功,请添加字段', 'diy_main.php'); } else { showmsg('自定义表单创建失败', '-1'); } diff --git a/src/admin/diy_edit.php b/src/admin/diy_edit.php index 9dc7f582..a2fde020 100644 --- a/src/admin/diy_edit.php +++ b/src/admin/diy_edit.php @@ -35,7 +35,7 @@ if ($dopost == "save") { $win->AddHidden("job", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("diyid", $diyid); - $win->AddTitle("删除所有自定义表单相关的文件和数据,您确定要删除\"".$row['name']."\"自定义表单吗"); + $win->AddTitle("删除所有自定义表单数据,您确定要删除".$row['name']."自定义表单吗"); $winform = $win->GetWindow("ok"); $win->Display(); exit(); @@ -44,7 +44,7 @@ if ($dopost == "save") { else if ($job == "yes") { $row = $dsql->GetOne("SELECT `table` FROM `#@__diyforms` WHERE diyid='$diyid'", MYSQL_ASSOC); if (!is_array($row)) { - ShowMsg("您所指定的自定义表单信息不存在", "-1"); + ShowMsg("您所指定的自定义表单不存在", "-1"); exit(); } //删除表 diff --git a/src/admin/diy_field_add.php b/src/admin/diy_field_add.php index 89581bfc..863f3565 100644 --- a/src/admin/diy_field_add.php +++ b/src/admin/diy_field_add.php @@ -60,7 +60,7 @@ if ($action == 'save') { $rs = $dsql->ExecuteNoneQuery("UPDATE `#@__diyforms` SET `info`='$oksetting' WHERE diyid='$diyid' "); if (!$rs) { $grr = $dsql->GetError(); - ShowMsg("保存节点配置出错".$grr, "javascript:;"); + ShowMsg("保存字段失败".$grr, "javascript:;"); exit(); } ShowMsg("成功添加一个字段", "diy_edit.php?diyid=$diyid"); diff --git a/src/admin/diy_field_edit.php b/src/admin/diy_field_edit.php index 5dc06831..ff395d17 100644 --- a/src/admin/diy_field_edit.php +++ b/src/admin/diy_field_edit.php @@ -39,10 +39,7 @@ if ($action == 'save') { exit(); } //检测数据库是否存在附加表,不存在则新建一个 - $tabsql = "CREATE TABLE IF NOT EXISTS `$trueTable`( - `id` int(10) unsigned NOT NULL auto_increment, - `ifcheck` tinyint(1) NOT NULL default '0', - "; + $tabsql = "CREATE TABLE IF NOT EXISTS `$trueTable`(`id` int(10) unsigned NOT NULL auto_increment,`ifcheck` tinyint(1) NOT NULL default '0', "; if ($mysql_version < 4.1) { $tabsql .= " PRIMARY KEY (`id`)\r\n) TYPE=MyISAM; "; } else { @@ -85,7 +82,7 @@ if ($action == 'save') { $oksetting = $dtp->GetResultNP(); $oksetting = addslashes($oksetting); $dsql->ExecuteNoneQuery("UPDATE `#@__diyforms` SET info='$oksetting' WHERE diyid='$diyid' "); - ShowMsg("成功修改一个字段的配置", "diy_edit.php?diyid={$diyid}"); + ShowMsg("成功修改一个字段", "diy_edit.php?diyid={$diyid}"); exit(); } //删除字段 diff --git a/src/admin/file_class.php b/src/admin/file_class.php index 55956baa..9af237f9 100644 --- a/src/admin/file_class.php +++ b/src/admin/file_class.php @@ -13,7 +13,7 @@ class FileManagement { var $baseDir = ""; var $activeDir = ""; - //是否允许文件管理器删除目录,默认为不允许0,如果希望可能管理整个目录,请把值设为1 + //是否允许文件管理器删除目录,默认为不允许0,如果希望管理整个目录,请把值设为1 var $allowDeleteDir = 0; //初始化系统 function Init() @@ -86,7 +86,7 @@ class FileManagement ShowMsg("成功移动文件", "file_manage_main.php?activepath=$mpath", 0, 1000); return 1; } else { - ShowMsg("移动文件$oldfile>$truepath/$mfile失败,可能是某个位置权限不足", "file_manage_main.php?activepath=$mpath", 0, 1000); + ShowMsg("移动文件$oldfile>$truepath/$mfile失败,某个位置权限不足", "file_manage_main.php?activepath=$mpath", 0, 1000); return 0; } } else { diff --git a/src/admin/inc/fieldtype.txt b/src/admin/inc/fieldtype.txt index 1f043fad..31cb11b5 100644 --- a/src/admin/inc/fieldtype.txt +++ b/src/admin/inc/fieldtype.txt @@ -7,7 +7,6 @@ int,整数类型 float,小数类型 datetime,时间类型 img,图片 -imgfile,图片(无格式) media,多媒体文件 addon,附件类型 select,select下拉框 diff --git a/src/admin/js/body.js b/src/admin/js/body.js index 26f61e49..ea369955 100644 --- a/src/admin/js/body.js +++ b/src/admin/js/body.js @@ -73,7 +73,7 @@ function LoadServer() {
- 由于手动升级时会员没运行指定的SQL语句,或自动升级的遗漏处理或处理出错,可能会导致一些错误,使用本工具会自动检测并处理,本工具目前主要执行下面动作: + 由于手动升级时会员没运行指定的SQL语句,或自动升级的遗漏处理或处理出错,会导致一些错误,使用本工具会自动检测并处理,本工具目前主要执行下面动作: 1、修复/优化数据表 2、更新缓存 3、检测系统变量一致性 @@ -40,7 +40,7 @@ else if ($dopost == 1) { $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); $win->mainTitle = "系统修复工具"; $wecome_info = "系统修复工具 > 检测数据结构"; - $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); + $win->AddTitle('本工具用于检测和修复您的系统存在的错误'); $msg = "
|