From d8f84622b77a4524187644c8bbeb66413e5a7366 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?= <2449271624@qq.com> Date: Mon, 23 Oct 2023 19:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=BB=9D=E5=AF=B9=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E7=A7=BB=E9=99=A4=E5=9B=BE=E7=89=87=E5=92=8C=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E8=BD=AF=E4=BB=B6=E7=AC=AC=E4=B8=89=E6=96=B9=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=88=96=E8=BD=AF=E4=BB=B6=E4=BC=9A=E5=8A=A0=E6=A0=B9?= =?UTF-8?q?=E7=BD=91=E5=9D=80=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/inc/inc_batchup.php | 2 +- src/apps/download.php | 2 +- src/apps/showphoto.php | 8 ++++---- src/system/archive/freelist.class.php | 4 ++-- src/system/archive/searchview.class.php | 4 ++-- src/system/archive/sglistview.class.php | 4 ++-- src/system/archive/taglist.class.php | 4 ++-- src/system/taglib/channel/softlinks.lib.php | 6 ++---- src/theme/dedebiz/article_soft.htm | 6 +++--- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index 4d88a27a..2e257969 100644 --- a/src/admin/inc/inc_batchup.php +++ b/src/admin/inc/inc_batchup.php @@ -106,7 +106,7 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) if ($arcRow['ismake'] == -1 || $arcRow['arcrank'] != 0 || $arcRow['typeid'] == 0 || $arcRow['money'] > 0) { return TRUE; } - //强制转换非多站点模式，以便统一方式获得实际HTML文件 + //强制转换非多站点模式，以便统一方式获得实际网页文件 $GLOBALS['cfg_multi_site'] = 'N'; $arcurl = GetFileUrl( $arcRow['aid'], diff --git a/src/apps/download.php b/src/apps/download.php index 25e84d57..e8eb7d2f 100755 --- a/src/apps/download.php +++ b/src/apps/download.php @@ -116,7 +116,7 @@ else if ($open == 2) { if ($islocal == 1 && $softconfig['islocal'] != 1) continue; //支持http、迅雷下载、ftp、flashget if (!preg_match("#^http:\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link)) { - $link = $cfg_mainsite.$link; + $link = $link; } $dbhash = substr(md5($link), 0, 24); if ($uhash == $dbhash) $softUrl = $link; diff --git a/src/apps/showphoto.php b/src/apps/showphoto.php index 3b3c6f42..7950fed1 100755 --- a/src/apps/showphoto.php +++ b/src/apps/showphoto.php @@ -62,17 +62,17 @@ if ($cfg_multi_site == 'Y') { if (!preg_match("/^(http|https):/i", $nextSrc) && !empty($nextSrc)) $nextSrc = $cfg_basehost.$nextSrc; } if ($preSrc != '') { - $pageGuide .= "<<上一幅图片 "; + $pageGuide .= "上一幅图片 "; } else { - $pageGuide .= "这是开始"; + $pageGuide .= "开始"; } $nextlink = 'javascript:;'; if ($nextSrc != '') { $nextlink = "showphoto.php?aid={$aid}&src=".urlencode($nextSrc)."&npos=".($npos + 1); if ($pageGuide != "") $pageGuide .= " | "; - $pageGuide .= "下一幅图片>"; + $pageGuide .= "下一幅图片 "; } else { - $pageGuide .= " | 没有了"; + $pageGuide .= "结束"; } require_once(DEDETEMPLATE.'/apps/showphoto.htm'); exit(); diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index 2f42cb8c..cd6c7981 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -542,9 +542,9 @@ class FreeList if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = '/static/web/img/thumbnail.jpg'; } - if (!preg_match("#^http:\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + /*if (!preg_match("#^http:\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; - } + }*/ $row['picname'] = $row['litpic']; $row['info'] = $row['description']; $row['filename'] = $row['arcurl']; diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index 76236b42..dadc6659 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -570,9 +570,9 @@ class SearchView if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = '/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^(http|https):\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + /*if (!preg_match("/^(http|https):\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; - } + }*/ $row['picname'] = $row['litpic']; $row["typeurl"] = GetTypeUrl($row["typeid"], $row["typedir"], $row["isdefault"], $row["defaultname"], $row["ispart"], $row["namerule2"], $row["moresite"], $row["siteurl"], $row["sitepath"]); $row["info"] = $row["description"]; diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index a8027576..b73a7b3d 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -433,9 +433,9 @@ class SgListView if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = '/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + /*if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; - } + }*/ $row['picname'] = $row['litpic']; $row['pubdate'] = $row['senddate']; $row['stime'] = GetDateMK($row['pubdate']); diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index db05717c..577624e0 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -342,9 +342,9 @@ class TagList if ($row['litpic'] == '-' || $row['litpic'] == '') { $row['litpic'] = '/static/web/img/thumbnail.jpg'; } - if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { + /*if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; - } + }*/ $row['picname'] = $row['litpic']; $row['stime'] = GetDateMK($row['pubdate']); $row['typelink'] = "".$row['typename'].""; diff --git a/src/system/taglib/channel/softlinks.lib.php b/src/system/taglib/channel/softlinks.lib.php index f6b3645b..2c3a5784 100755 --- a/src/system/taglib/channel/softlinks.lib.php +++ b/src/system/taglib/channel/softlinks.lib.php @@ -54,7 +54,6 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row) $sites = explode("\n", trim($row['sites'])); foreach ($sites as $site) { if (trim($site) == '') continue; - @list($link, $serverName, $serverType) = explode('|', $site); $sertype_arr[trim($serverName)] = trim($serverType); } @@ -72,7 +71,7 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row) if ($islocal == 1 && $row['islocal'] != 1) continue; //支持http,迅雷下载,ftp,flashget if (!preg_match("#^http:\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link)) { - $link = $GLOBALS['cfg_mainsite'].$link; + $link = $link; } $downloads = getDownloads($link); $uhash = substr(md5($link), 0, 24); @@ -86,8 +85,7 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row) } } $dtp->Clear(); - //获取镜像功能的地址 - //必须设置为：[根据本地地址和服务器列表自动生成] 的情况 + //获取镜像功能的地址，必须设置为：根据本地地址和服务器列表自动生成 $linkCount = 1; if ($row['ismoresite'] == 1 && $row['moresitedo'] == 1 && trim($row['sites']) != '' && isset($firstLink)) { $firstLink = preg_replace("#http:\/\/([^\/]*)\/#i", '/', $firstLink); diff --git a/src/theme/dedebiz/article_soft.htm b/src/theme/dedebiz/article_soft.htm index 0c9a94df..ae03225c 100644 --- a/src/theme/dedebiz/article_soft.htm +++ b/src/theme/dedebiz/article_soft.htm @@ -36,7 +36,7 @@ {dede:field.writer/} 次 -
{dede:field name='image'/}
+
{dede:field.image/}

软件类型：{dede:field.softtype/}

授权方式：{dede:field.accredit/}

@@ -50,11 +50,11 @@

演示网址：{dede:field.officialdemo/}

下载次数：

-
{dede:field name='introduce'/}
+
{dede:field.introduce/}

下载地址

{dede:softmsg/}