From 62ad4c0ecb8e29a967ce9f12a4e4407a59656f8f Mon Sep 17 00:00:00 2001 From: Drudex Software Date: Thu, 14 Feb 2013 22:34:43 +0100 Subject: [PATCH] Update ext/user/main.php Site owners can now choose in board config what page users will go to when logging in: - Previous page (default) - My Profile (old default) --- ext/user/main.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ext/user/main.php b/ext/user/main.php index d0ac076f..5aab495c 100644 --- a/ext/user/main.php +++ b/ext/user/main.php @@ -144,7 +144,12 @@ class UserPage extends Extension { } log_info("user", "Logged out"); $page->set_mode("redirect"); - $page->set_redirect(make_link()); + + // Try forwarding to same page on logout unless user comes from registration page + if (isset($_SERVER['HTTP_REFERER']) && !strstr($_SERVER['HTTP_REFERER'], "user_admin/create")) + $page->set_redirect ($_SERVER['HTTP_REFERER']); + else + $page->set_redirect(make_link()); } if(!$user->check_auth_token()) { @@ -330,7 +335,12 @@ class UserPage extends Extension { $this->set_login_cookie($duser->name, $pass); log_info("user", "{$user->class->name} logged in"); $page->set_mode("redirect"); - $page->set_redirect(make_link("user")); + + // Try returning to previous page + if (isset($_SERVER['HTTP_REFERER']) && !strstr($_SERVER['HTTP_REFERER'], "user_admin/create")) + $page->set_redirect ($_SERVER['HTTP_REFERER']); + else + $page->set_redirect(make_link("user")); } else { log_warning("user", "Failed to log in as ".html_escape($name)." [$hash]");