From e73af72e67298efe571b4a1ad5b36e2123b0f7eb Mon Sep 17 00:00:00 2001 From: Y Date: Thu, 28 Jan 2016 20:53:25 +0100 Subject: [PATCH] Suggest a filename when saving a page --- web/paperweb.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/web/paperweb.php b/web/paperweb.php index c25ebb9..d954ad2 100644 --- a/web/paperweb.php +++ b/web/paperweb.php @@ -20,14 +20,18 @@ $USER='USER THAT SUDO WILL RUN paperfind.sh AS'; ##### NO CHANGE PAST THIS LINE ##### if (array_key_exists('doDownload', $_REQUEST)) { - $date = escapeshellarg(@$_REQUEST['date']); - $page = escapeshellarg(@$_REQUEST['page']); + $date = @$_REQUEST['date']; + $page = @$_REQUEST['page']; + $datearg = escapeshellarg($date); + $pagearg = escapeshellarg($page); # -M and -R are used instead of -D to avoid storing the data in RAM - $json = exec("sudo -u {$USER} {$PATH} -M {$date} -p {$page}"); + $json = exec("sudo -u {$USER} {$PATH} -M {$datearg} -p {$pagearg}"); if ($json) { $meta = json_decode($json, true); + $ext = explode('/', $meta['mime'])[1]; header("Content-Type: {$meta['mime']}"); + header("Content-Disposition: inline; filename=\"{$date}_{$page}.{$ext}\""); passthru("sudo -u {$USER} {$PATH} -R {$date} -p {$page}"); } } else {