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

Create a new method in MY_url.php "get_item_from_uri" which loads the item

Browse Source 
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>
This commit is contained in:
Tim Almdal
2009-06-09 21:35:35 +08:00
parent a42c101c0b
commit f0ea6d532c
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/gallery/helpers/MY_url.php
View File

@@ -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;
}
/**

7
modules/user/controllers/logout.php
View File

@@ -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("");
}
}
}
}