Browse Source

开启绝对链接移除图片和下载软件第三方图片或软件会加根网址,导致下载链接错误

tags/6.3.0
叙述、别离 6 months ago
parent
commit
d8f84622b7
9 changed files with 19 additions and 21 deletions
  1. +1
    -1
      src/admin/inc/inc_batchup.php
  2. +1
    -1
      src/apps/download.php
  3. +4
    -4
      src/apps/showphoto.php
  4. +2
    -2
      src/system/archive/freelist.class.php
  5. +2
    -2
      src/system/archive/searchview.class.php
  6. +2
    -2
      src/system/archive/sglistview.class.php
  7. +2
    -2
      src/system/archive/taglist.class.php
  8. +2
    -4
      src/system/taglib/channel/softlinks.lib.php
  9. +3
    -3
      src/theme/dedebiz/article_soft.htm

+ 1
- 1
src/admin/inc/inc_batchup.php View File

@@ -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'],


+ 1
- 1
src/apps/download.php View File

@@ -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;


+ 4
- 4
src/apps/showphoto.php View File

@@ -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 .= "<a href='showphoto.php?aid={$aid}&src=".urlencode($preSrc)."&npos=".($npos - 1)."'>&lt;&lt;上一幅图片</a> ";
$pageGuide .= "<a href='showphoto.php?aid={$aid}&src=".urlencode($preSrc)."&npos=".($npos - 1)."'>上一幅图片</a> ";
} else {
$pageGuide .= "这是开始";
$pageGuide .= "开始";
}
$nextlink = 'javascript:;';
if ($nextSrc != '') {
$nextlink = "showphoto.php?aid={$aid}&src=".urlencode($nextSrc)."&npos=".($npos + 1);
if ($pageGuide != "") $pageGuide .= " | ";
$pageGuide .= "<a href='showphoto.php?aid={$aid}&src=".urlencode($nextSrc)."&npos=".($npos + 1)."'>下一幅图片&gt;</a>";
$pageGuide .= "<a href='showphoto.php?aid={$aid}&src=".urlencode($nextSrc)."&npos=".($npos + 1)."'>下一幅图片</a> ";
} else {
$pageGuide .= " | 没有了";
$pageGuide .= "结束";
}
require_once(DEDETEMPLATE.'/apps/showphoto.htm');
exit();

+ 2
- 2
src/system/archive/freelist.class.php View File

@@ -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'];


+ 2
- 2
src/system/archive/searchview.class.php View File

@@ -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"];


+ 2
- 2
src/system/archive/sglistview.class.php View File

@@ -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']);


+ 2
- 2
src/system/archive/taglist.class.php View File

@@ -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'] = "<a href='".$row['typeurl']."'>".$row['typename']."</a>";


+ 2
- 4
src/system/taglib/channel/softlinks.lib.php View File

@@ -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);


+ 3
- 3
src/theme/dedebiz/article_soft.htm View File

@@ -36,7 +36,7 @@
<span><i class="fa fa-user mr-1"></i>{dede:field.writer/}</span>
<span><i class="fa fa-eye mr-1"></i><script src="{dede:global.cfg_phpurl/}/count.php?view=yes&aid={dede:field.id/}&mid={dede:field name='mid'/}"></script>次</span>
</div>
<div class="img py-3">{dede:field name='image'/}</div>
<div class="img py-3">{dede:field.image/}</div>
<div class="info py-3">
<p>软件类型:{dede:field.softtype/}</p>
<p>授权方式:{dede:field.accredit/}</p>
@@ -50,11 +50,11 @@
<p>演示网址:{dede:field.officialdemo/}</p>
<p>下载次数:<script src="{dede:field.phpurl/}/disdls.php?aid={dede:field.id/}"></script></p>
</div>
<div class="tips py-3">{dede:field name='introduce'/}</div>
<div class="tips py-3">{dede:field.introduce/}</div>
<div class="download py-3">
<h4>下载地址</h4>
<ul class="downurllist">
{dede:field name='softlinks'/}
{dede:field.softlinks/}
</ul>
</div>
<div class="alert alert-success my-3">{dede:softmsg/}</div>


Loading…
Cancel
Save