From 818b035ca193c9d49b00ff7285092f60c429fd47 Mon Sep 17 00:00:00 2001 From: tianya Date: Mon, 31 Mar 2025 21:55:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E8=A7=84=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/list.php | 2 ++ src/system/dedetemplate.class.php | 2 +- src/system/taglib/channel/softlinks.lib.php | 18 ++++-------------- src/system/tpllib/plus_channel.php | 9 +-------- src/system/typelink/typelink.class.php | 4 ++-- .../typelink/typeunit.class.selector.php | 2 +- src/user/archives_do.php | 1 - src/user/config.php | 2 +- src/user/inc/inc_archives_functions.php | 2 +- src/user/soft_add.php | 2 -- 10 files changed, 13 insertions(+), 31 deletions(-) diff --git a/src/apps/list.php b/src/apps/list.php index 098add42..47cdca69 100755 --- a/src/apps/list.php +++ b/src/apps/list.php @@ -23,6 +23,8 @@ if (!empty($channelid) && empty($tid)) { } else { $tinfos = $dsql->GetOne("SELECT ch.issystem FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id='$tid' "); } +if (empty($tinfos)) die( DedeAlert("栏目信息获取失败，请检查是否存在当前栏目", ALERT_DANGER)); + if ($tinfos['issystem'] == -1) { $nativeplace = ((empty($nativeplace) || !is_numeric($nativeplace)) ? 0 : $nativeplace); $infotype = ((empty($infotype) || !is_numeric($infotype)) ? 0 : $infotype); diff --git a/src/system/dedetemplate.class.php b/src/system/dedetemplate.class.php index e46c69cb..c0dce5b0 100755 --- a/src/system/dedetemplate.class.php +++ b/src/system/dedetemplate.class.php @@ -9,7 +9,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); * @license GNU GPL v2 (https://www.dedebiz.com/license) * @link https://www.dedebiz.com */ -function MakePublicTag($atts = array(), $refObj = '', $fields = array()) +function MakePublicTag($atts = array(), $refObj = null, $fields = array()) { $atts['tagname'] = preg_replace("/[0-9]{1,}$/", "", $atts['tagname']); $plusfile = DEDEINC.'/tpllib/plus_'.$atts['tagname'].'.php'; diff --git a/src/system/taglib/channel/softlinks.lib.php b/src/system/taglib/channel/softlinks.lib.php index c88d33a4..ef3fd3af 100755 --- a/src/system/taglib/channel/softlinks.lib.php +++ b/src/system/taglib/channel/softlinks.lib.php @@ -9,16 +9,6 @@ if (!defined('DEDEINC')) exit ('dedebiz'); * @license GNU GPL v2 (https://www.dedebiz.com/license) * @link https://www.dedebiz.com */ -/** - * 获取软件连接 - * - * @access public - * @param string $fvalue 默认值 - * @param object $ctag 解析标签 - * @param object $refObj 引用对象 - * @param bool $downloadpage 下载页面 - * @return string - */ function ch_softlinks($fvalue, &$ctag, &$refObj, $fname = '', $downloadpage = false) { global $dsql; @@ -65,14 +55,14 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row) $link = trim($ctag->GetInnerText()); $serverName = trim($ctag->GetAtt('text')); $islocal = trim($ctag->GetAtt('islocal')); - if (isset($sertype_arr[$serverName]) && $islinktype && $sertype_arr[$serverName] != $link_type) continue; + if (isset($sertype_arr[$serverName]) && $islinktype) continue; //分析本地链接 if (!isset($firstLink) && $islocal == 1) $firstLink = $link; if ($islocal == 1 && $row['islocal'] != 1) continue; //支持http,迅雷下载,ftp,flashget - if (!preg_match("#^http:\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link)) { - $link = $link; - } + // if (!preg_match("#^http:\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link)) { + // $link = $link; + // } $downloads = getDownloads($link); $uhash = substr(md5($link), 0, 24); if ($row['gotojump'] == 1) { diff --git a/src/system/tpllib/plus_channel.php b/src/system/tpllib/plus_channel.php index 6709b61f..f7b6829e 100755 --- a/src/system/tpllib/plus_channel.php +++ b/src/system/tpllib/plus_channel.php @@ -10,14 +10,6 @@ if (!defined('DEDEINC')) exit ('dedebiz'); * @link https://www.dedebiz.com */ require_once(DEDEINC.'/channelunit.func.php'); -/** - * plus_channel - * - * @param array $atts - * @param object $refObj - * @param mixed $fields - * @return array - */ function plus_channel(&$atts, &$refObj, &$fields) { global $dsql, $_vars; @@ -31,6 +23,7 @@ function plus_channel(&$atts, &$refObj, &$fields) $topid = 0; //如果属性里没指定栏目id，从引用类里获取栏目信息 if (empty($typeid)) { + $refObj = (object)$refObj; if (isset($refObj->TypeLink->TypeInfos['id'])) { $typeid = $refObj->TypeLink->TypeInfos['id']; $reid = $refObj->TypeLink->TypeInfos['reid']; diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php index cac6f4f3..d6382dab 100755 --- a/src/system/typelink/typelink.class.php +++ b/src/system/typelink/typelink.class.php @@ -182,7 +182,7 @@ class TypeLink if (count($oper) == 0) { $query = "SELECT id,typename,ispart FROM `#@__arctype` WHERE 1=2 "; } else { - $admin_catalog_tmp = $admin_catalog = join(',', $oper); + $admin_catalog = join(',', $oper); $this->dsql->SetQuery("SELECT reid FROM `#@__arctype` WHERE id in($admin_catalog) GROUP BY reid "); $this->dsql->Execute(); $topidstr = ''; @@ -219,7 +219,7 @@ class TypeLink * * @access public * @param int $id 栏目id - * @param int $step 步进标志 + * @param string $step 步进标志 * @param int $oper 操作权限 * @return void */ diff --git a/src/system/typelink/typeunit.class.selector.php b/src/system/typelink/typeunit.class.selector.php index 7a1c7777..9cf1655b 100755 --- a/src/system/typelink/typeunit.class.selector.php +++ b/src/system/typelink/typeunit.class.selector.php @@ -89,7 +89,7 @@ class TypeUnitSelector * @param int $id 栏目id * @param int $channel 栏目id * @param int $soncat 子级分类 - * @return string + * @return void */ function LogicListAllSunType($id, $channel = 0, &$soncat=0) { diff --git a/src/user/archives_do.php b/src/user/archives_do.php index 684cf559..f0e01f8c 100755 --- a/src/user/archives_do.php +++ b/src/user/archives_do.php @@ -127,7 +127,6 @@ else if ($dopost == "delArc") { ShowMsg("删除文档失败", $ENV_GOBACK_URL); exit(); } - exit(); } //查看文档 else if ($dopost == "viewArchives") { diff --git a/src/user/config.php b/src/user/config.php index 583e70d2..2eb1e330 100755 --- a/src/user/config.php +++ b/src/user/config.php @@ -211,7 +211,7 @@ function CheckRank($rank = 0, $money = 0) * * @access public * @param int $channelid 栏目模型id - * @return string + * @return mixed */ function countArchives($channelid) { diff --git a/src/user/inc/inc_archives_functions.php b/src/user/inc/inc_archives_functions.php index 8b3c5a08..2149a5e9 100755 --- a/src/user/inc/inc_archives_functions.php +++ b/src/user/inc/inc_archives_functions.php @@ -179,7 +179,7 @@ function GetFormItemValueA($ctag, $fvalue) * @param bool $isprint 是否打印 * @return string */ -function PrintAutoFieldsAdd(&$fieldset, $loadtype = 'all', $isprint = TRUE) +function PrintAutoFieldsAdd($fieldset, $loadtype = 'all', $isprint = TRUE) { $dtp = new DedeTagParse(); $dtp->SetNameSpace('field', '<', '>'); diff --git a/src/user/soft_add.php b/src/user/soft_add.php index 8b23a87e..1e8a1f12 100755 --- a/src/user/soft_add.php +++ b/src/user/soft_add.php @@ -142,8 +142,6 @@ if (empty($dopost)) { $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - echo $inQuery; - exit(); ShowMsg("数据保存到数据库附加表出错，请联系管理员".str_replace('"', '', $gerr), "javascript:;"); exit(); }