From 39962eaddc17f27eb1baa694ac588138439621d4 Mon Sep 17 00:00:00 2001
From: Romain LE DISEZ <romain.git@ledisez.net>
Date: Sun, 4 Jul 2010 21:53:57 +0200
Subject: Accept extension .m4v as video/mp4

---
 modules/server_add/controllers/server_add.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/server_add')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 715274ab..0a691c8a 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -55,7 +55,7 @@ class Server_Add_Controller extends Admin_Controller {
         }
         if (!is_dir($file)) {
           $ext = strtolower(pathinfo($file, PATHINFO_EXTENSION));
-          if (!in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4"))) {
+          if (!in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4", "m4v"))) {
             continue;
           }
         }
@@ -162,7 +162,7 @@ class Server_Add_Controller extends Admin_Controller {
             $queue[] = array($child, $entry_id);
           } else {
             $ext = strtolower(pathinfo($child, PATHINFO_EXTENSION));
-            if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4")) &&
+            if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4", "m4v")) &&
                 filesize($child) > 0) {
               $child_entry = ORM::factory("server_add_file");
               $child_entry->task_id = $task->id;
@@ -249,7 +249,7 @@ class Server_Add_Controller extends Admin_Controller {
               $photo->owner_id = $owner_id;
               $photo->save();
               $entry->item_id = $photo->id;
-            } else if (in_array($extension, array("flv", "mp4"))) {
+            } else if (in_array($extension, array("flv", "mp4", "m4v"))) {
               $movie = ORM::factory("item");
               $movie->type = "movie";
               $movie->parent_id = $parent->id;
-- 
cgit v1.2.3


From fe8cb89ac4d4294fcd8c28a0d16b25226b4f2e25 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 10 Jul 2010 14:03:46 -0700
Subject: Cast the status message to a string so that it gets sent down as a
 string in the json blob. Fixes ticket #1198.

---
 modules/server_add/controllers/server_add.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/server_add')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 0a691c8a..62c01143 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -93,7 +93,7 @@ class Server_Add_Controller extends Admin_Controller {
 
     print json_encode(
       array("result" => "started",
-            "status" => $task->status,
+            "status" => (string)$task->status,
             "url" => url::site("server_add/run/$task->id?csrf=" . access::csrf_token())));
   }
 
@@ -112,7 +112,7 @@ class Server_Add_Controller extends Admin_Controller {
     // Prevent the JavaScript code from breaking by forcing a period as
     // decimal separator for all locales with sprintf("%F", $value).
     print json_encode(array("done" => (bool)$task->done,
-                            "status" => $task->status,
+                            "status" => (string)$task->status,
                             "percent_complete" => sprintf("%F", $task->percent_complete)));
   }
 
-- 
cgit v1.2.3