public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Convert the gwtorganize module to the new json::reply helper.

Browse Source
This commit is contained in:
Tim Almdal 2010-07-26 10:55:20 -07:00
parent 95757edaa1
commit 43c53845db
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gwtorganise/controllers/admin_upload_configure.php
View File

@ -33,13 +33,15 @@ class Admin_Upload_Configure_Controller extends Controller
upload_configuration::extractForm($form); upload_configuration::extractForm($form);
message::success(t("GWTOrganise Module Configured!")); message::success(t("GWTOrganise Module Configured!"));
print json_encode(array("result" => "success")); json::reply(array("result" => "success"));
return; return;
} }
else else
{ {
print json_encode(array("result" => "error", "form" => (string) $form)); json::reply
s(array("result" => "error", "form" => (string) $form));
return; return;
} }
} }
else else

24
modules/gwtorganise/controllers/json_album.php
View File

@ -45,10 +45,10 @@ class Json_Album_Controller extends Controller {
function is_admin() { function is_admin() {
if (identity::active_user()->admin) { if (identity::active_user()->admin) {
print json_encode(array("result" => "success", "csrf" => access::csrf_token())); json::reply(array("result" => "success", "csrf" => access::csrf_token()));
return; return;
} }
print json_encode(array("result" => "failure")); json::reply(array("result" => "failure"));
} }
@ -65,7 +65,7 @@ class Json_Album_Controller extends Controller {
$item = ORM::factory("item", $item_id); $item = ORM::factory("item", $item_id);
access::required("view", $item); access::required("view", $item);
print json_encode(self::child_json_encode($item)); json::reply(self::child_json_encode($item));
} }
@ -93,7 +93,7 @@ class Json_Album_Controller extends Controller {
$i++; $i++;
} }
print json_encode(array("result" => "success")); json::reply(array("result" => "success"));
} }
function rearrange($target_id, $before_or_after) { function rearrange($target_id, $before_or_after) {
@ -146,7 +146,7 @@ class Json_Album_Controller extends Controller {
module::event("album_rearrange", $album); module::event("album_rearrange", $album);
print json_encode(array("result" => "success")); json::reply(array("result" => "success"));
} }
@ -218,7 +218,7 @@ class Json_Album_Controller extends Controller {
} }
unlink($temp_filename); unlink($temp_filename);
print json_encode(self::child_json_encode($item)); json::reply(self::child_json_encode($item));
} }
public function make_album_cover($id) { public function make_album_cover($id) {
@ -231,7 +231,7 @@ class Json_Album_Controller extends Controller {
item::make_album_cover($item); item::make_album_cover($item);
print json_encode(array("result" => "success")); json::reply(array("result" => "success"));
} }
public function p_rotate($item, $dir){ public function p_rotate($item, $dir){
@ -290,7 +290,7 @@ class Json_Album_Controller extends Controller {
message::success($msg); message::success($msg);
} }
print json_encode(array("result" => "success")); json::reply(array("result" => "success"));
} }
@ -310,7 +310,7 @@ class Json_Album_Controller extends Controller {
$i++; $i++;
} }
print json_encode($toreturn); json::reply($toreturn);
} }
@ -322,20 +322,20 @@ class Json_Album_Controller extends Controller {
$item = $this->p_rotate($item, $dir); $item = $this->p_rotate($item, $dir);
print json_encode(self::child_json_encode($item)); json::reply(self::child_json_encode($item));
} }
public function resize_config(){ public function resize_config(){
if (upload_configuration::isResize()) if (upload_configuration::isResize())
{ {
print json_encode(array( json::reply(array(
"resize" => true, "resize" => true,
"max_width" => upload_configuration::getMaxWidth(), "max_width" => upload_configuration::getMaxWidth(),
"max_height" => upload_configuration::getMaxHeight())); "max_height" => upload_configuration::getMaxHeight()));
} }
else else
{ {
print json_encode(array("resize" => false)); json::reply(array("resize" => false));
} }
} }