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

More patches as part of #1225. Change the 'core' modules to use the json::reply

Browse Source 
method to set the content type header and encode the response as a json object
This commit is contained in:
Tim Almdal
2010-07-21 21:30:13 -07:00
committed by Bharat Mediratta
parent 89d18c0714
commit 91a2c04a24
27 changed files with 84 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ class Server_Add_Controller extends Admin_Controller {
$view->tree = new View("server_add_tree.html");
$view->tree->files = $files;
$view->tree->parents = array();
print json_encode(array("form" => (string) $view));
json::reply(array("form" => (string) $view));
}
public function children() {
@@ -91,7 +91,7 @@ class Server_Add_Controller extends Admin_Controller {
->name(t("Add from server"));
$task = task::create($task_def, array("item_id" => $item->id, "queue" => $paths));
print json_encode(
json::reply(
array("result" => "started",
"status" => (string)$task->status,
"url" => url::site("server_add/run/$task->id?csrf=" . access::csrf_token())));
@@ -111,7 +111,7 @@ class Server_Add_Controller extends Admin_Controller {
$task = task::run($task_id);
// 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,
json::reply(array("done" => (bool)$task->done,
"status" => (string)$task->status,
"percent_complete" => sprintf("%F", $task->percent_complete)));
}