stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-10 17:29:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the fix for #1176 to use request::is_ajax() instead of tacking

Browse Source 
on a query param to urls that appear in dialogs.  This keeps things simpler.
This commit is contained in:
Bharat Mediratta
2010-07-16 11:58:13 -07:00
parent b51b49cb63
commit 583950616e
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/gallery/controllers/reauthenticate.php
View File

@@ -22,11 +22,10 @@ class Reauthenticate_Controller extends Controller {
if (!identity::active_user()->admin) {
access::forbidden();
}
$reauthenticate = Session::instance()->get("reauthenticate", array());
if (empty($reauthenticate["in_dialog"])) {
self::_show_form(self::_form());
} else {
if (request::is_ajax()) {
print json_encode(array("form" => (string) self::_form()));
} else {
self::_show_form(self::_form());
}
}
@@ -36,18 +35,15 @@ class Reauthenticate_Controller extends Controller {
}
access::verify_csrf();
$reauthenticate = Session::instance()->get("reauthenticate", array());
$form = self::_form();
$valid = $form->validate();
$user = identity::active_user();
if ($valid) {
module::event("user_auth", $user);
Session::instance()->delete("reauthenticate");
if (empty($reauthenticate["in_dialog"])) {
if (!request::is_ajax()) {
message::success(t("Successfully re-authenticated!"));
}
url::redirect($reauthenticate["continue_url"]);
url::redirect(Session::instance()->get_once("continue_url"));
} else {
$name = $user->name;
log::warning("user", t("Failed re-authentication for %name", array("name" => $name)));
@@ -72,8 +68,7 @@ class Reauthenticate_Controller extends Controller {
private static function _form() {
$form = new Forge("reauthenticate/auth", "", "post", array("id" => "g-reauthenticate-form"));
$form->set_attr('class', "g-narrow");
$form->hidden("continue_url")->value(Session::instance()->get("continue_url", "admin"));
$form->set_attr("class", "g-narrow");
$group = $form->group("reauthenticate")->label(t("Re-authenticate"));
$group->password("password")->label(t("Password"))->id("g-password")->class(null)
->callback("auth::validate_too_many_failed_auth_attempts")