makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved treatment of forward_page param

Browse source 
git-svn-id: file:///svn/phpbb/trunk@490 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-06-13 23:17:05 +00:00
parent d28e5a0f18
commit 3c16112836
1 changed files with 64 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
phpBB/login.php
View file

@ -6,7 +6,11 @@
* copyright : (C) 2001 The phpBB Group * copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com * email : support@phpbb.com
* *
<<<<<<< login.php
* $Id$ * $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; $autologin = (isset($HTTP_POST_VARS['autologin'])) ? TRUE : FALSE;
$session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, TRUE, $autologin); $session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, TRUE, $autologin);
if($session_id) if($session_id)
{ {
if(!empty($HTTP_POST_VARS['forward_page'])) 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 else
{ {
header(append_sid("Location: index.$phpEx")); header("Location: " . append_sid("index.$phpEx"));
} }
} }
else else
@ -91,11 +96,11 @@ if(isset($HTTP_POST_VARS['submit']) || isset($HTTP_GET_VARS['submit']))
} }
if(!empty($HTTP_POST_VARS['forward_page'])) 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 else
{ {
header(append_sid("Location: index.$phpEx")); header("Location: " . append_sid("index.$phpEx"));
} }
} }
else else
@ -106,43 +111,70 @@ if(isset($HTTP_POST_VARS['submit']) || isset($HTTP_GET_VARS['submit']))
} }
else else
{ {
header(append_sid("Location: index.$phpEx")); header("Location: " . append_sid("index.$phpEx"));
} }
} }
} }
else else
{ {
// //
// Do a full login page dohickey // Do a full login page dohickey if
// user not already logged in
// //
$page_title = "Log In"; if(!$userdata['session_logged_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']))
{ {
$mode = (isset($HTTP_POST_VARS['mode'])) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $page_title = "Log In";
$forward_page .= "?mode=".$mode; 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] . "?";
for($i = 1; $i < count($forward_match); $i++)
{
$forward_page .= $forward_match[$i];
if($i < count($forward_match) - 1)
{
$forward_page .= "&";
}
}
}
}
}
$username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : "";
$template->assign_vars(array(
"FORWARD_PAGE" => $forward_page,
"USERNAME" => $username,
"L_SEND_PASSWORD" => $lang['Forgotten_password'],
"U_SEND_PASSWORD" => append_sid("sendpassword.$phpEx")
)
);
$template->pparse("body");
include('includes/page_tail.'.$phpEx);
}
else
{
header("Location: index.$phpEx");
} }
$username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : "";
$template->assign_vars(array(
"L_SEND_PASSWORD" => $lang['Forgotten_password'],
"FORWARD_PAGE" => $forward_page,
"USERNAME" => $username,
"U_SEND_PASSWORD" => append_sid("sendpassword.".$phpEx)
)
);
$template->pparse("body");
include('includes/page_tail.'.$phpEx);
} }