valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add DiskCache.getUrl() and use it in a bunch of places

This commit is contained in:
Andrew Dolgov 2019-08-13 12:39:21 +03:00
parent 7602819b98
commit b1dd38f880
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/article.php
View File

@ -676,7 +676,7 @@ class Article extends Handler_Protected {
while ($line = $sth->fetch()) {
if (file_exists(CACHE_DIR . '/images/' . sha1($line["content_url"]))) {
$line["content_url"] = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($line["content_url"]);
$line["content_url"] = DiskCache::getUrl(sha1($line["content_url"]));
}
array_push($rv, $line);

4
classes/diskcache.php
View File

@ -56,4 +56,8 @@ class DiskCache {
public function send($filename) {
return send_local_file($this->getFullPath($filename));
}
static public function getUrl($filename) {
return get_self_url_prefix() . "/public.php?op=cached_url&file=" . $filename;
}
}

2
classes/handler/public.php
View File

@ -1202,7 +1202,7 @@ class Handler_Public extends Handler {
}
function cached_url() {
@$req_filename = basename($_GET['hash']);
@$req_filename = basename($_GET['file']);
// we don't need an extension to find the file, hash is a complete URL
$hash = preg_replace("/\.[^\.]*$/", "", $req_filename);

15
include/functions.php
View File

@ -1258,20 +1258,7 @@
if (file_exists($cached_filename)) {
// this is strictly cosmetic
if ($entry->tagName == 'img') {
$suffix = ".png";
} else if ($entry->parentNode && $entry->parentNode->tagName == "picture") {
$suffix = ".png";
} else if ($entry->parentNode && $entry->parentNode->tagName == "video") {
$suffix = ".mp4";
} else if ($entry->parentNode && $entry->parentNode->tagName == "audio") {
$suffix = ".ogg";
} else {
$suffix = "";
}
$src = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($src) . $suffix;
$src = DiskCache::getUrl(sha1($src));
if ($entry->hasAttribute('poster'))
$entry->setAttribute('poster', $src);