public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 10:45:56 +00:00
Code Issues Releases Wiki Activity

send_local_file: add application/octet-stream hack

Browse Source 
cached_url: return original requested filename to save as
This commit is contained in:
Andrew Dolgov
2018-08-16 12:16:51 +03:00
parent 163b50b15f
commit 88adf3da1b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/handler/public.php Normal file → Executable file
View File

@@ -934,17 +934,17 @@ class Handler_Public extends Handler {
} }
function cached_url() { function cached_url() {
@$hash = basename($_GET['hash']); @$req_filename = basename($_GET['hash']);
// we don't need an extension to find the file, hash is a complete URL // we don't need an extension to find the file, hash is a complete URL
$hash = preg_replace("/\.[^\.]*$/", "", $hash); $hash = preg_replace("/\.[^\.]*$/", "", $req_filename);
if ($hash) { if ($hash) {
$filename = CACHE_DIR . '/images/' . $hash; $filename = CACHE_DIR . '/images/' . $hash;
if (file_exists($filename)) { if (file_exists($filename)) {
header("Content-Disposition: inline; filename=\"$hash\""); header("Content-Disposition: inline; filename=\"$req_filename\"");
send_local_file($filename); send_local_file($filename);

7
include/functions.php
View File

@@ -2574,6 +2574,13 @@
} }
$mimetype = mime_content_type($filename); $mimetype = mime_content_type($filename);
// this is hardly ideal but 1) only media is cached in images/ and 2) seemingly only mp4
// video files are detected as octet-stream by mime_content_type()
if ($mimetype == "application/octet-stream")
$mimetype = "video/mp4";
header("Content-type: $mimetype"); header("Content-type: $mimetype");
$stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT"; $stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT";