stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-09 23:45:56 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the file proxy to use the expires helper to manage content expiration. Fixes ticket #953.

Browse Source
This commit is contained in:
Tim Almdal
2009-12-30 09:55:28 -08:00
parent 373dcf0a42
commit 55eeb8336f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gallery/controllers/file_proxy.php
View File

@@ -99,6 +99,12 @@ class File_Proxy_Controller extends Controller {
throw new Kohana_404_Exception();
}
// Check that the content hasn't expired or it wasn't changed since cached
if (($last_modified = expires::get()) !== false &&
$item->updated < $last_modified) {
expires::check(2592000);
}
// Don't try to load a directory
if ($type == "albums" && $item->is_album()) {
throw new Kohana_404_Exception();
@@ -111,6 +117,8 @@ class File_Proxy_Controller extends Controller {
// We don't need to save the session for this request
Session::abort_save();
expires::set(2592000); // 30 days
// Dump out the image. If the item is a movie, then its thumbnail will be a JPG.
if ($item->is_movie() && $type != "albums") {
header("Content-type: image/jpeg");