Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 login.php,1.45,1.46 posting.php,1.156,1.157 privmsg.php,1.94,1.95 profile.php,1.192,1.193 viewforum.php,1.134,1.135 viewtopic.php,1.184,1.185
|
From: Jonathan H. <the...@us...> - 2002-03-28 19:52:26
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv1066
Modified Files:
login.php posting.php privmsg.php profile.php viewforum.php
viewtopic.php
Log Message:
Ok all of these damned httpd server that are different are about annoying
Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** login.php 22 Mar 2002 12:22:58 -0000 1.45
--- login.php 28 Mar 2002 19:52:21 -0000 1.46
***************
*** 48,52 ****
// normal Location redirector is used in preference
//
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
--- 48,52 ----
// normal Location redirector is used in preference
//
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -r1.156 -r1.157
*** posting.php 26 Mar 2002 13:13:06 -0000 1.156
--- posting.php 28 Mar 2002 19:52:21 -0000 1.157
***************
*** 335,339 ****
}
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
exit;
--- 335,339 ----
}
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
exit;
***************
*** 1094,1096 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 1094,1096 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** privmsg.php 25 Mar 2002 19:40:57 -0000 1.94
--- privmsg.php 28 Mar 2002 19:52:21 -0000 1.95
***************
*** 184,188 ****
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", 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));
}
--- 184,188 ----
if ( !$userdata['session_logged_in'] )
{
! $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));
}
***************
*** 258,262 ****
if ( !( $privmsg = $db->sql_fetchrow($pm_status) ) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
--- 258,262 ----
if ( !( $privmsg = $db->sql_fetchrow($pm_status) ) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
***************
*** 591,595 ****
if (!$userdata['session_logged_in'])
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
--- 591,595 ----
if (!$userdata['session_logged_in'])
{
! $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));
}
***************
*** 788,792 ****
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
--- 788,792 ----
if ( !$userdata['session_logged_in'] )
{
! $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));
}
***************
*** 881,885 ****
{
$user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? "&" . POST_USERS_URL . "=" . $HTTP_GET_VARS[POST_USERS_URL] : "";
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
}
--- 881,885 ----
{
$user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? "&" . POST_USERS_URL . "=" . $HTTP_GET_VARS[POST_USERS_URL] : "";
! $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));
}
***************
*** 1266,1270 ****
if ( !($privmsg = $db->sql_fetchrow($pm_edit_status)) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
--- 1266,1270 ----
if ( !($privmsg = $db->sql_fetchrow($pm_edit_status)) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
***************
*** 1305,1309 ****
if ( !($privmsg = $db->sql_fetchrow($pm_reply_status)) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
--- 1305,1309 ----
if ( !($privmsg = $db->sql_fetchrow($pm_reply_status)) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
***************
*** 1659,1663 ****
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
--- 1659,1663 ----
if ( !$userdata['session_logged_in'] )
{
! $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));
}
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -r1.192 -r1.193
*** profile.php 22 Mar 2002 23:17:05 -0000 1.192
--- profile.php 28 Mar 2002 19:52:21 -0000 1.193
***************
*** 84,88 ****
if ( !$userdata['session_logged_in'] && $mode == 'editprofile' )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=editprofile", true));
exit;
--- 84,88 ----
if ( !$userdata['session_logged_in'] && $mode == 'editprofile' )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=editprofile", true));
exit;
***************
*** 110,117 ****
else
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("index.$phpEx", true));
exit;
}
! ?>
\ No newline at end of file
--- 110,117 ----
else
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("index.$phpEx", true));
exit;
}
! ?>
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** viewforum.php 22 Mar 2002 22:27:10 -0000 1.134
--- viewforum.php 28 Mar 2002 19:52:21 -0000 1.135
***************
*** 104,108 ****
{
$redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" );
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
}
--- 104,108 ----
{
$redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" );
! $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));
}
***************
*** 673,675 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 673,675 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -r1.184 -r1.185
*** viewtopic.php 23 Mar 2002 22:18:04 -0000 1.184
--- viewtopic.php 28 Mar 2002 19:52:21 -0000 1.185
***************
*** 192,196 ****
$redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id";
$redirect .= ( isset($start) ) ? "&start=$start" : '';
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&$redirect", true));
}
--- 192,196 ----
$redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id";
$redirect .= ( isset($start) ) ? "&start=$start" : '';
! $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));
}
***************
*** 309,313 ****
if ( $HTTP_GET_VARS['unwatch'] == 'topic' )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", 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));
}
--- 309,313 ----
if ( $HTTP_GET_VARS['unwatch'] == 'topic' )
{
! $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));
}
***************
*** 1172,1174 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 1172,1174 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
|
