From 070cbefa461d53031b6fa8a168c3e9c9db539fb0 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Wed, 1 Sep 2004 15:47:46 +0000
Subject: This is a mass commit ... expect trouble! Changes made here are
 primarily to how login is handled, schema changes necessary!

git-svn-id: file:///svn/phpbb/trunk@4970 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/ucp.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'phpBB/ucp.php')

diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 7fc520610e..867f9edc7b 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -289,13 +289,7 @@ switch ($mode)
 			redirect("index.$phpEx$SID");
 		}
 
-		login_box("ucp.$phpEx$SID&amp;mode=login", '', '', true);
-
-		$redirect = request_var('redirect', "index.$phpEx$SID");
-		meta_refresh(3, $redirect);
-
-		$message = $user->lang['LOGIN_REDIRECT'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a> ');
-		trigger_error($message);
+		login_box("index.$phpEx$SID");
 		break;
 
 	case 'logout':
@@ -304,10 +298,9 @@ switch ($mode)
 			$user->destroy();
 		}
 
-		$redirect = (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars($_SERVER['HTTP_REFERER']) : "index.$phpEx$SID";
-		meta_refresh(3, $redirect);
+		meta_refresh(3, "index.$phpEx$SID");
 
-		$message = $user->lang['LOGOUT_REDIRECT'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a> ');
+		$message = $user->lang['LOGOUT_REDIRECT'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . "index.$phpEx$SID" . '">', '</a> ');
 		trigger_error($message);
 		break;
 
@@ -353,7 +346,7 @@ if ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_INAC
 		redirect("index.$phpEx$SID");
 	}
 
-	login_box($user->cur_page, '', $user->lang['LOGIN_EXPLAIN_UCP']);
+	login_box('', $user->lang['LOGIN_EXPLAIN_UCP']);
 }
 
 
-- 
cgit v1.2.1