|
From: Paul S. O. <ps...@us...> - 2002-05-13 13:18:21
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28773
Modified Files:
Tag: phpBB-2_0_0
common.php groupcp.php install.php login.php modcp.php
privmsg.php upgrade.php viewforum.php viewtopic.php
Log Message:
Added exit's after those header location redirects without them
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.74.2.2
retrieving revision 1.74.2.3
diff -C2 -r1.74.2.2 -r1.74.2.3
*** common.php 12 May 2002 17:57:34 -0000 1.74.2.2
--- common.php 13 May 2002 13:18:17 -0000 1.74.2.3
***************
*** 102,117 ****
// URI params
//
! $board_config = Array();
! $userdata = Array();
! $theme = Array();
! $images = Array();
! $lang = Array();
$gen_simple_header = FALSE;
! @include($phpbb_root_path . 'config.'.$phpEx);
if( !defined("PHPBB_INSTALLED") )
{
header("Location: install.$phpEx");
}
--- 102,118 ----
// URI params
//
! $board_config = array();
! $userdata = array();
! $theme = array();
! $images = array();
! $lang = array();
$gen_simple_header = FALSE;
! include($phpbb_root_path . 'config.'.$phpEx);
if( !defined("PHPBB_INSTALLED") )
{
header("Location: install.$phpEx");
+ exit;
}
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.58.2.3
retrieving revision 1.58.2.4
diff -C2 -r1.58.2.3 -r1.58.2.4
*** groupcp.php 6 Apr 2002 02:28:54 -0000 1.58.2.3
--- groupcp.php 13 May 2002 13:18:17 -0000 1.58.2.4
***************
*** 160,163 ****
--- 160,164 ----
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
***************
*** 209,212 ****
--- 210,214 ----
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
***************
*** 310,317 ****
--- 312,321 ----
{
header($header_location . append_sid("groupcp.$phpEx", true));
+ exit;
}
elseif ( !$userdata['session_logged_in'] )
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
***************
*** 397,400 ****
--- 401,405 ----
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
}
***************
*** 458,461 ****
--- 463,467 ----
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -C2 -r1.41 -r1.41.2.1
*** install.php 22 Mar 2002 14:30:05 -0000 1.41
--- install.php 13 May 2002 13:18:17 -0000 1.41.2.1
***************
*** 345,348 ****
--- 345,349 ----
{
header("Location: " . append_sid("index.$phpEx", true));
+ exit;
}
}
Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -C2 -r1.47 -r1.47.2.1
*** login.php 31 Mar 2002 00:06:33 -0000 1.47
--- login.php 13 May 2002 13:18:17 -0000 1.47.2.1
***************
*** 68,71 ****
--- 68,72 ----
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
else
***************
*** 82,89 ****
--- 83,92 ----
{
header($header_location . append_sid($HTTP_POST_VARS['redirect'], true));
+ exit;
}
else
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
}
***************
*** 130,137 ****
--- 133,142 ----
{
header($header_location . append_sid($HTTP_POST_VARS['redirect'], true));
+ exit;
}
else
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
}
***************
*** 141,148 ****
--- 146,155 ----
{
header($header_location . append_sid($HTTP_POST_VARS['redirect'], true));
+ exit;
}
else
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
}
***************
*** 225,228 ****
--- 232,236 ----
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.71.2.3
retrieving revision 1.71.2.4
diff -C2 -r1.71.2.3 -r1.71.2.4
*** modcp.php 12 May 2002 15:57:45 -0000 1.71.2.3
--- modcp.php 13 May 2002 13:18:17 -0000 1.71.2.4
***************
*** 175,178 ****
--- 175,179 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid($redirect, true));
+ exit;
}
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.96.2.5
retrieving revision 1.96.2.6
diff -C2 -r1.96.2.5 -r1.96.2.6
*** privmsg.php 12 May 2002 15:57:47 -0000 1.96.2.5
--- privmsg.php 13 May 2002 13:18:17 -0000 1.96.2.6
***************
*** 185,188 ****
--- 185,189 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true));
+ exit;
}
***************
*** 246,249 ****
--- 247,251 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
+ exit;
}
***************
*** 628,631 ****
--- 630,634 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
+ exit;
}
if ( isset($mark_list) && !is_array($mark_list) )
***************
*** 826,829 ****
--- 829,833 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
+ exit;
}
***************
*** 915,918 ****
--- 919,923 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
+ exit;
}
***************
*** 1264,1267 ****
--- 1269,1273 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
+ exit;
}
***************
*** 1303,1306 ****
--- 1309,1313 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
+ exit;
}
***************
*** 1634,1637 ****
--- 1641,1645 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
+ exit;
}
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C2 -r1.27.2.1 -r1.27.2.2
*** upgrade.php 8 Apr 2002 01:11:06 -0000 1.27.2.1
--- upgrade.php 13 May 2002 13:18:18 -0000 1.27.2.2
***************
*** 38,42 ****
if( defined("PHPBB_INSTALLED") )
{
! header("Location: index.$phpEx");
exit;
}
--- 38,43 ----
if( defined("PHPBB_INSTALLED") )
{
! $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! header($header_location . " index.$phpEx");
exit;
}
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.139.2.2
retrieving revision 1.139.2.3
diff -C2 -r1.139.2.2 -r1.139.2.3
*** viewforum.php 9 May 2002 18:54:49 -0000 1.139.2.2
--- viewforum.php 13 May 2002 13:18:18 -0000 1.139.2.3
***************
*** 106,109 ****
--- 106,110 ----
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
+ exit;
}
//
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.186.2.4
retrieving revision 1.186.2.5
diff -C2 -r1.186.2.4 -r1.186.2.5
*** viewtopic.php 13 May 2002 01:30:59 -0000 1.186.2.4
--- viewtopic.php 13 May 2002 13:18:18 -0000 1.186.2.5
***************
*** 183,186 ****
--- 183,187 ----
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&$redirect", true));
+ exit;
}
***************
*** 300,303 ****
--- 301,305 ----
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true));
+ exit;
}
}
|