diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-06-13 23:17:05 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-06-13 23:17:05 +0000 |
| commit | 3c1611283640c6e8b5d318de944d29dcb4a892af (patch) | |
| tree | dc33bbe0690a82dc91e118b34b1561ef03f72337 | |
| parent | d28e5a0f18f8ea6798bcb4d4f8da3b82f2193750 (diff) | |
| download | forums-3c1611283640c6e8b5d318de944d29dcb4a892af.tar forums-3c1611283640c6e8b5d318de944d29dcb4a892af.tar.gz forums-3c1611283640c6e8b5d318de944d29dcb4a892af.tar.bz2 forums-3c1611283640c6e8b5d318de944d29dcb4a892af.tar.xz forums-3c1611283640c6e8b5d318de944d29dcb4a892af.zip | |
Improved treatment of forward_page param
git-svn-id: file:///svn/phpbb/trunk@490 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/login.php | 86 |
1 files changed, 59 insertions, 27 deletions
diff --git a/phpBB/login.php b/phpBB/login.php index ef6487e601..2adf2d4f00 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -6,7 +6,11 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * +<<<<<<< login.php * $Id$ +======= + * $Id$ +>>>>>>> 1.21 * * ***************************************************************************/ @@ -57,15 +61,16 @@ if(isset($HTTP_POST_VARS['submit']) || isset($HTTP_GET_VARS['submit'])) $autologin = (isset($HTTP_POST_VARS['autologin'])) ? TRUE : FALSE; $session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, TRUE, $autologin); + if($session_id) { if(!empty($HTTP_POST_VARS['forward_page'])) { - header(append_sid("Location: ".$HTTP_POST_VARS['forward_page'])); + header("Location: " . append_sid($HTTP_POST_VARS['forward_page'])); } else { - header(append_sid("Location: index.$phpEx")); + header("Location: " . append_sid("index.$phpEx")); } } else @@ -91,11 +96,11 @@ if(isset($HTTP_POST_VARS['submit']) || isset($HTTP_GET_VARS['submit'])) } if(!empty($HTTP_POST_VARS['forward_page'])) { - header(append_sid("Location: ".$HTTP_POST_VARS['forward_page'])); + header("Location: " . append_sid($HTTP_POST_VARS['forward_page'])); } else { - header(append_sid("Location: index.$phpEx")); + header("Location: " . append_sid("index.$phpEx")); } } else @@ -106,43 +111,70 @@ if(isset($HTTP_POST_VARS['submit']) || isset($HTTP_GET_VARS['submit'])) } else { - header(append_sid("Location: index.$phpEx")); + header("Location: " . append_sid("index.$phpEx")); } } } else { // - // Do a full login page dohickey + // Do a full login page dohickey if + // user not already logged in // - $page_title = "Log In"; - include('includes/page_header.'.$phpEx); - $template->set_filenames( - array( - "body" => "login_body.tpl", - ) - ); - if(isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode'])) + if(!$userdata['session_logged_in']) { - $mode = (isset($HTTP_POST_VARS['mode'])) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; - $forward_page .= "?mode=".$mode; - } + $page_title = "Log In"; + include('includes/page_header.'.$phpEx); + $template->set_filenames(array( + "body" => "login_body.tpl") + ); + + if(isset($HTTP_POST_VARS['forward_page']) || isset($HTTP_GET_VARS['forward_page'])) + { + $forward_to = $HTTP_SERVER_VARS['QUERY_STRING']; + + if(preg_match("/^forward_page=(.*)(&sid=[0-9]*)$|^forward_page=(.*)$/si", $forward_to, $forward_matches)) + { + $forward_to = ($forward_matches[3]) ? $forward_matches[3] : $forward_matches[1]; + + $forward_match = explode("&", $forward_to); + + if(count($forward_match) > 1) + { + $forward_page = $forward_match[0] . "?"; - $username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : ""; + for($i = 1; $i < count($forward_match); $i++) + { + $forward_page .= $forward_match[$i]; + if($i < count($forward_match) - 1) + { + $forward_page .= "&"; + } + } + } + } + } - $template->assign_vars(array( - "L_SEND_PASSWORD" => $lang['Forgotten_password'], + $username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : ""; + + $template->assign_vars(array( + "FORWARD_PAGE" => $forward_page, + "USERNAME" => $username, - "FORWARD_PAGE" => $forward_page, - "USERNAME" => $username, + "L_SEND_PASSWORD" => $lang['Forgotten_password'], - "U_SEND_PASSWORD" => append_sid("sendpassword.".$phpEx) - ) - ); + "U_SEND_PASSWORD" => append_sid("sendpassword.$phpEx") + ) + ); - $template->pparse("body"); + $template->pparse("body"); - include('includes/page_tail.'.$phpEx); + include('includes/page_tail.'.$phpEx); + } + else + { + header("Location: index.$phpEx"); + } } |