Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.55,1.56 privmsg.php,1.90,1.91 profile.php,1.191,1.192 viewtopic.php,1.182,1.183
|
From: Paul S. O. <ps...@us...> - 2002-03-22 23:17:09
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv17145
Modified Files:
groupcp.php privmsg.php profile.php viewtopic.php
Log Message:
More header fixing
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** groupcp.php 19 Mar 2002 21:38:49 -0000 1.55
--- groupcp.php 22 Mar 2002 23:17:03 -0000 1.56
***************
*** 76,80 ****
if( !$userdata['session_logged_in'] )
{
! header('Location: ' . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
--- 76,81 ----
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=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
***************
*** 128,132 ****
if( !$userdata['session_logged_in'] )
{
! header("Location: " . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
--- 129,134 ----
if( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
! header($header_location . ppend_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
***************
*** 232,241 ****
if( $cancel )
{
! header("Location: " . append_sid("groupcp.$phpEx", true));
}
if( !$userdata['session_logged_in'] )
{
! header("Location: " . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
--- 234,245 ----
if( $cancel )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
! header($header_location . ppend_sid("groupcp.$phpEx", true));
}
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=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
***************
*** 321,325 ****
if( !$userdata['session_logged_in'] )
{
! header("Location: " . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
}
--- 325,330 ----
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=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
}
***************
*** 382,386 ****
if( !$userdata['session_logged_in'] )
{
! header("Location: " . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
--- 387,392 ----
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=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
***************
*** 1196,1200 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
}
--- 1202,1206 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql);
}
***************
*** 1202,1207 ****
{
$in_group = array();
! $s_member_groups_opt = "";
! $s_pending_groups_opt = "";
do
--- 1208,1213 ----
{
$in_group = array();
! $s_member_groups_opt = '';
! $s_pending_groups_opt = '';
do
***************
*** 1246,1313 ****
}
}
! $s_group_list = '<select name="' . POST_GROUPS_URL . '">' . $s_group_list_opt . "</select>";
! //
! // Load and process templates
! //
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! $template->set_filenames(array(
! 'user' => 'groupcp_user_body.tpl',
! 'jumpbox' => 'jumpbox.tpl')
! );
! $jumpbox = make_jumpbox();
! $template->assign_vars(array(
! 'L_GO' => $lang['Go'],
! 'L_JUMP_TO' => $lang['Jump_to'],
! 'L_SELECT_FORUM' => $lang['Select_forum'],
!
! 'S_JUMPBOX_LIST' => $jumpbox,
! 'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
! );
! $template->assign_var_from_handle('JUMPBOX', 'jumpbox');
! if ( $s_pending_groups_opt != '' || $s_member_groups_opt != '' )
! {
! $template->assign_block_vars('groups_joined', array() );
! }
! if ( $s_member_groups_opt != '' )
! {
! $template->assign_block_vars('groups_joined.groups_member', array() );
! }
! if ( $s_pending_groups_opt != '' )
! {
! $template->assign_block_vars('groups_joined.groups_pending', array() );
! }
! if ( $s_group_list_opt != '' )
! {
! $template->assign_block_vars('groups_remaining', array() );
! }
! $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! $template->assign_vars(array(
! 'L_GROUP_MEMBERSHIP_DETAILS' => $lang['Group_member_details'],
! 'L_JOIN_A_GROUP' => $lang['Group_member_join'],
! 'L_YOU_BELONG_GROUPS' => $lang['Current_memberships'],
! 'L_SELECT_A_GROUP' => $lang['Non_member_groups'],
! 'L_PENDING_GROUPS' => $lang['Memberships_pending'],
! 'L_SUBSCRIBE' => $lang['Subscribe'],
! 'L_UNSUBSCRIBE' => $lang['Unsubscribe'],
! 'L_VIEW_INFORMATION' => $lang['View_Information'],
!
! 'S_USERGROUP_ACTION' => append_sid("groupcp.$phpEx"),
! 'S_HIDDEN_FIELDS' => $s_hidden_fields,
!
! 'GROUP_LIST_SELECT' => $s_group_list,
! 'GROUP_PENDING_SELECT' => $s_pending_groups,
! 'GROUP_MEMBER_SELECT' => $s_member_groups)
! );
! $template->pparse('user');
}
--- 1252,1326 ----
}
}
! $s_group_list = '<select name="' . POST_GROUPS_URL . '">' . $s_group_list_opt . '</select>';
! if ( $s_group_list_opt != '' || $s_pending_groups_opt != '' || $s_member_groups_opt != '' )
! {
! //
! // Load and process templates
! //
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! $template->set_filenames(array(
! 'user' => 'groupcp_user_body.tpl',
! 'jumpbox' => 'jumpbox.tpl')
! );
! $jumpbox = make_jumpbox();
! $template->assign_vars(array(
! 'L_GO' => $lang['Go'],
! 'L_JUMP_TO' => $lang['Jump_to'],
! 'L_SELECT_FORUM' => $lang['Select_forum'],
!
! 'S_JUMPBOX_LIST' => $jumpbox,
! 'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
! );
! $template->assign_var_from_handle('JUMPBOX', 'jumpbox');
! if ( $s_pending_groups_opt != '' || $s_member_groups_opt != '' )
! {
! $template->assign_block_vars('groups_joined', array() );
! }
! if ( $s_member_groups_opt != '' )
! {
! $template->assign_block_vars('groups_joined.groups_member', array() );
! }
! if ( $s_pending_groups_opt != '' )
! {
! $template->assign_block_vars('groups_joined.groups_pending', array() );
! }
! if ( $s_group_list_opt != '' )
! {
! $template->assign_block_vars('groups_remaining', array() );
! }
! $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! $template->assign_vars(array(
! 'L_GROUP_MEMBERSHIP_DETAILS' => $lang['Group_member_details'],
! 'L_JOIN_A_GROUP' => $lang['Group_member_join'],
! 'L_YOU_BELONG_GROUPS' => $lang['Current_memberships'],
! 'L_SELECT_A_GROUP' => $lang['Non_member_groups'],
! 'L_PENDING_GROUPS' => $lang['Memberships_pending'],
! 'L_SUBSCRIBE' => $lang['Subscribe'],
! 'L_UNSUBSCRIBE' => $lang['Unsubscribe'],
! 'L_VIEW_INFORMATION' => $lang['View_Information'],
!
! 'S_USERGROUP_ACTION' => append_sid("groupcp.$phpEx"),
! 'S_HIDDEN_FIELDS' => $s_hidden_fields,
!
! 'GROUP_LIST_SELECT' => $s_group_list,
! 'GROUP_PENDING_SELECT' => $s_pending_groups,
! 'GROUP_MEMBER_SELECT' => $s_member_groups)
! );
! $template->pparse('user');
! }
! else
! {
! message_die(GENERAL_MESSAGE, $lang['No_groups_exist']);
! }
}
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** privmsg.php 19 Mar 2002 01:53:19 -0000 1.90
--- privmsg.php 22 Mar 2002 23:17:04 -0000 1.91
***************
*** 39,44 ****
// Var definitions
//
! $html_entities_match = array("#&#", "#<#", "#>#");
! $html_entities_replace = array("&", "<", ">");
//
--- 39,44 ----
// Var definitions
//
! $html_entities_match = array('#&#', '#<#', '#>#');
! $html_entities_replace = array('&', '<', '>');
//
***************
*** 62,73 ****
$folder = ( isset($HTTP_POST_VARS['folder']) ) ? $HTTP_POST_VARS['folder'] : $HTTP_GET_VARS['folder'];
! if( $folder != "inbox" && $folder != "outbox" && $folder != "sentbox" && $folder != "savebox" )
{
! $folder = "inbox";
}
}
else
{
! $folder = "inbox";
}
--- 62,73 ----
$folder = ( isset($HTTP_POST_VARS['folder']) ) ? $HTTP_POST_VARS['folder'] : $HTTP_GET_VARS['folder'];
! if( $folder != 'inbox' && $folder != 'outbox' && $folder != 'sentbox' && $folder != 'savebox' )
{
! $folder = 'inbox';
}
}
else
{
! $folder = 'inbox';
}
***************
*** 77,81 ****
if( $cancel )
{
! header("Location: " . append_sid("privmsg.$phpEx?folder=$folder", true));
}
--- 77,81 ----
if( $cancel )
{
! header('Location: ' . append_sid("privmsg.$phpEx?folder=$folder", true));
}
***************
*** 184,188 ****
if( !$userdata['session_logged_in'] )
{
! header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true));
}
--- 184,189 ----
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));
}
***************
*** 257,261 ****
if( !( $privmsg = $db->sql_fetchrow($pm_status) ) )
{
! header("Location: " . append_sid("privmsg.$phpEx?folder=$folder", true));
}
--- 258,263 ----
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));
}
***************
*** 589,593 ****
if(!$userdata['session_logged_in'])
{
! header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
if( isset($mark_list) && !is_array($mark_list) )
--- 591,596 ----
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));
}
if( isset($mark_list) && !is_array($mark_list) )
***************
*** 784,788 ****
if( !$userdata['session_logged_in'] )
{
! header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
--- 787,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));
}
***************
*** 876,880 ****
{
$user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? "&" . POST_USERS_URL . "=" . $HTTP_GET_VARS[POST_USERS_URL] : "";
! header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
}
--- 880,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));
}
***************
*** 1273,1283 ****
message_die(GENERAL_ERROR, "Could not obtain private message for editing.", "", __LINE__, __FILE__, $sql);
}
! if(!$db->sql_numrows($pm_edit_status))
{
! header("Location: " . append_sid("privmsg.$phpEx?folder=$folder", true));
}
- $privmsg = $db->sql_fetchrow($pm_edit_status);
-
$privmsg_subject = $privmsg['privmsgs_subject'];
$privmsg_message = $privmsg['privmsgs_text'];
--- 1278,1287 ----
message_die(GENERAL_ERROR, "Could not obtain private message for editing.", "", __LINE__, __FILE__, $sql);
}
! 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));
}
$privmsg_subject = $privmsg['privmsgs_subject'];
$privmsg_message = $privmsg['privmsgs_text'];
***************
*** 1313,1321 ****
}
! if( !$db->sql_numrows($pm_reply_status) )
{
! header("Location: " . append_sid("privmsg.$phpEx?folder=$folder", true));
}
- $privmsg = $db->sql_fetchrow($pm_reply_status);
$privmsg_subject = ( ( !preg_match("/^Re:/", $privmsg['privmsgs_subject']) ) ? "Re: " : "" ) . $privmsg['privmsgs_subject'];
--- 1317,1325 ----
}
! 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));
}
$privmsg_subject = ( ( !preg_match("/^Re:/", $privmsg['privmsgs_subject']) ) ? "Re: " : "" ) . $privmsg['privmsgs_subject'];
***************
*** 1669,1673 ****
if( !$userdata['session_logged_in'] )
{
! header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
--- 1673,1678 ----
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));
}
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.191
retrieving revision 1.192
diff -C2 -r1.191 -r1.192
*** profile.php 18 Mar 2002 23:53:38 -0000 1.191
--- profile.php 22 Mar 2002 23:17:05 -0000 1.192
***************
*** 84,88 ****
if ( !$userdata['session_logged_in'] && $mode == 'editprofile' )
{
! header("Location: " . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=editprofile", true));
exit;
}
--- 84,89 ----
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;
}
***************
*** 109,113 ****
else
{
! header("Location: " . append_sid("index.$phpEx", true));
exit;
}
--- 110,115 ----
else
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
! header($header_location . append_sid("index.$phpEx", true));
exit;
}
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.182
retrieving revision 1.183
diff -C2 -r1.182 -r1.183
*** viewtopic.php 20 Mar 2002 15:04:21 -0000 1.182
--- viewtopic.php 22 Mar 2002 23:17:06 -0000 1.183
***************
*** 22,26 ****
define('IN_PHPBB', true);
! $phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
--- 22,26 ----
define('IN_PHPBB', true);
! $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc');
[...1399 lines suppressed...]
! 'ICQ_STATUS_IMG' => $icq_status_img,
! 'ICQ_ADD_IMG' => $icq_add_img,
! 'AIM_IMG' => $aim_img,
! 'MSN_IMG' => $msn_img,
! 'YIM_IMG' => $yim_img,
!
! 'EDIT_IMG' => $edit_img,
! 'QUOTE_IMG' => $quote_img,
! 'IP_IMG' => $ip_img,
! 'DELETE_IMG' => $delpost_img,
! 'U_MINI_POST' => $mini_post_url,
! 'U_POST_ID' => $postrow[$i]['post_id'])
);
}
! $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
|
