From 9538b3888dadbe3a6fac72e2a97f97c7db3d86f2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 7 Jul 2010 08:58:38 -0700
Subject: Fix for ticket #1176. Have the gallery.dialog code add a g-in-dialog
 parameter to the url to let the controller know its in a dialog.  The
 reauthenticate controller will format the password prompt as a page or a form
 content.  If authentication is successful, then the original controller is
 called instead of being redirected to.

---
 modules/gallery/controllers/reauthenticate.php | 45 ++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/controllers/reauthenticate.php')

diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index acb27f6a..fb1b13bc 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -22,7 +22,12 @@ class Reauthenticate_Controller extends Controller {
     if (!identity::active_user()->admin) {
       access::forbidden();
     }
-    return self::_show_form(self::_form());
+    $reauthenticate = Session::instance()->get("reauthenticate", array());
+    if (empty($reauthenticate["in_dialog"])) {
+      self::_show_form(self::_form());
+    } else {
+      print json_encode(array("form" => (string) self::_form()));
+    }
   }
 
   public function auth() {
@@ -31,18 +36,30 @@ class Reauthenticate_Controller extends Controller {
     }
     access::verify_csrf();
 
+    $reauthenticate = Session::instance()->get("reauthenticate", array());
+    Kohana_Log::add("error", Kohana::debug($reauthenticate));
+
     $form = self::_form();
     $valid = $form->validate();
     $user = identity::active_user();
     if ($valid) {
       message::success(t("Successfully re-authenticated!"));
       module::event("user_auth", $user);
-      url::redirect($form->continue_url->value);
+      Session::instance()->delete("reauthenticate");
+      if (empty($reauthenticate["in_dialog"])) {
+        url::redirect($reauthenticate["continue_url"]);
+      } else {
+        self::_call_admin_function($reauthenticate);
+      }
     } else {
       $name = $user->name;
       log::warning("user", t("Failed re-authentication for %name", array("name" => $name)));
       module::event("user_auth_failed", $name);
-      return self::_show_form($form);
+      if (empty($reauthenticate["in_dialog"])) {
+        self::_show_form($form);
+      } else {
+        print json_encode(array("form" => (string) $form));
+      }
     }
   }
 
@@ -52,6 +69,7 @@ class Reauthenticate_Controller extends Controller {
     $view->content = new View("reauthenticate.html");
     $view->content->form = $form;
     $view->content->user_name = identity::active_user()->name;
+
     print $view;
   }
 
@@ -70,4 +88,25 @@ class Reauthenticate_Controller extends Controller {
     $group->submit("")->value(t("Submit"));
     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);
+  }
 }
-- 
cgit v1.2.3


From 72f801df7d507599e201a6cb47d4a0304e00f5de Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 8 Jul 2010 08:23:08 -0700
Subject: Only add the 'Successfully re-authenticated' message to the status if
 the admin page is not displayed in a dialog.

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

(limited to 'modules/gallery/controllers/reauthenticate.php')

diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index fb1b13bc..ef8855c5 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -43,10 +43,10 @@ class Reauthenticate_Controller extends Controller {
     $valid = $form->validate();
     $user = identity::active_user();
     if ($valid) {
-      message::success(t("Successfully re-authenticated!"));
       module::event("user_auth", $user);
       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);
-- 
cgit v1.2.3


From 213807a8073138a98b8daf9fe265e981454aaa50 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 9 Jul 2010 14:59:23 -0700
Subject: remove debugging statement

---
 modules/gallery/controllers/reauthenticate.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/gallery/controllers/reauthenticate.php')

diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index ef8855c5..d35259e5 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -37,7 +37,6 @@ class Reauthenticate_Controller extends Controller {
     access::verify_csrf();
 
     $reauthenticate = Session::instance()->get("reauthenticate", array());
-    Kohana_Log::add("error", Kohana::debug($reauthenticate));
 
     $form = self::_form();
     $valid = $form->validate();
-- 
cgit v1.2.3