diff options
25 files changed, 114 insertions, 88 deletions
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))); } } |