From 7f7589b9149d0ecab837c80542dd633f4a2ab1db 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: Thu, 25 May 2023 14:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E5=B8=83=E5=AF=B9?=
=?UTF-8?q?=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/admin/album_add.php | 4 +++-
src/admin/album_edit.php | 4 +++-
src/admin/archives_add.php | 4 +++-
src/admin/archives_edit.php | 4 +++-
src/admin/archives_sg_add.php | 4 +++-
src/admin/archives_sg_edit.php | 4 +++-
src/admin/article_add.php | 4 +++-
src/admin/article_edit.php | 4 +++-
src/admin/soft_add.php | 4 +++-
src/admin/soft_edit.php | 4 +++-
src/admin/spec_add.php | 4 +++-
src/admin/spec_edit.php | 4 +++-
src/install/sql-dfdata.txt | 4 ++--
src/user/album_add.php | 2 +-
src/user/album_edit.php | 4 ++--
src/user/archives_add.php | 2 +-
src/user/archives_edit.php | 4 ++--
src/user/archives_sg_add.php | 2 +-
src/user/archives_sg_edit.php | 4 ++--
src/user/article_add.php | 2 +-
src/user/article_edit.php | 4 ++--
src/user/soft_add.php | 2 +-
src/user/soft_edit.php | 6 +++---
23 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/src/admin/album_add.php b/src/admin/album_add.php
index 0a542efe..f8d1b5e1 100644
--- a/src/admin/album_add.php
+++ b/src/admin/album_add.php
@@ -221,7 +221,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布图片文档修改图片文档浏览图片文档管理图片文档$backurl |
";
+ $msg = "
+ | 发布图片文档修改图片文档浏览图片文档管理图片文档$backurl |
+
";
$msg = "{$msg}".GetUpdateTest();
$wintitle = "成功发布图片文档";
$wecome_info = "文档管理 - 发布图片文档";
diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php
index a23cfb6c..9723271d 100644
--- a/src/admin/album_edit.php
+++ b/src/admin/album_edit.php
@@ -263,7 +263,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布图片文档修改图片文档浏览图片文档管理图片文档$backurl |
";
+ $msg = "
+ | 发布图片文档修改图片文档浏览图片文档管理图片文档$backurl |
+
";
$wintitle = "成功修改图片文档";
$wecome_info = "文档管理 - 修改图片文档";
$win = new OxWindow();
diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php
index 0892c962..088ae167 100644
--- a/src/admin/archives_add.php
+++ b/src/admin/archives_add.php
@@ -167,7 +167,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布自定义文档修改自定义文档浏览自定义文档管理自定义文档$backurl |
";
+ $msg = "
+ | 发布自定义文档修改自定义文档浏览自定义文档管理自定义文档$backurl |
+
";
$msg = "{$msg}".GetUpdateTest();
$wintitle = "成功发布自定义文档";
$wecome_info = "文档管理 - 发布自定义文档";
diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php
index b92bf518..4695e32e 100644
--- a/src/admin/archives_edit.php
+++ b/src/admin/archives_edit.php
@@ -152,7 +152,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布自定义文档修改自定义文档查看自定义文档管理自定义文档$backurl |
";
+ $msg = "
+ | 发布自定义文档修改自定义文档查看自定义文档管理自定义文档$backurl |
+
";
$wintitle = "成功修改自定义文档";
$wecome_info = "文档管理 - 修改自定义文档";
$win = new OxWindow();
diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php
index 42db50bf..93bf1fee 100644
--- a/src/admin/archives_sg_add.php
+++ b/src/admin/archives_sg_add.php
@@ -122,7 +122,9 @@ if ($dopost != 'save') {
}
ClearMyAddon($arcID, $title);
//返回成功信息
- $msg = "| 请选择后续操作：发布分类文档修改分类文档浏览分类文档管理分类文档 |
";
+ $msg = "
+ | 发布分类文档修改分类文档浏览分类文档管理分类文档 |
+
";
$wintitle = "成功发布分类文档";
$wecome_info = "文档管理 - 发布分类文档";
$win = new OxWindow();
diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php
index 0e337911..707ab0ca 100644
--- a/src/admin/archives_sg_edit.php
+++ b/src/admin/archives_sg_edit.php
@@ -105,7 +105,9 @@ if ($dopost != 'save') {
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$id";
ClearMyAddon($id, $title);
//返回成功信息
- $msg = "| 请选择后续操作：发布分类文档修改分类文档浏览分类文档管理分类文档 |
";
+ $msg = "
+ | 发布分类文档修改分类文档浏览分类文档管理分类文档 |
+
";
$wintitle = "成功修改分类文档";
$wecome_info = "文档管理 - 修改分类文档";
$win = new OxWindow();
diff --git a/src/admin/article_add.php b/src/admin/article_add.php
index c952a439..4927cf2c 100644
--- a/src/admin/article_add.php
+++ b/src/admin/article_add.php
@@ -198,7 +198,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布文档修改文档浏览文档管理文档$backurl |
";
+ $msg = "
+ | 发布文档修改文档浏览文档管理文档$backurl |
+
";
$msg = "{$msg}".GetUpdateTest();
$wintitle = "成功发布文档";
$wecome_info = "文档管理 - 发布文档";
diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php
index 3d87f1f3..a10d244d 100644
--- a/src/admin/article_edit.php
+++ b/src/admin/article_edit.php
@@ -166,7 +166,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布文档修改文档浏览文档管理文档$backurl |
";
+ $msg = "
+ | 发布文档修改文档浏览文档管理文档$backurl |
+
";
$wintitle = "成功修改文档";
$wecome_info = "文档管理 - 修改文档";
$win = new OxWindow();
diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php
index 677c4ec9..88a47b66 100644
--- a/src/admin/soft_add.php
+++ b/src/admin/soft_add.php
@@ -226,7 +226,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布软件文档修改软件文档浏览软件文档管理软件文档 |
";
+ $msg = "
+ | 发布软件文档修改软件文档浏览软件文档管理软件文档 |
+
";
$msg = "{$msg}".GetUpdateTest();
$wintitle = "成功发布软件文档";
$wecome_info = "文档管理 - 发布软件文档";
diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php
index c3da632b..fdbecec4 100644
--- a/src/admin/soft_edit.php
+++ b/src/admin/soft_edit.php
@@ -208,7 +208,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布软件文档修改软件文档浏览软件文档管理软件文档 |
";
+ $msg = "
+ | 发布软件文档修改软件文档浏览软件文档管理软件文档 |
+
";
$wintitle = "成功修改软件文档";
$wecome_info = "文档管理 - 修改软件文档";
$win = new OxWindow();
diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php
index f0deb72c..b1d57958 100644
--- a/src/admin/spec_add.php
+++ b/src/admin/spec_add.php
@@ -176,7 +176,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布专题修改专题浏览专题管理专题 |
";
+ $msg = "
+ | 发布专题修改专题浏览专题管理专题 |
+
";
$wintitle = "成功发布专题";
$wecome_info = "专题管理 - 发布专题";
$win = new OxWindow();
diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php
index 75e3e0f7..ee072d80 100644
--- a/src/admin/spec_edit.php
+++ b/src/admin/spec_edit.php
@@ -189,7 +189,9 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "| 请选择后续操作：发布专题修改专题浏览专题管理专题 |
";
+ $msg = "
+ | 发布专题修改专题浏览专题管理专题 |
+
";
$wintitle = "成功修改专题";
$wecome_info = "专题管理 - 修改专题";
$win = new OxWindow();
diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt
index 8d6f3c42..52bc18bb 100755
--- a/src/install/sql-dfdata.txt
+++ b/src/install/sql-dfdata.txt
@@ -3953,7 +3953,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
('23','cfg_rewrite','是否使用伪静态，参考栏目修改中提示默认规则','1','bool','N'),
('24','cfg_df_style','网站模板默认风格','1','string','dedebiz'),
('25','cfg_multi_site','是否支持多站点，开启此项后附件栏目连接arclist文档启用绝对网址','2','bool','N'),
-('26','cfg_rm_remote','远程图片本地化','7','bool','Y'),
+('26','cfg_rm_remote','下载远程图片和资源','7','bool','Y'),
('27','cfg_dede_log','是否开启管理日志','2','bool','N'),
('28','cfg_powerby','网站版权信息','1','bstring','Copyright © 2023 DedeBIZ 版权所有'),
('29','cfg_jump_once','跳转网址是否直接跳转否则显示中转页','7','bool','Y'),
@@ -3987,7 +3987,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
('57','cfg_tplcache_dir','模板缓存目录','6','string','/data/tplcache'),
('58','cfg_makesign_cache','是否修改发布单个文档调用缓存','6','bool','N'),
('59','cfg_arc_dellink','删除非站内链接','7','bool','Y'),
-('60','cfg_arc_autopic','提取第一张图片作为缩略图','7','bool','Y'),
+('60','cfg_arc_autopic','提取第一个图片为缩略图','7','bool','Y'),
('61','cfg_arc_autokeyword','自动提取关键词','7','bool','N'),
('62','cfg_title_maxlen','文档标题最大长度，变量后需要手工修改数据表','7','number','255'),
('63','cfg_album_row','图集多行多列样式默认行数','3','number','3'),
diff --git a/src/user/album_add.php b/src/user/album_add.php
index 216bdf0e..d01f49de 100755
--- a/src/user/album_add.php
+++ b/src/user/album_add.php
@@ -149,7 +149,7 @@ if (empty($dopost)) {
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID";
ClearMyAddon($arcID, $title);
//返回成功信息
- $msg = "请选择后续操作：发布图片文档修改图片文档浏览图片文档管理图片文档";
+ $msg = "发布图片文档修改图片文档浏览图片文档管理图片文档";
$wintitle = "成功发布图片文档";
$wecome_info = "图片管理 - 发布图片文档";
$win = new OxWindow();
diff --git a/src/user/album_edit.php b/src/user/album_edit.php
index 5c92b12e..9ae63361 100755
--- a/src/user/album_edit.php
+++ b/src/user/album_edit.php
@@ -34,7 +34,7 @@ if (empty($dopost)) {
$arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' AND arc.mid='".$cfg_ml->M_ID."'; ";
$row = $dsql->GetOne($arcQuery);
if (!is_array($row)) {
- ShowMsg("读取文档信息出错", "-1");
+ ShowMsg("读取文档信息出错", "index.php");
exit();
} else if ($row['arcrank'] >= 0) {
$dtime = time();
@@ -126,7 +126,7 @@ if (empty($dopost)) {
$artUrl = MakeArt($aid, TRUE);
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid";
//返回成功信息
- $msg = "请选择后续操作：发布图片文档修改图片文档浏览图片文档管理图片文档 ";
+ $msg = "发布图片文档修改图片文档浏览图片文档管理图片文档 ";
//提交后返回提交页面
$wintitle = "成功修改图片文档";
$wecome_info = "图片管理 - 修改图片文档";
diff --git a/src/user/archives_add.php b/src/user/archives_add.php
index 7c55c543..557ad6e0 100755
--- a/src/user/archives_add.php
+++ b/src/user/archives_add.php
@@ -122,7 +122,7 @@ if (empty($dopost)) {
}
ClearMyAddon($arcID, $title);
//返回成功信息
- $msg = "请选择后续操作：发布自定义文档修改自定义文档浏览自定义文档管理自定义文档";
+ $msg = "发布自定义文档修改自定义文档浏览自定义文档管理自定义文档";
$wintitle = "成功发布自定义文档";
$wecome_info = "文档管理 - 发布自定义文档";
$win = new OxWindow();
diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php
index 1f714e14..a446d34b 100755
--- a/src/user/archives_edit.php
+++ b/src/user/archives_edit.php
@@ -23,7 +23,7 @@ if (empty($dopost)) {
$arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";
$row = $dsql->GetOne($arcQuery);
if (!is_array($row)) {
- ShowMsg("读取文档信息出错", "-1");
+ ShowMsg("读取文档信息出错", "index.php");
exit();
} else if ($row['arcrank'] >= 0) {
$dtime = time();
@@ -90,7 +90,7 @@ if (empty($dopost)) {
$artUrl = MakeArt($aid, TRUE);
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid";
//返回成功信息
- $msg = "请选择后续操作：发布自定义文档修改自定义文档浏览自定义文档管理自定义文档";
+ $msg = "发布自定义文档修改自定义文档浏览自定义文档管理自定义文档";
$wintitle = "成功修改自定义文档";
$wecome_info = "文档管理 - 修改自定义文档";
$win = new OxWindow();
diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php
index 2bb9c15e..a37dd061 100755
--- a/src/user/archives_sg_add.php
+++ b/src/user/archives_sg_add.php
@@ -152,7 +152,7 @@ if (empty($dopost)) {
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID";
ClearMyAddon($arcID, $title);
//返回成功信息
- $msg = "请选择后续操作：发布分类文档修改分类文档浏览分类文档管理分类文档";
+ $msg = "发布分类文档修改分类文档浏览分类文档管理分类文档";
$wintitle = "成功发布分类文档";
$wecome_info = "文档管理 - 发布分类文档";
$win = new OxWindow();
diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php
index 5224030a..1f5441e7 100755
--- a/src/user/archives_sg_edit.php
+++ b/src/user/archives_sg_edit.php
@@ -23,7 +23,7 @@ if (empty($dopost)) {
$arcQuery = "SELECT ch.*,arc.* FROM `#@__arctiny` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' ";
$cInfos = $dsql->GetOne($arcQuery);
if (!is_array($cInfos)) {
- ShowMsg("读取文档信息出错", "-1");
+ ShowMsg("读取文档信息出错", "index.php");
exit();
}
$addRow = $dsql->GetOne("SELECT * FROM `{$cInfos['addtable']}` WHERE aid='$aid';");
@@ -106,7 +106,7 @@ if (empty($dopost)) {
$artUrl = MakeArt($aid, true);
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid";
//返回成功信息
- $msg = "请选择后续操作：发布分类文档修改分类文档浏览分类文档管理分类文档";
+ $msg = "发布分类文档修改分类文档浏览分类文档管理分类文档";
$wintitle = "成功修改分类文档";
$wecome_info = "文档管理 - 修改分类文档";
$win = new OxWindow();
diff --git a/src/user/article_add.php b/src/user/article_add.php
index afb8f5a3..acf257cc 100755
--- a/src/user/article_add.php
+++ b/src/user/article_add.php
@@ -111,7 +111,7 @@ if (empty($dopost)) {
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID";
ClearMyAddon($arcID, $title);
//返回成功信息
- $msg = "请选择后续操作：发布文档修改文档浏览文档管理文档";
+ $msg = "发布文档修改文档浏览文档管理文档";
$wintitle = "成功发布文档";
$wecome_info = "文档管理 - 发布文档";
$win = new OxWindow();
diff --git a/src/user/article_edit.php b/src/user/article_edit.php
index 1464838d..e7f4a5c2 100755
--- a/src/user/article_edit.php
+++ b/src/user/article_edit.php
@@ -23,7 +23,7 @@ if (empty($dopost)) {
$arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";
$row = $dsql->GetOne($arcQuery);
if (!is_array($row)) {
- ShowMsg("读取文档信息出错", "-1");
+ ShowMsg("读取文档信息出错", "index.php");
exit();
} else if ($row['arcrank'] >= 0) {
$dtime = time();
@@ -85,7 +85,7 @@ if (empty($dopost)) {
$artUrl = $cfg_phpurl."/view.php?aid=$aid";
}
//返回成功信息
- $msg = "请选择后续操作：发布文档修改文档浏览文档管理文档";
+ $msg = "发布文档修改文档浏览文档管理文档";
$wintitle = "成功修改文档";
$wecome_info = "文档管理 - 修改文档";
$win = new OxWindow();
diff --git a/src/user/soft_add.php b/src/user/soft_add.php
index 983a49ab..210dbd9b 100755
--- a/src/user/soft_add.php
+++ b/src/user/soft_add.php
@@ -165,7 +165,7 @@ if (empty($dopost)) {
}
ClearMyAddon($arcID, $title);
//返回成功信息
- $msg = "请选择后续操作：发布软件文档修改软件文档浏览软件文档管理软件文档";
+ $msg = "发布软件文档修改软件文档浏览软件文档管理软件文档";
$wintitle = "成功发布文档文档";
$wecome_info = "软件管理 - 发布软件文档";
$win = new OxWindow();
diff --git a/src/user/soft_edit.php b/src/user/soft_edit.php
index fd680032..f94ab2d6 100755
--- a/src/user/soft_edit.php
+++ b/src/user/soft_edit.php
@@ -23,7 +23,7 @@ if (empty($dopost)) {
$dsql->SetQuery($arcQuery);
$row = $dsql->GetOne($arcQuery);
if (!is_array($row)) {
- ShowMsg("读取文档信息出错", "-1");
+ ShowMsg("读取文档信息出错", "index.php");
exit();
} else if ($row['arcrank'] >= 0) {
$dtime = time();
@@ -36,7 +36,7 @@ if (empty($dopost)) {
$query = "SELECT * FROM `#@__channeltype` WHERE id='".$row['channel']."'";
$cInfos = $dsql->GetOne($query);
if (!is_array($cInfos)) {
- ShowMsg("读取栏目信息出错", "javascript:;");
+ ShowMsg("读取栏目信息出错", "index.php");
exit();
}
$addtable = $cInfos['addtable'];
@@ -163,7 +163,7 @@ if (empty($dopost)) {
$artUrl = $cfg_phpurl."/view.php?aid=$aid";
}
//返回成功信息
- $msg = "请选择后续操作：发布软件文档修改软件文档浏览软件文档管理软件文档";
+ $msg = "发布软件文档修改软件文档浏览软件文档管理软件文档";
$wintitle = "成功修改软件文档";
$wecome_info = "软件管理 - 修改软件文档";
$win = new OxWindow();