From f0ea6d532cbbfd5a95e5b992bc62bb7ecb2c1c3b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 9 Jun 2009 21:35:35 +0800
Subject: Create a new method in MY_url.php "get_item_from_uri" which loads the
 item based on the uri.  Then use this helper method in logout.php to insure
 that the guest user has access to the "continue" uri.  If they don't redirect
 to the root album and let it deal with access issues.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/MY_url.php  | 21 ++++++++++++++-------
 modules/user/controllers/logout.php |  7 ++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index c8645c4d..e9a5f860 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -46,7 +46,19 @@ class url extends url_Core {
       return;
     }
 
-    $current_uri = html_entity_decode(Router::$current_uri, ENT_QUOTES);
+    $item = self:: get_item_from_uri(Router::$current_uri);
+    if ($item && $item->loaded) {
+      Router::$controller = "{$item->type}s";
+      Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
+      Router::$method = $item->id;
+    }
+  }
+
+  /**
+   * Return the item that the uri is referencing
+   */
+  static function get_item_from_uri($uri) {
+    $current_uri = html_entity_decode($uri);
     $item = ORM::factory("item")->where("relative_path_cache", $current_uri)->find();
     if (!$item->loaded) {
       // It's possible that the relative path cache for the item we're looking for is out of date,
@@ -61,12 +73,7 @@ class url extends url_Core {
         }
       }
     }
-
-    if ($item && $item->loaded) {
-      Router::$controller = "{$item->type}s";
-      Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
-      Router::$method = $item->id;
-    }
+    return $item;
   }
 
   /**
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 6ceb7192..a541ed9b 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -26,7 +26,12 @@ class Logout_Controller extends Controller {
     log::info("user", t("User %name logged out", array("name" => $user->name)),
               html::anchor("user/$user->id", $user->name));
     if ($this->input->get("continue")) {
-      url::redirect($this->input->get("continue"));
+      $item = url::get_item_from_uri($this->input->get("continue"));
+      if (access::can("view", $item)) {
+        url::redirect($this->input->get("continue"));
+      } else {
+        url::redirect("");
+      }
     }
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3