From 43c53845dbfd5eca79799a5a03d56134dd5cb777 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 26 Jul 2010 10:55:20 -0700
Subject: [PATCH] Convert the gwtorganize module to the new json::reply helper.

---
 .../controllers/admin_upload_configure.php    |  6 +++--
 .../gwtorganise/controllers/json_album.php    | 24 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/modules/gwtorganise/controllers/admin_upload_configure.php b/modules/gwtorganise/controllers/admin_upload_configure.php
index 907290e7..d4a0d04c 100644
--- a/modules/gwtorganise/controllers/admin_upload_configure.php
+++ b/modules/gwtorganise/controllers/admin_upload_configure.php
@@ -33,13 +33,15 @@ class Admin_Upload_Configure_Controller extends Controller
 
         upload_configuration::extractForm($form);
         message::success(t("GWTOrganise Module Configured!"));
-        print json_encode(array("result" => "success"));
+        json::reply(array("result" => "success"));
         return;
       }
       else
       {
-        print json_encode(array("result" => "error", "form" => (string) $form));
+        json::reply
+s(array("result" => "error", "form" => (string) $form));
         return;
+
       }
     }
     else
diff --git a/modules/gwtorganise/controllers/json_album.php b/modules/gwtorganise/controllers/json_album.php
index b92535db..637df65a 100644
--- a/modules/gwtorganise/controllers/json_album.php
+++ b/modules/gwtorganise/controllers/json_album.php
@@ -45,10 +45,10 @@ class Json_Album_Controller extends Controller {
 
   function is_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;
     }
-    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);
     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++;
     }
 
-    print json_encode(array("result" => "success"));
+    json::reply(array("result" => "success"));
   }
 
  function rearrange($target_id, $before_or_after) {
@@ -146,7 +146,7 @@ class Json_Album_Controller extends Controller {
 
     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);
 
-      print json_encode(self::child_json_encode($item));
+      json::reply(self::child_json_encode($item));
   }
 
   public function make_album_cover($id) {
@@ -231,7 +231,7 @@ class Json_Album_Controller extends Controller {
 
     item::make_album_cover($item);
 
-    print json_encode(array("result" => "success"));
+    json::reply(array("result" => "success"));
   }
 
   public function p_rotate($item, $dir){
@@ -290,7 +290,7 @@ class Json_Album_Controller extends Controller {
       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++;
     }
 
-    print json_encode($toreturn);
+    json::reply($toreturn);
   }
 
 
@@ -322,20 +322,20 @@ class Json_Album_Controller extends Controller {
 
     $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(){
     if (upload_configuration::isResize())
     {
-      print json_encode(array(
+      json::reply(array(
         "resize" => true,
         "max_width" => upload_configuration::getMaxWidth(),
         "max_height" => upload_configuration::getMaxHeight()));
     }
     else
     {
-      print json_encode(array("resize" => false));
+      json::reply(array("resize" => false));
     }
   }