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

Fix for ticket #217

Browse Source
This commit is contained in:
Tim Almdal
2009-05-09 06:11:17 +00:00
parent 9dccbe0d36
commit 48ee3d5fe8
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/server_add/controllers/server_add.php
View File

@@ -93,7 +93,7 @@ class Server_Add_Controller extends Controller {
"status" => t("No Eligible files, import cancelled"))));
return;
}
$task_def = Task_Definition::factory()
->callback("server_add_task::add_from_server")
->description(t("Add photos or movies from the local server"))
@@ -152,7 +152,7 @@ class Server_Add_Controller extends Controller {
if (!$task->done) {
message::warning(t("Add from server was cancelled prior to completion"));
}
batch::stop();
print json_encode(array("result" => "success"));
}
@@ -177,12 +177,12 @@ class Server_Add_Controller extends Controller {
$filename = $file->getFilename();
if ($filename[0] != ".") {
if ($file->isDir()) {
$directory_list[$filename] = array("path" => $file->getPathname(), "is_dir" => true);
$directory_list["$filename"] = array("path" => $file->getPathname(), "is_dir" => true);
} else {
$extension = strtolower(substr(strrchr($filename, '.'), 1));
if ($file->isReadable() &&
in_array($extension, array("gif", "jpeg", "jpg", "png", "flv", "mp4"))) {
$file_list[$filename] = array("path" => $file->getPathname(), "is_dir" => false);
$file_list["$filename"] = array("path" => $file->getPathname(), "is_dir" => false);
}
}
}
@@ -190,6 +190,12 @@ class Server_Add_Controller extends Controller {
ksort($directory_list);
ksort($file_list);
return array_merge($directory_list, $file_list);
// We can't use array_merge here because if a file name is numeric, it will
// get renumbered, so lets do it our selves
foreach ($file_list as $file => $fileinfo) {
$directory_list[$file] = $fileinfo;
}
return $directory_list;
}
}