From 515c081f794c0e020241956f291381361e28489a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 25 Feb 2009 05:27:29 +0000
Subject: Add support MP4 movies also.  Flowplayer supports them and can stream
 them using the h264streaming plugin.  Everything else is a fairly minor
 change.

---
 core/helpers/photo.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'core/helpers/photo.php')

diff --git a/core/helpers/photo.php b/core/helpers/photo.php
index 9b773dc4..aab72a87 100644
--- a/core/helpers/photo.php
+++ b/core/helpers/photo.php
@@ -44,13 +44,6 @@ class photo_Core {
     }
 
     $image_info = getimagesize($filename);
-    if ($image_info) {
-      $type = "photo";
-    } else {
-      $movie_info = movie::getmoviesize($filename);
-      $image_info = array(200, 200, 'mime' => 'video/x-flv');
-      $type = "movie";
-    }
 
     // Force an extension onto the name
     $pi = pathinfo($name);
@@ -60,7 +53,7 @@ class photo_Core {
     }
 
     $photo = ORM::factory("item");
-    $photo->type = $type;
+    $photo->type = "photo";
     $photo->title = $title;
     $photo->description = $description;
     $photo->name = $name;
@@ -109,7 +102,7 @@ class photo_Core {
     $group->input("name")->label(t("Name"));
     $group->input("title")->label(t("Title"));
     $group->textarea("description")->label(t("Description"));
-    $group->upload("file")->label(t("File"))->rules("required|allow[jpg,png,gif,flv]");
+    $group->upload("file")->label(t("File"))->rules("required|allow[jpg,png,gif,flv,mp4]");
     $group->hidden("type")->value("photo");
     $group->submit("")->value(t("Upload"));
     $form->add_rules_from(ORM::factory("item"));
-- 
cgit v1.2.3