From dbf3199e46d8a9c0ae37108f6afda35232ef4cdd Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 6 Jul 2010 14:12:00 -0700
Subject: Fix for ticket #1181. Use $.getJSON to retrieve the json contents of
 the dialog. Convert all the controllers that create the data to go into a
 dialog to return the html as part of a json object.

---
 modules/organize/controllers/organize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/organize')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 135a6fc9..ebd40c8d 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -47,7 +47,7 @@ class Organize_Controller extends Controller {
     $v->controller_uri = url::site("organize") . "/";
     $v->swf_uri = url::file("modules/organize/lib/Gallery3WebClient.swf?") .
       filemtime(MODPATH . "organize/lib/Gallery3WebClient.swf");
-    print $v;
+    print json_encode(array("form" => (string) $v));
   }
 
   function add_album_fields() {
-- 
cgit v1.2.3


From 39962eaddc17f27eb1baa694ac588138439621d4 Mon Sep 17 00:00:00 2001
From: Romain LE DISEZ <romain.git@ledisez.net>
Date: Sun, 4 Jul 2010 21:53:57 +0200
Subject: Accept extension .m4v as video/mp4

---
 modules/gallery/controllers/file_proxy.php     | 4 ++--
 modules/gallery/controllers/flash_uploader.php | 4 ++--
 modules/gallery/models/item.php                | 2 +-
 modules/gallery/views/form_uploadify.html.php  | 2 +-
 modules/organize/controllers/organize.php      | 2 +-
 modules/server_add/controllers/server_add.php  | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 32690fc0..bead9f3f 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -72,10 +72,10 @@ class File_Proxy_Controller extends Controller {
       // necessary, it's easily resurrected.
 
       // If we're looking for a .jpg then it's it's possible that we're requesting the thumbnail
-      // for a movie.  In that case, the .flv or .mp4 file would have been converted to a .jpg.
+      // for a movie.  In that case, the .flv, .mp4 or .m4v file would have been converted to a .jpg.
       // So try some alternate types:
       if (preg_match('/.jpg$/', $path)) {
-        foreach (array("flv", "mp4") as $ext) {
+        foreach (array("flv", "mp4", "m4v") as $ext) {
           $movie_path = preg_replace('/.jpg$/', ".$ext", $encoded_path);
           $item = ORM::factory("item")->where("relative_path_cache", "=", $movie_path)->find();
           if ($item->loaded()) {
diff --git a/modules/gallery/controllers/flash_uploader.php b/modules/gallery/controllers/flash_uploader.php
index f7da5124..bc8b964f 100644
--- a/modules/gallery/controllers/flash_uploader.php
+++ b/modules/gallery/controllers/flash_uploader.php
@@ -50,7 +50,7 @@ class Flash_Uploader_Controller extends Controller {
     // Uploadify adds its own field to the form, so validate that separately.
     $file_validation = new Validation($_FILES);
     $file_validation->add_rules(
-      "Filedata", "upload::valid",  "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4]");
+      "Filedata", "upload::valid",  "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4,m4v]");
 
     if ($form->validate() && $file_validation->validate()) {
       $temp_filename = upload::save("Filedata");
@@ -63,7 +63,7 @@ class Flash_Uploader_Controller extends Controller {
 
         $path_info = @pathinfo($temp_filename);
         if (array_key_exists("extension", $path_info) &&
-            in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) {
+            in_array(strtolower($path_info["extension"]), array("flv", "mp4", "m4v"))) {
           $item->type = "movie";
           $item->save();
           log::success("content", t("Added a movie"),
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 4d05e4da..eb200fa5 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -364,7 +364,7 @@ class Item_Model extends ORM_MPTT {
               $this->name .= "." . $pi["extension"];
             }
 
-            $this->mime_type = strtolower($pi["extension"]) == "mp4" ? "video/mp4" : "video/x-flv";
+            $this->mime_type = in_array(strtolower($pi["extension"]), array("mp4", "m4v")) ? "video/mp4" : "video/x-flv";
           }
         }
 
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 588fa16d..6b8ed09c 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -9,7 +9,7 @@
       uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
       script: "<?= url::site("flash_uploader/add_photo/{$album->id}") ?>",
       scriptData: <?= json_encode($script_data) ?>,
-      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
+      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.m4v;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4;*.M4V",
       fileDesc: <?= t("Photos and movies")->for_js() ?>,
       cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
       simUploadLimit: <?= $simultaneous_upload_limit ?>,
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 135a6fc9..557b3d67 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -34,7 +34,7 @@ class Organize_Controller extends Controller {
     $file_filter = json_encode(
       array("photo" => array("label" => "Images",
                              "types" => array("*.jpg", "*.jpeg", "*.png", "*.gif")),
-            "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4"))));
+            "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4", "*.m4v"))));
 
     $v = new View("organize_dialog.html");
     $v->album = $album;
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 715274ab..0a691c8a 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -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;
           }
         }
@@ -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;
-- 
cgit v1.2.3


From bd969a6ffa85488c170be23392fba2792bd00da3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 16 Jul 2010 07:37:24 -0700
Subject: Fix for ticket #1202. Set the minimum flash version 10.0.0 and
 display a message and a button to download the latest version if the minimum
 versiion is not installed.

---
 modules/organize/views/organize_dialog.html.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index c41e5960..40cebfcf 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -2,7 +2,7 @@
 <script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
 <style type="text/css" media="screen">
   #flashContent {
-    display:none;
+  //display:none;
   }
 
   .g-organize {
@@ -102,7 +102,7 @@
     For version detection, set to min. required Flash Player version, or 0 (or 0.0.0),
     for no version detection.
   */
-  var swfVersionStr = "0.0.0";
+  var swfVersionStr = "10.0.0";
   /* To use express install, set to playerProductInstall.swf, otherwise the empty string.*/
   var xiSwfUrlStr = "";
   var flashvars = {};
@@ -127,5 +127,14 @@
     <!-- The following spans are placeholders so we can load the hover and active styles for the flex component -->
     <span id="g-organize-hover" /><span id="g-organize-active" />
   <h1 style="display:none"><?= t("Organize :: %name", array("name" => html::purify($album->title))) ?></h1>
-    <div id="flashContent">&nbsp;</div>
+    <div id="flashContent">
+      <p>
+      <?= t("To view the organize dialog ensure that Adobe Flash Player version 10.0.0 or greater is installed.") ?>
+      </p>
+      <script type="text/javascript">
+	var pageHost = ((document.location.protocol == "https:") ? "https://" :	"http://");
+        $("#flashContent").append("<a href='http://www.adobe.com/go/getflashplayer'><img src='"	+ pageHost +
+                                  "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='<?= t("Get Adobe Flash player") ?>' /></a>" );
+     </script>
+</div>
 </div>
-- 
cgit v1.2.3


From 96bcc8146cc64151551e4c7499829c1ede9b62cd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 20 Jul 2010 07:03:43 -0700
Subject: Style and text cleanup.  Parameterize the minimum flash value so that
 we can use it in the internationalized string.  Fix capitalization.

---
 modules/organize/views/organize_dialog.html.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 40cebfcf..df388a16 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -98,12 +98,12 @@
       controllerUri: "<?= $controller_uri ?>"
     };
   };
