stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the code to call the controller directly and just use redirect. Now that all the form calls actually return the form as a json object, calling the form creation controller method i no longer required.

Browse Source
This commit is contained in:
Tim Almdal
2010-07-15 14:57:43 -07:00
parent 155d2b809b
commit 993e041274
1 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/controllers/reauthenticate.php
+1 -24
View File
@@ -46,10 +46,8 @@ class Reauthenticate_Controller extends Controller {
Session::instance()->delete("reauthenticate");
if (empty($reauthenticate["in_dialog"])) {
message::success(t("Successfully re-authenticated!"));
url::redirect($reauthenticate["continue_url"]);
} else {
self::_call_admin_function($reauthenticate);
}
url::redirect($reauthenticate["continue_url"]);
} else {
$name = $user->name;
log::warning("user", t("Failed re-authentication for %name", array("name" => $name)));
@@ -88,27 +86,6 @@ class Reauthenticate_Controller extends Controller {
return $form;
}
private static function _call_admin_function($reauthenticate) {
$controller_name = $reauthenticate["controller"];
$args = $reauthenticate["args"];
if ($controller_name == "index") {
$controller_name = "dashboard";
}
$controller_name = "Admin_{$controller_name}_Controller";
if ($args) {
$method = array_shift($args);
} else {
$method = "index";
}
if (!method_exists($controller_name, $method)) {
throw new Kohana_404_Exception();
}
call_user_func_array(array(new $controller_name, $method), $args);
}
static function valid_password($password_input) {
if (!identity::is_correct_password(identity::active_user(), $password_input->value)) {
$password_input->add_error("invalid_password", 1);