From 221642ab771da692c7a75a19a774308b4ad5a861 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, 31 Mar 2025 22:49:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/system/archive/freelist.class.php | 2 +- src/system/archive/listview.class.php | 4 ++-- src/system/archive/searchview.class.php | 2 +- src/system/archive/sglistview.class.php | 4 ++-- src/system/archive/specview.class.php | 2 +- src/system/archive/taglist.class.php | 2 +- src/system/taglib/arclist.lib.php | 2 +- src/system/taglib/arclistsg.lib.php | 2 +- src/system/taglib/channel/softlinks.lib.php | 6 ++++++ src/system/taglib/likearticle.lib.php | 2 +- src/system/taglib/relation.lib.php | 2 +- 11 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index b725067e..e373519b 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -542,7 +542,7 @@ class FreeList if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php index e68b49db..419c7841 100755 --- a/src/system/archive/listview.class.php +++ b/src/system/archive/listview.class.php @@ -538,7 +538,7 @@ class ListView if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; @@ -970,7 +970,7 @@ class ListView if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index 379994cd..c5be9937 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -578,7 +578,7 @@ class SearchView if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index 16d95fd8..b0581be8 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -447,7 +447,7 @@ class SgListView if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; @@ -810,7 +810,7 @@ class SgListView if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php index 4d2b2402..38fb6a6e 100755 --- a/src/system/archive/specview.class.php +++ b/src/system/archive/specview.class.php @@ -349,7 +349,7 @@ class SpecView if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index 37476f5a..6e9d7ab6 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -345,7 +345,7 @@ class TagList if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php index ade040e5..f50a01a8 100755 --- a/src/system/taglib/arclist.lib.php +++ b/src/system/taglib/arclist.lib.php @@ -348,7 +348,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/taglib/arclistsg.lib.php b/src/system/taglib/arclistsg.lib.php index 05be961f..fe8a56c5 100755 --- a/src/system/taglib/arclistsg.lib.php +++ b/src/system/taglib/arclistsg.lib.php @@ -180,7 +180,7 @@ function lib_arclistsg(&$ctag, &$refObj) if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/taglib/channel/softlinks.lib.php b/src/system/taglib/channel/softlinks.lib.php index c88d33a4..c2eb1c0b 100755 --- a/src/system/taglib/channel/softlinks.lib.php +++ b/src/system/taglib/channel/softlinks.lib.php @@ -69,9 +69,15 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row) //分析本地链接 if (!isset($firstLink) && $islocal == 1) $firstLink = $link; if ($islocal == 1 && $row['islocal'] != 1) continue; +<<<<<<< Updated upstream //支持http,迅雷下载,ftp,flashget if (!preg_match("#^http:\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link)) { $link = $link; +======= + //支持http、迅雷下载、ftp、flashget + if (!preg_match("#^(http|https):\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link) && $GLOBALS['cfg_multi_site'] == 'Y') { + $link = $GLOBALS['cfg_mainsite'].$link; +>>>>>>> Stashed changes } $downloads = getDownloads($link); $uhash = substr(md5($link), 0, 24); diff --git a/src/system/taglib/likearticle.lib.php b/src/system/taglib/likearticle.lib.php index cad1dd65..43d01681 100755 --- a/src/system/taglib/likearticle.lib.php +++ b/src/system/taglib/likearticle.lib.php @@ -123,7 +123,7 @@ function lib_likearticle(&$ctag, &$refObj) if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; diff --git a/src/system/taglib/relation.lib.php b/src/system/taglib/relation.lib.php index 65155f8b..85ce18f5 100644 --- a/src/system/taglib/relation.lib.php +++ b/src/system/taglib/relation.lib.php @@ -110,7 +110,7 @@ function lib_relation(&$ctag, &$refObj) if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; } $row['picname'] = $row['litpic']; From ddb06f3c9e390a282147dc3ab2a296ba7e82eee9 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, 31 Mar 2025 22:50:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/system/taglib/channel/softlinks.lib.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/system/taglib/channel/softlinks.lib.php b/src/system/taglib/channel/softlinks.lib.php index c2eb1c0b..37142c63 100755 --- a/src/system/taglib/channel/softlinks.lib.php +++ b/src/system/taglib/channel/softlinks.lib.php @@ -69,15 +69,9 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row) //分析本地链接 if (!isset($firstLink) && $islocal == 1) $firstLink = $link; if ($islocal == 1 && $row['islocal'] != 1) continue; -<<<<<<< Updated upstream - //支持http,迅雷下载,ftp,flashget - if (!preg_match("#^http:\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link)) { - $link = $link; -======= //支持http、迅雷下载、ftp、flashget if (!preg_match("#^(http|https):\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link) && $GLOBALS['cfg_multi_site'] == 'Y') { $link = $GLOBALS['cfg_mainsite'].$link; ->>>>>>> Stashed changes } $downloads = getDownloads($link); $uhash = substr(md5($link), 0, 24);