-  /*
-    For version detection, set to min. required Flash Player version, or 0 (or 0.0.0),
-    for no version detection.
-  */
-  var swfVersionStr = "10.0.0";
-  /* To use express install, set to playerProductInstall.swf, otherwise the empty string.*/
+
+  // For version detection, set to minimum required Flash Player version, or 0 (or 0.0.0),
+  // for no version detection.
+  var swfVersionStr = "<?= $flash_minimum_version = "10.0.0" ?>";
+
+  // To use express install, set to playerProductInstall.swf, otherwise the empty string.
   var xiSwfUrlStr = "";
   var flashvars = {};
 
@@ -129,12 +129,14 @@
   <h1 style="display:none"><?= t("Organize :: %name", array("name" => html::purify($album->title))) ?></h1>
     <div id="flashContent">
       <p>
-      <?= t("To view the organize dialog ensure that Adobe Flash Player version 10.0.0 or greater is installed.") ?>
+        <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version " .
+              "or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?>
       </p>
       <script type="text/javascript">
 	var pageHost = ((document.location.protocol == "https:") ? "https://" :	"http://");
         $("#flashContent").append("<a href='http://www.adobe.com/go/getflashplayer'><img src='"	+ pageHost +
-                                  "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='<?= t("Get Adobe Flash player") ?>' /></a>" );
+                                  "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' " +
+                                  alt='<?= t("Get Adobe Flash Player") ?>' /></a>" );
      </script>
 </div>
 </div>
-- 
cgit v1.2.3


From 423fca2d5ffca1e953694793ad118589db1756d0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Jul 2010 05:54:50 -0700
Subject: Combine all the flex runtime libraries into a single downloadable
 file. Fixes ticket #1241.

---
 modules/organize/lib/Gallery3WebClient.swf | Bin 147776 -> 760853 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 modules/organize/lib/Gallery3WebClient.swf

(limited to 'modules/organize')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
old mode 100644
new mode 100755
index 40249a73..e6b70922
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From f699d2b38593311089d1636bf41bf91c1bd467f8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Jul 2010 05:56:59 -0700
Subject: Fix missing quoate in the organize dialog html template.

---
 modules/organize/views/organize_dialog.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/organize')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index df388a16..4e8ada80 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -136,7 +136,7 @@
 	var pageHost = ((document.location.protocol == "https:") ? "https://" :	"http://");
         $("#flashContent").append("<a href='http://www.adobe.com/go/getflashplayer'><img src='"	+ pageHost +
                                   "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' " +
-                                  alt='<?= t("Get Adobe Flash Player") ?>' /></a>" );
+                                  "alt='<?= t("Get Adobe Flash Player") ?>' /></a>" );
      </script>
 </div>
 </div>
-- 
cgit v1.2.3


From 84a50e737b54acbe4a8c47b6038c45cd709c2e7c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 27 Jul 2010 11:18:55 -0700
Subject: Fix the "get flashplayer" button.  It was throwing a JS error before.
 Not sure why it was done in JS in the first place.  Fixes ticket #1256.

---
 modules/organize/views/organize_dialog.html.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 4e8ada80..4cc6385e 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -127,16 +127,14 @@
     <!-- The following spans are placeholders so we can load the hover and active styles for the flex component -->
     <span id="g-organize-hover" /><span id="g-organize-active" />
   <h1 style="display:none"><?= t("Organize :: %name", array("name" => html::purify($album->title))) ?></h1>
-    <div id="flashContent">
-      <p>
-        <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version " .
-              "or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?>
-      </p>
-      <script type="text/javascript">
-	var pageHost = ((document.location.protocol == "https:") ? "https://" :	"http://");
-        $("#flashContent").append("<a href='http://www.adobe.com/go/getflashplayer'><img src='"	+ pageHost +
-                                  "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' " +
-                                  "alt='<?= t("Get Adobe Flash Player") ?>' /></a>" );
-     </script>
-</div>
+  <div id="flashContent">
+    <p>
+      <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version " .
+            "or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?>
+    </p>
+    <a href="http://www.adobe.com/go/getflashplayer">
+      <img src="<?= request::protocol() ?>://www.adobe.com/images/shared/download_buttons/get_flash_player.gif"
+           alt=<?= t("Get Adobe Flash Player")->for_js() ?> />
+    </a>
+  </div>
 </div>
-- 
cgit v1.2.3


From 185a736ff916b420a6f29f44a545cde05593bbc0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 27 Jul 2010 11:27:46 -0700
Subject: Revert "Combine all the flex runtime libraries into a single
 downloadable file. Fixes ticket #1241." This breaks organize on Chrome 5
 (Linux) and Chrome 6 (OSX).  See ticket #1241.

This reverts commit 423fca2d5ffca1e953694793ad118589db1756d0.
---
 modules/organize/lib/Gallery3WebClient.swf | Bin 760853 -> 147776 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 modules/organize/lib/Gallery3WebClient.swf

(limited to 'modules/organize')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
old mode 100755
new mode 100644
index e6b70922..40249a73
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From 91a2c04a24c320df37ea980f11245eb4e086879e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 21 Jul 2010 21:30:13 -0700
Subject: More patches as part of #1225.  Change the 'core' modules to use the
 json::reply method to set the content type header and encode the response as
 a json object

---
 .../comment/controllers/admin_manage_comments.php  |  8 ++++----
 modules/comment/controllers/comments.php           |  9 ++++-----
 modules/exif/controllers/exif.php                  |  2 +-
 modules/gallery/controllers/admin.php              |  2 +-
 .../controllers/admin_advanced_settings.php        |  4 ++--
 modules/gallery/controllers/admin_languages.php    |  2 +-
 modules/gallery/controllers/admin_maintenance.php  | 10 +++++-----
 modules/gallery/controllers/admin_modules.php      |  2 +-
 modules/gallery/controllers/admin_sidebar.php      |  2 +-
 modules/gallery/controllers/albums.php             | 14 +++++++-------
 modules/gallery/controllers/l10n_client.php        |  2 +-
 modules/gallery/controllers/login.php              |  7 +++----
 modules/gallery/controllers/move.php               |  6 ++----
 modules/gallery/controllers/movies.php             |  8 ++++----
 modules/gallery/controllers/permissions.php        |  2 +-
 modules/gallery/controllers/photos.php             |  8 ++++----
 modules/gallery/controllers/quick.php              | 14 +++++++-------
 modules/gallery/controllers/reauthenticate.php     |  4 ++--
 modules/gallery/controllers/uploader.php           |  4 ++--
 modules/gallery/controllers/user_profile.php       |  6 +++---
 modules/organize/controllers/organize.php          | 10 +++++-----
 modules/rest/helpers/rest.php                      |  3 +--
 modules/server_add/controllers/server_add.php      |  6 +++---
 modules/tag/controllers/admin_tags.php             | 13 +++++--------
 modules/tag/controllers/tags.php                   |  6 ++----
 modules/user/controllers/password.php              |  8 +++-----
 modules/watermark/controllers/admin_watermarks.php | 22 +++++++++-------------
 27 files changed, 84 insertions(+), 100 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/comment/controllers/admin_manage_comments.php b/modules/comment/controllers/admin_manage_comments.php
