stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-23 00:04:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into talmdal_dev

Browse Source
This commit is contained in:
Tim Almdal
2010-07-11 09:09:52 -07:00
parent 213807a807 0389dceb47
commit 329abfe539
14 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/server_add/controllers/server_add.php
+5 -5
View File
@@ -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;
}
}
@@ -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)));
}
@@ -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;