Expand the legal_file events to include separate photo and movie events, and to support MIME types.

1 files changed, 32 insertions, 4 deletions

diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
index 68403fa6..5d10dffd 100644
--- a/modules/gallery/helpers/legal_file.php
+++ b/modules/gallery/helpers/legal_file.php
@@ -18,15 +18,28 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class legal_file_Core {
-  static function get_extensions() {
+  static function get_photo_extensions() {
     // Create a default list of allowed extensions and then let modules modify it.
     $extensions_wrapper = new stdClass();
     $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
+    module::event("legal_photo_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  static function get_movie_extensions() {
+    // Create a default list of allowed extensions and then let modules modify it.
+    $extensions_wrapper = new stdClass();
+    $extensions_wrapper->extensions = array("flv", "mp4", "m4v");
+    module::event("legal_movie_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  static function get_extensions() {
+    $extensions = legal_file::get_photo_extensions();
     if (movie::find_ffmpeg()) {
-      array_push($extensions_wrapper->extensions, "flv", "mp4", "m4v");
+      array_push($extensions, legal_file::get_movie_extensions());
     }
-    module::event("legal_file_extensions", $extensions_wrapper);
-    return $extensions_wrapper->extensions;
+    return $extensions;
   }
 
   static function get_filters() {
@@ -36,4 +49,19 @@ class legal_file_Core {
     }
     return $filters;
   }
+
+  static function get_photo_types() {
+    // Create a default list of allowed types and then let modules modify it.
+    $types_wrapper = new stdClass();
+    module::event("legal_photo_types", $types_wrapper);
+    $types_wrapper->types = array("image/jpeg", "image/gif", "image/png");
+  }
+
+  static function get_movie_types() {
+    // Create a default list of allowed types and then let modules modify it.
+    $types_wrapper = new stdClass();
+    $types_wrapper->types = array("video/flv", "video/x-flv", "video/mp4");
+    module::event("legal_movie_types", $types_wrapper);
+    return $types_wrapper->types;
+  }
 }