index bc1c9e64..e451791f 100644
--- a/modules/comment/controllers/admin_manage_comments.php
+++ b/modules/comment/controllers/admin_manage_comments.php
@@ -34,10 +34,10 @@ class Admin_Manage_Comments_Controller extends Admin_Controller {
 
   public function menu_labels() {
     $menu = $this->_menu($this->_counts());
-    print json_encode(array((string) $menu->get("unpublished")->label,
-                            (string) $menu->get("published")->label,
-                            (string) $menu->get("spam")->label,
-                            (string) $menu->get("deleted")->label));
+    json::reply(array((string) $menu->get("unpublished")->label,
+		      (string) $menu->get("published")->label,
+		      (string) $menu->get("spam")->label,
+		      (string) $menu->get("deleted")->label));
   }
 
   public function queue($state) {
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index c42ad24e..8826469d 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -56,13 +56,12 @@ class Comments_Controller extends Controller {
       $view = new Theme_View("comment.html", "other", "comment-fragment");
       $view->comment = $comment;
 
-      print json_encode(
-        array("result" => "success",
-              "view" => (string) $view,
-              "form" => (string) comment::get_add_form($item)));
+      json::reply(array("result" => "success",
+			"view" => (string) $view,
+			"form" => (string) comment::get_add_form($item)));
     } else {
       $form = comment::prefill_add_form($form);
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
diff --git a/modules/exif/controllers/exif.php b/modules/exif/controllers/exif.php
index fe5b2ff4..51e33081 100644
--- a/modules/exif/controllers/exif.php
+++ b/modules/exif/controllers/exif.php
@@ -28,6 +28,6 @@ class Exif_Controller extends Controller {
     $view = new View("exif_dialog.html");
     $view->details = exif::get($item);
 
-    print json_encode(array("form" => (string) $view));
+    json::reply(array("form" => (string) $view));
   }
 }
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index eacacb28..7ea15d3d 100644
--- a/modules/gallery/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
@@ -78,7 +78,7 @@ class Admin_Controller extends Controller {
       $result->location = url::abs_site("");
     }
 
-    print json_encode($result);
+    json::reply($result);
   }
 
   private static function _prompt_for_reauth($controller_name, $args) {
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 2bbbdf50..086f7603 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -39,7 +39,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     $group->input("var_name")->label(t("Setting"))->value($var_name)->disabled(1);
     $group->textarea("value")->label(t("Value"))->value($value);
     $group->submit("")->value(t("Save"));
-    print json_encode(array("form" => (string) $form));
+    json::reply(array("form" => (string) $form));
   }
 
   public function save($module_name, $var_name) {
@@ -50,6 +50,6 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
       t("Saved value for %var (%module_name)",
         array("var" => $var_name, "module_name" => $module_name)));
 
-    print json_encode(array("result" => "success"));
+    json::reply(array("result" => "success"));
   }
 }
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 2e993816..573ededf 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -51,7 +51,7 @@ class Admin_Languages_Controller extends Admin_Controller {
     }
     module::set_var("gallery", "default_locale", $new_default_locale);
 
-    print json_encode(array("result" => "success"));
+    json::reply(array("result" => "success"));
   }
 
   public function share() {
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 489f5d54..5d06d224 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -64,7 +64,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     log::info("tasks", t("Task %task_name started (task id %task_id)",
                          array("task_name" => $task->name, "task_id" => $task->id)),
               html::anchor("admin/maintenance", t("maintenance")));
-    print json_encode(array("form" => (string) $view));
+    json::reply(array("form" => (string) $view));
   }
 
   /**
@@ -86,7 +86,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     log::info("tasks", t("Task %task_name resumed (task id %task_id)",
                          array("task_name" => $task->name, "task_id" => $task->id)),
               html::anchor("admin/maintenance", t("maintenance")));
-    print json_encode(array("form" => (string) $view));
+    json::reply(array("form" => (string) $view));
   }
 
   /**
@@ -103,7 +103,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     $view = new View("admin_maintenance_show_log.html");
     $view->task = $task;
 
-    print json_encode(array("form" => (string) $view));
+    json::reply(array("form" => (string) $view));
   }
 
   /**
@@ -211,7 +211,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
         break;
       }
       // Using sprintf("%F") to avoid comma as decimal separator.
-      print json_encode(array("result" => "success",
+      json::reply(array("result" => "success",
                               "task" => array(
                                 "percent_complete" => sprintf("%F", $task->percent_complete),
                                 "status" => (string) $task->status,
@@ -219,7 +219,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
                               "location" => url::site("admin/maintenance")));
 
     } else {
-      print json_encode(array("result" => "in_progress",
+      json::reply(array("result" => "in_progress",
                               "task" => array(
                                 "percent_complete" => sprintf("%F", $task->percent_complete),
                                 "status" => (string) $task->status,
diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index bf638a37..f5af9a5a 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -57,7 +57,7 @@ class Admin_Modules_Controller extends Admin_Controller {
       $result["dialog"] = (string)$v;
       $result["allow_continue"] = empty($messages["error"]);
     }
-    print json_encode($result);
+    json::reply($result);
   }
 
   public function save() {
diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
index fb857e4e..2e49097a 100644
--- a/modules/gallery/controllers/admin_sidebar.php
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -50,7 +50,7 @@ class Admin_Sidebar_Controller extends Admin_Controller {
     $result["active"] = $v->render();
     $message = t("Updated sidebar blocks");
     $result["message"] = (string) $message;
-    print json_encode($result);
+    json::reply($result);
   }
 
   private function _get_blocks() {
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 8aed1341..584e4f15 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -113,9 +113,9 @@ class Albums_Controller extends Items_Controller {
       message::success(t("Created album %album_title",
                          array("album_title" => html::purify($album->title))));
 
-      print json_encode(array("result" => "success", "location" => $album->url()));
+      json::reply(array("result" => "success", "location" => $album->url()));
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
@@ -153,13 +153,13 @@ class Albums_Controller extends Items_Controller {
 
       if ($form->from_id->value == $album->id) {
         // Use the new url; it might have changed.
-        print json_encode(array("result" => "success", "location" => $album->url()));
+        json::reply(array("result" => "success", "location" => $album->url()));
       } else {
         // Stay on the same page
-        print json_encode(array("result" => "success"));
+        json::reply(array("result" => "success"));
       }
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
@@ -168,7 +168,7 @@ class Albums_Controller extends Items_Controller {
     access::required("view", $album);
     access::required("add", $album);
 
-    print json_encode(array("form" => (string) album::get_add_form($album)));
+    json::reply(array("form" => (string) album::get_add_form($album)));
   }
 
   public function form_edit($album_id) {
@@ -176,6 +176,6 @@ class Albums_Controller extends Items_Controller {
     access::required("view", $album);
     access::required("edit", $album);
 
-    print json_encode(array("form" => (string) album::get_edit_form($album)));
+    json::reply(array("form" => (string) album::get_edit_form($album)));
   }
 }
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index d5b322ef..6833a9ae 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -91,7 +91,7 @@ class L10n_Client_Controller extends Controller {
 
     Gallery_I18n::clear_cache($locale);
 
-    print json_encode(new stdClass());
+    json::reply(new stdClass());
   }
 
   public function toggle_l10n_mode() {
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index b823504b..3454a245 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -22,7 +22,7 @@ class Login_Controller extends Controller {
   public function ajax() {
     $view = new View("login_ajax.html");
     $view->form = auth::get_login_form("login/auth_ajax");
-    print json_encode(array("form" => (string) $view));
+    json::reply(array("form" => (string) $view));
   }
 
   public function auth_ajax() {
@@ -30,10 +30,9 @@ class Login_Controller extends Controller {
 
     list ($valid, $form) = $this->_auth("login/auth_ajax");
     if ($valid) {
-      print json_encode(
-        array("result" => "success"));
+      json::reply(array("result" => "success"));
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index a99ef341..c47cdd95 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -26,7 +26,7 @@ class Move_Controller extends Controller {
     $view = new View("move_browse.html");
     $view->source = $source;
     $view->tree = $this->_get_tree_html($source, ORM::factory("item", 1));
-    print json_encode(array("form" => (string) $view));
+    json::reply(array("form" => (string) $view));
   }
 
   public function save($source_id) {
@@ -41,9 +41,7 @@ class Move_Controller extends Controller {
 
     item::move($source, $target);
 
-    print json_encode(
-      array("result" => "success",
-            "location" => $target->url()));
+    json::reply(array("result" => "success", "location" => $target->url()));
   }
 
   public function show_sub_tree($source_id, $target_id) {
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index c18dbcde..fe6669e6 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -87,13 +87,13 @@ class Movies_Controller extends Items_Controller {
 
       if ($form->from_id->value == $movie->id) {
         // Use the new url; it might have changed.
-        print json_encode(array("result" => "success", "location" => $movie->url()));
+        json::reply(array("result" => "success", "location" => $movie->url()));
       } else {
         // Stay on the same page
-        print json_encode(array("result" => "success"));
+        json::reply(array("result" => "success"));
       }
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
@@ -102,6 +102,6 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $movie);
     access::required("edit", $movie);
 
-    print json_encode(array("form" => (string) movie::get_edit_form($movie)));
+    json::reply(array("form" => (string) movie::get_edit_form($movie)));
   }
 }
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 8fdda7b2..57f5ccb6 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -33,7 +33,7 @@ class Permissions_Controller extends Controller {
     $view->parents = $item->parents();
     $view->form = $this->_get_form($item);
 
-    print json_encode(array("form" => (string) $view));
+    json::reply(array("form" => (string) $view));
   }
 
   function form($id) {
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 9f17cebb..7c834e64 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -87,13 +87,13 @@ class Photos_Controller extends Items_Controller {
 
       if ($form->from_id->value == $photo->id) {
         // Use the new url; it might have changed.
-        print json_encode(array("result" => "success", "location" => $photo->url()));
+        json::reply(array("result" => "success", "location" => $photo->url()));
       } else {
         // Stay on the same page
-        print json_encode(array("result" => "success"));
+        json::reply(array("result" => "success"));
       }
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
@@ -102,6 +102,6 @@ class Photos_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    print json_encode(array("form" => (string) photo::get_edit_form($photo)));
+    json::reply(array("form" => (string) photo::get_edit_form($photo)));
   }
 }
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 253a279b..1d9194c7 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -58,12 +58,12 @@ class Quick_Controller extends Controller {
     }
 
     if (Input::instance()->get("page_type") == "collection") {
-      print json_encode(
+      json::reply(
         array("src" => $item->thumb_url(),
               "width" => $item->thumb_width,
               "height" => $item->thumb_height));
     } else {
-      print json_encode(
+      json::reply(
         array("src" => $item->resize_url(),
               "width" => $item->resize_width,
               "height" => $item->resize_height));
@@ -83,7 +83,7 @@ class Quick_Controller extends Controller {
     item::make_album_cover($item);
     message::success($msg);
 
-    print json_encode(array("result" => "success", "reload" => 1));
+    json::reply(array("result" => "success", "reload" => 1));
   }
 
   public function form_delete($id) {
@@ -94,7 +94,7 @@ class Quick_Controller extends Controller {
     $v = new View("quick_delete_confirm.html");
     $v->item = $item;
     $v->form = item::get_delete_form($item);
-    print json_encode(array("form" => (string) $v));
+    json::reply(array("form" => (string) $v));
   }
 
   public function delete($id) {
@@ -125,9 +125,9 @@ class Quick_Controller extends Controller {
     $from_id = Input::instance()->get("from_id");
     if (Input::instance()->get("page_type") == "collection" &&
         $from_id != $id /* deleted the item we were viewing */) {
-      print json_encode(array("result" => "success", "reload" => 1));
+      json::reply(array("result" => "success", "reload" => 1));
     } else {
-      print json_encode(array("result" => "success",
+      json::reply(array("result" => "success",
                               "location" => $parent->url()));
     }
   }
@@ -154,6 +154,6 @@ class Quick_Controller extends Controller {
     // Pass on the source item where this form was generated, so we have an idea where to return to.
     $form->hidden("from_id")->value((int)Input::instance()->get("from_id", 0));
 
-    print json_encode(array("form" => (string) $form));
+    json::reply(array("form" => (string) $form));
   }
 }
diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index 3cff2b6a..2b1f6d14 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -23,7 +23,7 @@ class Reauthenticate_Controller extends Controller {
       access::forbidden();
     }
     if (request::is_ajax()) {
-      print json_encode(array("form" => (string) self::_form()));
+      json::reply(array("form" => (string) self::_form()));
     } else {
       self::_show_form(self::_form());
     }
@@ -51,7 +51,7 @@ class Reauthenticate_Controller extends Controller {
       if (empty($reauthenticate["in_dialog"])) {
         self::_show_form($form);
       } else {
-        print json_encode(array("form" => (string) $form));
+        json::reply(array("form" => (string) $form));
       }
     }
   }
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 38e22cee..c686c787 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -26,7 +26,7 @@ class Uploader_Controller extends Controller {
       $item = $item->parent();
     }
 
-    print json_encode(array("form" => (string)$this->_get_add_form($item)));
+    json::reply(array("form" => (string)$this->_get_add_form($item)));
     //print $this->_get_add_form($item);
   }
 
@@ -106,7 +106,7 @@ class Uploader_Controller extends Controller {
     access::verify_csrf();
 
     batch::stop();
-    print json_encode(array("result" => "success"));
+    json::reply(array("result" => "success"));
   }
 
   private function _get_add_form($album)  {
diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
index 431918ff..113be1fa 100644
--- a/modules/gallery/controllers/user_profile.php
+++ b/modules/gallery/controllers/user_profile.php
@@ -44,7 +44,7 @@ class User_Profile_Controller extends Controller {
 
   public function contact($id) {
     $user = identity::lookup_user($id);
-    print json_encode(array("form" => (string) user_profile::get_contact_form($user)));
+    json::reply(array("form" => (string) user_profile::get_contact_form($user)));
   }
 
   public function send($id) {
@@ -61,9 +61,9 @@ class User_Profile_Controller extends Controller {
         ->message(html::purify($form->message->message->value))
         ->send();
       message::success(t("Sent message to %user_name", array("user_name" => $user->display_name())));
-      print json_encode(array("result" => "success"));
+      json::reply(array("result" => "success"));
     } else {
-      print json_encode(array("result" => "error", "form" => (string)$form));
+      json::reply(array("result" => "error", "form" => (string)$form));
     }
   }
 }
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 0e647e09..99933c7e 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -47,14 +47,14 @@ class Organize_Controller extends Controller {
     $v->controller_uri = url::site("organize") . "/";
     $v->swf_uri = url::file("modules/organize/lib/Gallery3WebClient.swf?") .
       filemtime(MODPATH . "organize/lib/Gallery3WebClient.swf");
-    print json_encode(array("form" => (string) $v));
+    json::reply(array("form" => (string) $v));
   }
 
   function add_album_fields() {
-    print json_encode(array("title" => (string)t("Title"),
-                            "description" => (string)t("Description"),
-                            "name" => (string)t("Directory name"),
-                            "slug" => (string)t("Internet Address")));
+    json::reply(array("title" => (string)t("Title"),
+                      "description" => (string)t("Description"),
+                      "name" => (string)t("Directory name"),
+                      "slug" => (string)t("Internet Address")));
   }
 
 }
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index bcb12d58..644779da 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -35,8 +35,7 @@ class rest_Core {
       }
       print "<pre>$html</pre>";
     } else {
-      header("Content-type: application/json");
-      print json_encode($data);
+      json::reply($data);
     }
   }
 
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index e91d9dd9..afa1f862 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -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)));
   }
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index c2da7bc3..32c54945 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -37,7 +37,7 @@ class Admin_Tags_Controller extends Admin_Controller {
   public function form_delete($id) {
     $tag = ORM::factory("tag", $id);
     if ($tag->loaded()) {
-      print json_encode(array("form" => (string) tag::get_delete_form($tag)));
+      json::reply(array("form" => (string) tag::get_delete_form($tag)));
     }
   }
 
@@ -57,11 +57,9 @@ class Admin_Tags_Controller extends Admin_Controller {
       message::success(t("Deleted tag %tag_name", array("tag_name" => $name)));
       log::success("tags", t("Deleted tag %tag_name", array("tag_name" => $name)));
 
-      print json_encode(
-        array("result" => "success",
-              "location" => url::site("admin/tags")));
+      json::reply(array("result" => "success", "location" => url::site("admin/tags")));
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
@@ -98,10 +96,9 @@ class Admin_Tags_Controller extends Admin_Controller {
       message::success($message);
       log::success("tags", $message);
 
-      print json_encode(array("result" => "success",
-              "location" => url::site("admin/tags")));
+      json::reply(array("result" => "success", "location" => url::site("admin/tags")));
     } else {
-      print json_encode(array("result" => "error", "form" => $in_place_edit->render()));
+      json::reply(array("result" => "error", "form" => $in_place_edit->render()));
     }
   }
 
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index f3d456d3..7fa8534c 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -67,11 +67,9 @@ class Tags_Controller extends Controller {
         }
       }
 
-      print json_encode(
-        array("result" => "success",
-              "cloud" => (string)tag::cloud(30)));
+      json::reply(array("result" => "success", "cloud" => (string)tag::cloud(30)));
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 522b6b35..4058ef50 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -27,11 +27,10 @@ class Password_Controller extends Controller {
       if ($form->validate()) {
         $this->_send_reset($form);
       } else {
-        print json_encode(array("result" => "error",
-                                "form" => (string) $form));
+        json::reply(array("result" => "error", "form" => (string) $form));
       }
     } else {
-      print $form;
+        json::reply(array("form" => (string) $form));
     }
   }
 
@@ -83,8 +82,7 @@ class Password_Controller extends Controller {
     // Always pretend that an email has been sent to avoid leaking
     // information on what user names are actually real.
     message::success(t("Password reset email sent"));
-    print json_encode(
-      array("result" => "success"));
+    json::reply(array("result" => "success"));
   }
 
   private static function _reset_form() {
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index 8b217b4a..922b050b 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -35,7 +35,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
   }
 
   public function form_edit() {
-    print json_encode(array("form" => (string) watermark::get_edit_form()));
+    json::reply(array("form" => (string) watermark::get_edit_form()));
   }
 
   public function edit() {
@@ -49,16 +49,16 @@ class Admin_Watermarks_Controller extends Admin_Controller {
 
       log::success("watermark", t("Watermark changed"));
       message::success(t("Watermark changed"));
-      print json_encode(
+      json::reply(
         array("result" => "success",
               "location" => url::site("admin/watermarks")));
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
   public function form_delete() {
-    print json_encode(array("form" => (string) watermark::get_delete_form()));
+    json::reply(array("form" => (string) watermark::get_delete_form()));
   }
 
   public function delete() {
@@ -79,16 +79,14 @@ class Admin_Watermarks_Controller extends Admin_Controller {
         log::success("watermark", t("Watermark deleted"));
         message::success(t("Watermark deleted"));
       }
-      print json_encode(
-        array("result" => "success",
-              "location" => url::site("admin/watermarks")));
+      json::reply(array("result" => "success", "location" => url::site("admin/watermarks")));
     } else {
-      print json_encode(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string) $form));
     }
   }
 
   public function form_add() {
-    print json_encode(array("form" => (string) watermark::get_add_form()));
+    json::reply(array("form" => (string) watermark::get_add_form()));
   }
 
   public function add() {
@@ -120,11 +118,9 @@ class Admin_Watermarks_Controller extends Admin_Controller {
 
       message::success(t("Watermark saved"));
       log::success("watermark", t("Watermark saved"));
-      print json_encode(
-        array("result" => "success",
-              "location" => url::site("admin/watermarks")));
+      json::reply(array("result" => "success", "location" => url::site("admin/watermarks")));
     } else {
-      print json_encode(array("result" => "error", "form" => rawurlencode((string) $form)));
+      json::reply(array("result" => "error", "form" => rawurlencode((string) $form)));
     }
   }
 
-- 
cgit v1.2.3


From 7607e1f932dda53144792d0b7e8674a34fbc7f9a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 31 Jul 2010 21:16:17 -0700
Subject: Full pass over all the JSON encoding and JS dialog code.  We now
 abide by the following rules:

1) An initial dialog or panel load can take either HTML or JSON, but
   the mime type must accurately reflect its payload.

2) dialog form submits can handle a pure HTML response, but the mime
   type must also be correct.  This properly resolves the problem
   where the reauth code gets a JSON response first from the reauth
   code, and then an HTML response when you reauth and continue on to
   a given form -- try it out with Admin > Settings > Advanced.

3) All JSON replies must set the mime type correctly.  The json::reply
   convenience function does this for us.

4) By default, any HTML content sent back in the JSON response should be
   in the "html" field, no longer the "form" field.

The combination of these allows us to stop doing boilerplate code like
this in our controllers:

  // Print our view, JSON encoded
  json::reply(array("form" => (string) $view));

instead, controllers can just return HTML, eg:

  // Print our view
  print $view;

That's much more intuitive for developers.
---
 lib/gallery.dialog.js                              | 37 ++++++++++++++++++----
 lib/gallery.panel.js                               |  6 ++--
 modules/comment/controllers/comments.php           |  6 ++--
 modules/exif/controllers/exif.php                  |  2 +-
 .../controllers/admin_advanced_settings.php        |  2 +-
 modules/gallery/controllers/admin_maintenance.php  | 24 +++++++-------
 modules/gallery/controllers/admin_themes.php       |  2 +-
 modules/gallery/controllers/albums.php             |  8 ++---
 modules/gallery/controllers/login.php              |  4 +--
 modules/gallery/controllers/move.php               |  2 +-
 modules/gallery/controllers/movies.php             |  4 +--
 modules/gallery/controllers/permissions.php        |  2 +-
 modules/gallery/controllers/photos.php             |  4 +--
 modules/gallery/controllers/quick.php              |  7 ++--
 modules/gallery/controllers/reauthenticate.php     |  6 ++--
 modules/gallery/controllers/uploader.php           |  3 +-
 modules/gallery/controllers/user_profile.php       |  4 +--
 modules/organize/controllers/organize.php          |  2 +-
 modules/server_add/controllers/server_add.php      |  6 ++--
 modules/tag/controllers/admin_tags.php             |  8 ++---
 modules/tag/controllers/tags.php                   |  2 +-
 modules/user/controllers/admin_users.php           | 28 ++++++++--------
 modules/user/controllers/password.php              |  4 +--
 modules/user/controllers/users.php                 | 14 ++++----
 modules/watermark/controllers/admin_watermarks.php | 15 +++++----
 25 files changed, 114 insertions(+), 88 deletions(-)

