From b4ef00c8d4e55fe7db3147da21cb4239fd3c428c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 16 Jun 2009 19:44:15 -0700
Subject: Use a placeholder image if ffmpeg is missing instead of throwing an
 exception which would get silently swallowed by swfUpload.

---
 modules/gallery/helpers/graphics.php     |   7 ++++++-
 modules/gallery/helpers/movie.php        |   7 ++++++-
 modules/gallery/images/missing_movie.png | Bin 0 -> 11653 bytes
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 modules/gallery/images/missing_movie.png

(limited to 'modules')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index feebfb34..3f3317ae 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -135,7 +135,12 @@ class graphics_Core {
         if ($input_item->is_movie()) {
           // Convert the movie to a JPG first
           $output_file = preg_replace("/...$/", "jpg", $output_file);
-          movie::extract_frame($input_file, $output_file);
+          try {
+            movie::extract_frame($input_file, $output_file);
+          } catch (Exception $e) {
+            // Assuming this is MISSING_FFMPEG for now
+            copy(MODPATH . "gallery/images/missing_movie.png", $output_file);
+          }
           $working_file = $output_file;
         } else {
           $working_file = $input_file;
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 1d1d29d1..28c15d81 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -53,7 +53,12 @@ class movie_Core {
       throw new Exception("@todo NAME_CANNOT_END_IN_PERIOD");
     }
 
-    $movie_info = movie::getmoviesize($filename);
+    try {
+      $movie_info = movie::getmoviesize($filename);
+    } catch (Exception $e) {
+      // Assuming this is MISSING_FFMPEG for now
+      $movie_info = getimagesize(MODPATH . "gallery/images/missing_movie.png");
+    }
 
     // Force an extension onto the name
     $pi = pathinfo($filename);
diff --git a/modules/gallery/images/missing_movie.png b/modules/gallery/images/missing_movie.png
new file mode 100644
index 00000000..71eb4ecf
Binary files /dev/null and b/modules/gallery/images/missing_movie.png differ
-- 
cgit v1.2.3


From b5582b1d6365a1bba818162df6f59c9238b1b899 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 16 Jun 2009 19:50:26 -0700
Subject: Swap Jakob's placeholder in for mine.

---
 modules/gallery/images/missing_movie.png    | Bin 11653 -> 8474 bytes
 themes/default/images/movie-placeholder.png | Bin 8474 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 modules/gallery/images/missing_movie.png
 delete mode 100755 themes/default/images/movie-placeholder.png

(limited to 'modules')

diff --git a/modules/gallery/images/missing_movie.png b/modules/gallery/images/missing_movie.png
old mode 100644
new mode 100755
index 71eb4ecf..fdc97779
Binary files a/modules/gallery/images/missing_movie.png and b/modules/gallery/images/missing_movie.png differ
diff --git a/themes/default/images/movie-placeholder.png b/themes/default/images/movie-placeholder.png
deleted file mode 100755
index fdc97779..00000000
Binary files a/themes/default/images/movie-placeholder.png and /dev/null differ
-- 
cgit v1.2.3


From baea5e3a1b5a258269accb7ee53f5167607833c2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 16 Jun 2009 20:10:25 -0700
Subject: Add support for uploading .jpeg files (in addition to .jpg)

Fix for ticket #428
---
 modules/gallery/controllers/simple_uploader.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index dfbd4f17..e68df2b8 100644
--- a/modules/gallery/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
@@ -39,7 +39,8 @@ class Simple_Uploader_Controller extends Controller {
     access::verify_csrf();
 
     $file_validation = new Validation($_FILES);
-    $file_validation->add_rules("Filedata", "upload::valid", "upload::type[gif,jpg,png,flv,mp4]");
+    $file_validation->add_rules(
+      "Filedata", "upload::valid", "upload::type[gif,jpg,jpeg,png,flv,mp4]");
     if ($file_validation->validate()) {
       // SimpleUploader.swf does not yet call /start directly, so simulate it here for now.
       if (!batch::in_progress()) {
-- 
cgit v1.2.3