1 files changed, 43 insertions, 31 deletions

diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index 343975f6..d4f456d7 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2012 Bharat Mediratta
+ * Copyright (C) 2000-2013 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,51 +32,51 @@ class data_rest_Core {
       throw new Rest_Exception("Bad Request", 400, array("errors" => array("size" => "invalid")));
     }
 
-    switch ($p->size) {
-    case "thumb":
-      $file = $item->thumb_path();
-      break;
-
-    case "resize":
-      $file = $item->resize_path();
-      break;
+    // Note: this code is roughly duplicated in file_proxy, so if you modify this, please look to
+    // see if you should make the same change there as well.
 
-    case "full":
+    if ($p->size == "full") {
       $file = $item->file_path();
-      break;
+    } else if ($p->size == "resize") {
+      $file = $item->resize_path();
+    } else {
+      $file = $item->thumb_path();
     }
 
     if (!file_exists($file)) {
       throw new Kohana_404_Exception();
     }
 
-    // Note: this code is roughly duplicated in data_rest, so if you modify this, please look to
-    // see if you should make the same change there as well.
-    //
-    // We don't have a cache buster in the url, so don't set cache headers here.
-    // We don't need to save the session for this request
-    Session::instance()->abort_save();
+    header("Content-Length: " . filesize($file));
 
-    if ($item->is_album() && !$item->album_cover_item_id) {
-      // No thumbnail.  Return nothing.
-      // @todo: what should we do here?
-      return;
+    if (isset($p->m)) {
+      header("Pragma:");
+      // Check that the content hasn't expired or it wasn't changed since cached
+      expires::check(2592000, $item->updated);
+
+      expires::set(2592000, $item->updated);  // 30 days
     }
 
-    // Dump out the image.  If the item is a movie, then its thumbnail will be a JPG.
-    if ($item->is_movie() && $p->size == "thumb") {
+    // We don't need to save the session for this request
+    Session::instance()->abort_save();
+
+    // Dump out the image.  If the item is a movie or album, then its thumbnail will be a JPG.
+    if (($item->is_movie() || $item->is_album()) && $p->size == "thumb") {
       header("Content-Type: image/jpeg");
-    } else if ($item->is_album()) {
-      header("Content-Type: " . $item->album_cover()->mime_type);
     } else {
-      header("Content-Type: {$item->mime_type}");
+      header("Content-Type: $item->mime_type");
     }
-    Kohana::close_buffers(false);
 
-    if (isset($p->encoding) && $p->encoding == "base64") {
-      print base64_encode(file_get_contents($file));
+    if (TEST_MODE) {
+      return $file;
     } else {
-      readfile($file);
+      Kohana::close_buffers(false);
+
+      if (isset($p->encoding) && $p->encoding == "base64") {
+        print base64_encode(file_get_contents($file));
+      } else {
+        readfile($file);
+      }
     }
 
     // We must exit here to keep the regular REST framework reply code from adding more bytes on
@@ -93,6 +93,18 @@ class data_rest_Core {
   }
 
   static function url($item, $size) {
-    return url::abs_site("rest/data/{$item->id}?size=$size");
+    if ($size == "full") {
+      $file = $item->file_path();
+    } else if ($size == "resize") {
+      $file = $item->resize_path();
+    } else {
+      $file = $item->thumb_path();
+    }
+    if (!file_exists($file)) {
+      throw new Kohana_404_Exception();
+    }
+
+    return url::abs_site("rest/data/{$item->id}?size=$size&m=" . filemtime($file));
   }
 }
+