(limited to 'modules/organize')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 555e6f47..f1d146ab 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -31,8 +31,8 @@
          url: sHref,
          type: "GET",
          beforeSend: function(xhr) {
-           // Until we convert to jquery 1.4, we need to save the
-           // XMLHttpRequest object
+           // Until we convert to jquery 1.4, we need to save the XMLHttpRequest object so that we
+	   // can detect the mime type of the reply
            this.xhrData = xhr;
          },
          success: function(data, textStatus, xhr) {
@@ -122,17 +122,42 @@
      _ajaxify_dialog: function() {
        var self = this;
        $("#g-dialog form").ajaxForm({
-         dataType: "json",
          beforeSubmit: function(formData, form, options) {
            form.find(":submit")
              .addClass("ui-state-disabled")
              .attr("disabled", "disabled");
            return true;
          },
+         beforeSend: function(xhr) {
+           // Until we convert to jquery 1.4, we need to save the XMLHttpRequest object so that we
+	   // can detect the mime type of the reply
+           this.xhrData = xhr;
+         },
          success: function(data) {
-           if (data.form) {
-             var formData = unescape(data.form);
-	     $("#g-dialog").html(formData);
+           // Pre jquery 1.4, get the saved XMLHttpRequest object
+           xhr = this.xhrData;
+	   if (xhr) {
+	     var mimeType = /^(\w+\/\w+)\;?/.exec(xhr.getResponseHeader("Content-Type"));
+
+	     var content = "";
+	     if (mimeType[1] == "application/json") {
+	       data = JSON.parse(data);
+	     } else {
+	       data = {"html": escape(data)};
+	     }
+	   } else {
+	     // Uploading files (eg: watermark) uses a fake xhr in jquery.form.js so
+	     // all we have is in the data field, which should be some very simple JSON.
+	     // Weirdly enough in Chrome the result gets wrapped in a <pre> element and
+	     // looks like this:
+	     //   <pre style="word-wrap: break-word; white-space: pre-wrap;">{"result":"success",
+	     //   "location":"\/~bharat\/gallery3\/index.php\/admin\/watermarks"}</pre>
+	     // bizarre.  Strip that off before parsing.
+	     data = JSON.parse(data.match("({.*})")[0]);
+	   }
+
+           if (data.html) {
+             $("#g-dialog").html(unescape(data.html));
              $("#g-dialog").dialog("option", "position", "center");
              $("#g-dialog form :submit").removeClass("ui-state-disabled")
                .attr("disabled", null);
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index aee7185d..e0605ca3 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.js
@@ -48,7 +48,7 @@
                var content = "";
                if (mimeType[1] == "application/json") {
                  data = JSON.parse(data);
-                 content = unescape(data.form);
+                 content = unescape(data.html);
                } else {
                  content = data;
                }
@@ -79,8 +79,8 @@
            return true;
          },
          success: function(data) {
-           if (data.form) {
-             $("#g-panel td").html(data.form);
+           if (data.html) {
+             $("#g-panel td").html(data.html);
              self._ajaxify_panel();
            }
            if (data.result == "success") {
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 8826469d..6ec4132b 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -57,11 +57,11 @@ class Comments_Controller extends Controller {
       $view->comment = $comment;
 
       json::reply(array("result" => "success",
-			"view" => (string) $view,
-			"form" => (string) comment::get_add_form($item)));
+			"view" => (string)$view,
+			"form" => (string)comment::get_add_form($item)));
     } else {
       $form = comment::prefill_add_form($form);
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "form" => (string)$form));
     }
   }
 
diff --git a/modules/exif/controllers/exif.php b/modules/exif/controllers/exif.php
index 51e33081..2fe875e3 100644
--- a/modules/exif/controllers/exif.php
+++ b/modules/exif/controllers/exif.php
@@ -28,6 +28,6 @@ class Exif_Controller extends Controller {
     $view = new View("exif_dialog.html");
     $view->details = exif::get($item);
 
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 }
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 086f7603..cf197743 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -39,7 +39,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     $group->input("var_name")->label(t("Setting"))->value($var_name)->disabled(1);
     $group->textarea("value")->label(t("Value"))->value($value);
     $group->submit("")->value(t("Save"));
-    json::reply(array("form" => (string) $form));
+    print $form;
   }
 
   public function save($module_name, $var_name) {
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 5d06d224..3567b4f0 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -64,7 +64,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     log::info("tasks", t("Task %task_name started (task id %task_id)",
                          array("task_name" => $task->name, "task_id" => $task->id)),
               html::anchor("admin/maintenance", t("maintenance")));
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 
   /**
@@ -86,7 +86,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     log::info("tasks", t("Task %task_name resumed (task id %task_id)",
                          array("task_name" => $task->name, "task_id" => $task->id)),
               html::anchor("admin/maintenance", t("maintenance")));
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 
   /**
@@ -103,7 +103,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     $view = new View("admin_maintenance_show_log.html");
     $view->task = $task;
 
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 
   /**
@@ -212,18 +212,18 @@ class Admin_Maintenance_Controller extends Admin_Controller {
       }
       // Using sprintf("%F") to avoid comma as decimal separator.
       json::reply(array("result" => "success",
-                              "task" => array(
-                                "percent_complete" => sprintf("%F", $task->percent_complete),
-                                "status" => (string) $task->status,
-                                "done" => (bool) $task->done),
-                              "location" => url::site("admin/maintenance")));
+                        "task" => array(
+                          "percent_complete" => sprintf("%F", $task->percent_complete),
+                          "status" => (string) $task->status,
+                          "done" => (bool) $task->done),
+                        "location" => url::site("admin/maintenance")));
 
     } else {
       json::reply(array("result" => "in_progress",
-                              "task" => array(
-                                "percent_complete" => sprintf("%F", $task->percent_complete),
-                                "status" => (string) $task->status,
-                                "done" => (bool) $task->done)));
+                        "task" => array(
+                          "percent_complete" => sprintf("%F", $task->percent_complete),
+                          "status" => (string) $task->status,
+                          "done" => (bool) $task->done)));
     }
   }
 }
diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index 18a4d2ae..e59eadaf 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -52,7 +52,7 @@ class Admin_Themes_Controller extends Admin_Controller {
     } else {
       $view->url = item::root()->url("theme=$theme_name");
     }
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 
   public function choose($type, $theme_name) {
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 584e4f15..f3f5dee3 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -115,7 +115,7 @@ class Albums_Controller extends Items_Controller {
 
       json::reply(array("result" => "success", "location" => $album->url()));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      print $form;
     }
   }
 
@@ -159,7 +159,7 @@ class Albums_Controller extends Items_Controller {
         json::reply(array("result" => "success"));
       }
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
@@ -168,7 +168,7 @@ class Albums_Controller extends Items_Controller {
     access::required("view", $album);
     access::required("add", $album);
 
-    json::reply(array("form" => (string) album::get_add_form($album)));
+    print album::get_add_form($album);
   }
 
   public function form_edit($album_id) {
@@ -176,6 +176,6 @@ class Albums_Controller extends Items_Controller {
     access::required("view", $album);
     access::required("edit", $album);
 
-    json::reply(array("form" => (string) album::get_edit_form($album)));
+    print album::get_edit_form($album);
   }
 }
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index d7ab399f..62d33345 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -22,7 +22,7 @@ class Login_Controller extends Controller {
   public function ajax() {
     $view = new View("login_ajax.html");
     $view->form = auth::get_login_form("login/auth_ajax");
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 
   public function auth_ajax() {
@@ -34,7 +34,7 @@ class Login_Controller extends Controller {
     } else {
       $view = new View("login_ajax.html");
       $view->form = $form;
-      json::reply(array("result" => "error", "form" => (string) $view));
+      json::reply(array("result" => "error", "html" => (string)$view));
     }
   }
 
diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index c47cdd95..7b2d6165 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -26,7 +26,7 @@ class Move_Controller extends Controller {
     $view = new View("move_browse.html");
     $view->source = $source;
     $view->tree = $this->_get_tree_html($source, ORM::factory("item", 1));
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 
   public function save($source_id) {
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index fe6669e6..02d2a497 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -93,7 +93,7 @@ class Movies_Controller extends Items_Controller {
         json::reply(array("result" => "success"));
       }
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string) $form));
     }
   }
 
@@ -102,6 +102,6 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $movie);
     access::required("edit", $movie);
 
-    json::reply(array("form" => (string) movie::get_edit_form($movie)));
+    print movie::get_edit_form($movie);
   }
 }
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 57f5ccb6..fc06cb44 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -33,7 +33,7 @@ class Permissions_Controller extends Controller {
     $view->parents = $item->parents();
     $view->form = $this->_get_form($item);
 
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 
   function form($id) {
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 7c834e64..8377e6c7 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -93,7 +93,7 @@ class Photos_Controller extends Items_Controller {
         json::reply(array("result" => "success"));
       }
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
@@ -102,6 +102,6 @@ class Photos_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    json::reply(array("form" => (string) photo::get_edit_form($photo)));
+    print photo::get_edit_form($photo);
   }
 }
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 1d9194c7..fee601d9 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -94,7 +94,7 @@ class Quick_Controller extends Controller {
     $v = new View("quick_delete_confirm.html");
     $v->item = $item;
     $v->form = item::get_delete_form($item);
-    json::reply(array("form" => (string) $v));
+    print $v;
   }
 
   public function delete($id) {
@@ -127,8 +127,7 @@ class Quick_Controller extends Controller {
         $from_id != $id /* deleted the item we were viewing */) {
       json::reply(array("result" => "success", "reload" => 1));
     } else {
-      json::reply(array("result" => "success",
-                              "location" => $parent->url()));
+      json::reply(array("result" => "success", "location" => $parent->url()));
     }
   }
 
@@ -154,6 +153,6 @@ class Quick_Controller extends Controller {
     // Pass on the source item where this form was generated, so we have an idea where to return to.
     $form->hidden("from_id")->value((int)Input::instance()->get("from_id", 0));
 
-    json::reply(array("form" => (string) $form));
+    print $form;
   }
 }
diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index 7f9e5edc..0486c0fe 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Reauthenticate_Controller extends Controller {
-  public function index($share_translations_form=null) {
+  public function index() {
     if (!identity::active_user()->admin) {
       access::forbidden();
     }
@@ -29,7 +29,7 @@ class Reauthenticate_Controller extends Controller {
       $v = new View("reauthenticate.html");
       $v->form = self::_form();
       $v->user_name = identity::active_user()->name;
-      json::reply(array("form" => (string) $v));
+      print $v;
     } else {
       self::_show_form(self::_form());
     }
@@ -58,7 +58,7 @@ class Reauthenticate_Controller extends Controller {
         $v = new View("reauthenticate.html");
         $v->form = $form;
         $v->user_name = identity::active_user()->name;
-        json::reply(array("form" => (string) $v));
+        json::reply(array("html" => (string)$v));
       } else {
         self::_show_form($form);
       }
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index c686c787..87520032 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -26,8 +26,7 @@ class Uploader_Controller extends Controller {
       $item = $item->parent();
     }
 
-    json::reply(array("form" => (string)$this->_get_add_form($item)));
-    //print $this->_get_add_form($item);
+    print $this->_get_add_form($item);
   }
 
   public function start() {
diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
index 113be1fa..726d3e51 100644
--- a/modules/gallery/controllers/user_profile.php
+++ b/modules/gallery/controllers/user_profile.php
@@ -44,7 +44,7 @@ class User_Profile_Controller extends Controller {
 
   public function contact($id) {
     $user = identity::lookup_user($id);
-    json::reply(array("form" => (string) user_profile::get_contact_form($user)));
+    print user_profile::get_contact_form($user);
   }
 
   public function send($id) {
@@ -63,7 +63,7 @@ class User_Profile_Controller extends Controller {
       message::success(t("Sent message to %user_name", array("user_name" => $user->display_name())));
       json::reply(array("result" => "success"));
     } else {
-      json::reply(array("result" => "error", "form" => (string)$form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 }
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 99933c7e..3005eb67 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -47,7 +47,7 @@ class Organize_Controller extends Controller {
     $v->controller_uri = url::site("organize") . "/";
     $v->swf_uri = url::file("modules/organize/lib/Gallery3WebClient.swf?") .
       filemtime(MODPATH . "organize/lib/Gallery3WebClient.swf");
-    json::reply(array("form" => (string) $v));
+    print $v;
   }
 
   function add_album_fields() {
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index afa1f862..e4c3e69c 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -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();
-    json::reply(array("form" => (string) $view));
+    print $view;
   }
 
   public function children() {
@@ -112,8 +112,8 @@ 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).
     json::reply(array("done" => (bool)$task->done,
-                            "status" => (string)$task->status,
-                            "percent_complete" => sprintf("%F", $task->percent_complete)));
+                      "status" => (string)$task->status,
+                      "percent_complete" => sprintf("%F", $task->percent_complete)));
   }
 
   /**
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 32c54945..0c82579b 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -37,7 +37,7 @@ class Admin_Tags_Controller extends Admin_Controller {
   public function form_delete($id) {
     $tag = ORM::factory("tag", $id);
     if ($tag->loaded()) {
-      json::reply(array("form" => (string) tag::get_delete_form($tag)));
+      print tag::get_delete_form($tag);
     }
   }
 
@@ -59,7 +59,7 @@ class Admin_Tags_Controller extends Admin_Controller {
 
       json::reply(array("result" => "success", "location" => url::site("admin/tags")));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      print $form;
     }
   }
 
@@ -91,14 +91,14 @@ class Admin_Tags_Controller extends Admin_Controller {
       $tag->name = $in_place_edit->value();
       $tag->save();
 
-      $message = t("Renamed tag %old_name to %new_name",
+      $message = t("Renamed tag <b>%old_name</b> to <b>%new_name</b>",
                    array("old_name" => $old_name, "new_name" => $tag->name));
       message::success($message);
       log::success("tags", $message);
 
       json::reply(array("result" => "success", "location" => url::site("admin/tags")));
     } else {
-      json::reply(array("result" => "error", "form" => $in_place_edit->render()));
+      json::reply(array("result" => "error", "form" => (string)$in_place_edit->render()));
     }
   }
 
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 7fa8534c..bc657644 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -69,7 +69,7 @@ class Tags_Controller extends Controller {
 
       json::reply(array("result" => "success", "cloud" => (string)tag::cloud(30)));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 64365f2b..b8487e01 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -56,12 +56,12 @@ class Admin_Users_Controller extends Admin_Controller {
       message::success(t("Created user %user_name", array("user_name" => $user->name)));
       json::reply(array("result" => "success"));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      print json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
   public function add_user_form() {
-    json::reply(array("form" => (string) $this->_get_user_add_form_admin()));
+    print $this->_get_user_add_form_admin();
   }
 
   public function delete_user($id) {
@@ -81,7 +81,7 @@ class Admin_Users_Controller extends Admin_Controller {
       $name = $user->name;
       $user->delete();
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
 
     $message = t("Deleted user %user_name", array("user_name" => $name));
@@ -95,7 +95,7 @@ class Admin_Users_Controller extends Admin_Controller {
     if (empty($user)) {
       throw new Kohana_404_Exception();
     }
-    json::reply(array("form" => (string) $this->_get_user_delete_form_admin($user)));
+    print $this->_get_user_delete_form_admin($user);
   }
 
   public function edit_user($id) {
@@ -136,7 +136,7 @@ class Admin_Users_Controller extends Admin_Controller {
       message::success(t("Changed user %user_name", array("user_name" => $user->name)));
       json::reply(array("result" => "success"));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string) $form));
     }
   }
 
@@ -146,7 +146,7 @@ class Admin_Users_Controller extends Admin_Controller {
       throw new Kohana_404_Exception();
     }
 
-    json::reply(array("form" => (string) $this->_get_user_edit_form_admin($user)));
+    print $this->_get_user_edit_form_admin($user);
   }
 
   public function add_user_to_group($user_id, $group_id) {
@@ -194,12 +194,12 @@ class Admin_Users_Controller extends Admin_Controller {
         t("Created group %group_name", array("group_name" => $group->name)));
       json::reply(array("result" => "success"));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
   public function add_group_form() {
-    json::reply(array("form" => (string) $this->_get_group_add_form_admin()));
+    print $this->_get_group_add_form_admin();
   }
 
   public function delete_group($id) {
@@ -215,7 +215,7 @@ class Admin_Users_Controller extends Admin_Controller {
       $name = $group->name;
       $group->delete();
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string) $form));
     }
 
     $message = t("Deleted group %group_name", array("group_name" => $name));
@@ -230,7 +230,7 @@ class Admin_Users_Controller extends Admin_Controller {
       throw new Kohana_404_Exception();
     }
 
-    json::reply(array("form" => (string) $this->_get_group_delete_form_admin($group)));
+    print $this->_get_group_delete_form_admin($group);
   }
 
   public function edit_group($id) {
@@ -263,7 +263,7 @@ class Admin_Users_Controller extends Admin_Controller {
       $group->reload();
       message::error(
         t("Failed to change group %group_name", array("group_name" => $group->name)));
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string) $form));
     }
   }
 
@@ -273,7 +273,7 @@ class Admin_Users_Controller extends Admin_Controller {
       throw new Kohana_404_Exception();
     }
 
-    json::reply(array("form" => (string) $this->_get_group_edit_form_admin($group)));
+    print $this->_get_group_edit_form_admin($group);
   }
 
   /* User Form Definitions */
@@ -309,7 +309,7 @@ class Admin_Users_Controller extends Admin_Controller {
     }
 
     module::event("user_edit_form_admin", $user, $form);
-    $group->submit("")->value(t("Modify User"));
+    $group->submit("")->value(t("Modify user"));
     return $form;
   }
 
@@ -354,7 +354,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $locales = array_merge(array("" => t("« none »")), $locales);
     $selected_locale = ($user && $user->locale) ? $user->locale : "";
     $form->dropdown("locale")
-      ->label(t("Language Preference"))
+      ->label(t("Language preference"))
       ->options($locales)
       ->selected($selected_locale);
   }
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 4058ef50..575720a8 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -27,10 +27,10 @@ class Password_Controller extends Controller {
       if ($form->validate()) {
         $this->_send_reset($form);
       } else {
-        json::reply(array("result" => "error", "form" => (string) $form));
+        json::reply(array("result" => "error", "html" => (string)$form));
       }
     } else {
-        json::reply(array("form" => (string) $form));
+      print $form;
     }
   }
 
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index e98ab341..d13cccb2 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -57,7 +57,7 @@ class Users_Controller extends Controller {
       json::reply(array("result" => "success",
 			"resource" => url::site("users/{$user->id}")));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
@@ -92,7 +92,7 @@ class Users_Controller extends Controller {
       log::warning("user", t("Failed password change for %name", array("name" => $user->name)));
       $name = $user->name;
       module::event("user_auth_failed", $name);
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
@@ -126,7 +126,7 @@ class Users_Controller extends Controller {
       log::warning("user", t("Failed email change for %name", array("name" => $user->name)));
       $name = $user->name;
       module::event("user_auth_failed", $name);
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
@@ -136,7 +136,7 @@ class Users_Controller extends Controller {
       access::forbidden();
     }
 
-    json::reply(array("form" => (string) $this->_get_edit_form($user)));
+    print $this->_get_edit_form($user);
   }
 
   public function form_change_password($id) {
@@ -145,7 +145,7 @@ class Users_Controller extends Controller {
       access::forbidden();
     }
 
-    json::reply(array("form" => (string) $this->_get_change_password_form($user)));
+    print $this->_get_change_password_form($user);
   }
 
   public function form_change_email($id) {
@@ -154,7 +154,7 @@ class Users_Controller extends Controller {
       access::forbidden();
     }
 
-    json::reply(array("form" => (string) $this->_get_change_email_form($user)));
+    print $this->_get_change_email_form($user);
   }
 
   private function _get_change_password_form($user) {
@@ -231,7 +231,7 @@ class Users_Controller extends Controller {
     $locales = array_merge(array("" => t("« none »")), $locales);
     $selected_locale = ($user && $user->locale) ? $user->locale : "";
     $form->dropdown("locale")
-      ->label(t("Language Preference"))
+      ->label(t("Language preference"))
       ->options($locales)
       ->selected($selected_locale);
   }
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index 922b050b..0652b13c 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -35,7 +35,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
   }
 
   public function form_edit() {
-    json::reply(array("form" => (string) watermark::get_edit_form()));
+    print watermark::get_edit_form();
   }
 
   public function edit() {
@@ -53,12 +53,12 @@ class Admin_Watermarks_Controller extends Admin_Controller {
         array("result" => "success",
               "location" => url::site("admin/watermarks")));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
   public function form_delete() {
-    json::reply(array("form" => (string) watermark::get_delete_form()));
+    print watermark::get_delete_form();
   }
 
   public function delete() {
@@ -81,12 +81,12 @@ class Admin_Watermarks_Controller extends Admin_Controller {
       }
       json::reply(array("result" => "success", "location" => url::site("admin/watermarks")));
     } else {
-      json::reply(array("result" => "error", "form" => (string) $form));
+      json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
 
   public function form_add() {
-    json::reply(array("form" => (string) watermark::get_add_form()));
+    print watermark::get_add_form();
   }
 
   public function add() {
@@ -120,7 +120,10 @@ class Admin_Watermarks_Controller extends Admin_Controller {
       log::success("watermark", t("Watermark saved"));
       json::reply(array("result" => "success", "location" => url::site("admin/watermarks")));
     } else {
-      json::reply(array("result" => "error", "form" => rawurlencode((string) $form)));
+      // rawurlencode the results because the JS code that uploads the file buffers it in an
+      // iframe which entitizes the HTML and makes it difficult for the JS to process.  If we url
+      // encode it now, it passes through cleanly.  See ticket #797.
+      json::reply(array("result" => "error", "html" => rawurlencode((string)$form)));
     }
   }
 
-- 
cgit v1.2.3