From 77990168862202a0de9a4fa944fb0ba0b6b7ba3b Mon Sep 17 00:00:00 2001 From: tianya Date: Fri, 4 Aug 2023 00:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=90=9C=E7=B4=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/changelog.md | 10 ++++++++++ src/admin/actionsearch_class.php | 8 ++++++-- src/admin/inc/inc_action_info.php | 6 +++--- src/admin/mychannel_add.php | 3 +++ src/admin/mychannel_edit.php | 3 +++ src/admin/mychannel_field_add.php | 3 +++ src/admin/mychannel_field_edit.php | 3 +++ src/admin/mychannel_main.php | 3 +++ src/admin/sys_data.php | 2 +- src/admin/templets/action_search.htm | 3 ++- src/system/common.inc.php | 2 +- 11 files changed, 38 insertions(+), 8 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 6e389a1e..032db37a 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,6 +1,16 @@ # 更新记录 通过访问 https://www.dedebiz.com/git 获取完整更新记录 +# V6.2.11 +- 增加商业版扩展DedeBIZ Search； +- 增加用户中心个人主页功能； +- 修正联动模型调用错误； +- 修正软件模型会员发布器缺失的错误； +- 修正TAG为空无法删除的错误； +- 修正TAG生成目录错误； +- 移除FTP的支持； +- 其他常规问题修复； +- # V6.2.10 - DedeBIZ基于自由软件基金会发行的GPL v2许可证发布 - 修正后台功能说明提示； diff --git a/src/admin/actionsearch_class.php b/src/admin/actionsearch_class.php index 29469d7c..7046423a 100644 --- a/src/admin/actionsearch_class.php +++ b/src/admin/actionsearch_class.php @@ -76,11 +76,15 @@ class ActionSearch foreach ($text as $key => $value) { if ($key == 'title' || $key == 'description') { //仅对title,description进行数组替换 - $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); + if ($key == 'description') { + $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); + } else { + $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); + } } } } else { - $text = str_replace($this->keyword, ''.$this->keyword.'', $text); + $text = str_replace($this->keyword, ''.$this->keyword.'', $text); } return $text; } diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index 820a42e1..b62abeaf 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -87,7 +87,7 @@ $actionSearch[3] = array( 'title' => '文档模型', 'description' => '所有文档模型管理', 'soniterm' => array( - 0 => array( + 0 => DEDEBIZ_SAFE_MODE? null : array( 'title' => '文档模型管理', 'description' => '网站文档、图片、软件、专题、分类等模型管理', 'purview' => 'c_List', @@ -159,7 +159,7 @@ $actionSearch[4] = array( 'purview' => 'sys_Keyword', 'linkurl' => 'article_description_main.php' ), - 6 => array( + 6 => DEDEBIZ_SAFE_MODE? null : array( 'title' => '数据库字段替换', 'description' => '网站数据库字段批量替换', 'purview' => 'sys_ArcBatch', @@ -363,7 +363,7 @@ $actionSearch[9] = array( 'purview' => 'sys_StringMix', 'linkurl' => 'article_string_mix.php' ), - 8 => array( + 8 => DEDEBIZ_SAFE_MODE? null : array( 'title' => '数据库备份还原', 'description' => '数据库备份和还原数据备份', 'purview' => 'sys_data', diff --git a/src/admin/mychannel_add.php b/src/admin/mychannel_add.php index 1f1a949c..271e09d9 100644 --- a/src/admin/mychannel_add.php +++ b/src/admin/mychannel_add.php @@ -9,6 +9,9 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); +if (DEDEBIZ_SAFE_MODE) { + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); +} CheckPurview('c_New'); require_once(DEDEINC."/dedetag.class.php"); if (empty($ismake)) $ismake = 0; diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 5f9951fc..2048f35e 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -9,6 +9,9 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); +if (DEDEBIZ_SAFE_MODE) { + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); +} CheckPurview('c_Edit'); require_once(DEDEINC."/dedetag.class.php"); require_once(DEDEINC."/libraries/oxwindow.class.php"); diff --git a/src/admin/mychannel_field_add.php b/src/admin/mychannel_field_add.php index d5d938e0..8b5a2540 100644 --- a/src/admin/mychannel_field_add.php +++ b/src/admin/mychannel_field_add.php @@ -9,6 +9,9 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); +if (DEDEBIZ_SAFE_MODE) { + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); +} CheckPurview('c_New'); require_once(DEDEADMIN."/inc/inc_admin_channel.php"); require_once(DEDEINC."/dedetag.class.php"); diff --git a/src/admin/mychannel_field_edit.php b/src/admin/mychannel_field_edit.php index c1dc07e1..d49acba7 100644 --- a/src/admin/mychannel_field_edit.php +++ b/src/admin/mychannel_field_edit.php @@ -9,6 +9,9 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); +if (DEDEBIZ_SAFE_MODE) { + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); +} CheckPurview('c_New'); require_once(DEDEINC."/dedetag.class.php"); require_once(dirname(__FILE__)."/inc/inc_admin_channel.php"); diff --git a/src/admin/mychannel_main.php b/src/admin/mychannel_main.php index c5961eae..e74e256e 100644 --- a/src/admin/mychannel_main.php +++ b/src/admin/mychannel_main.php @@ -9,6 +9,9 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); +if (DEDEBIZ_SAFE_MODE) { + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); +} CheckPurview('c_List'); require_once(DEDEINC.'/datalistcp.class.php'); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); diff --git a/src/admin/sys_data.php b/src/admin/sys_data.php index a10bb37a..306c82d5 100644 --- a/src/admin/sys_data.php +++ b/src/admin/sys_data.php @@ -11,7 +11,7 @@ require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); - } +} CheckPurview('sys_Data'); if (empty($dopost)) $dopost = ''; if ($cfg_dbtype == 'sqlite') { diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index 6955bcdd..51962b3b 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -19,7 +19,8 @@ - + +

diff --git a/src/system/common.inc.php b/src/system/common.inc.php index 27bf9657..30650736 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -7,7 +7,7 @@ * @link https://www.dedebiz.com */ //系统默认运行模式为安全模式，模板管理、标签管理、数据库管理、模块管理等功能已暂停，如果您需要这些功能，DEDEBIZ_SAFE_MODE后面值`TRUE`改为`FALSE`恢复使用 -define('DEDEBIZ_SAFE_MODE', FALSE); +define('DEDEBIZ_SAFE_MODE', TRUE); //生产环境使用`production`，如果采用`dev`模式，会有一些php的报错信息提示，用于开发调试 if (!defined('DEDE_ENVIRONMENT')) { define('DEDE_ENVIRONMENT', 'production');