[Phpbb-checkins] CVS: phpBB2 modcp.php,1.71.2.2,1.71.2.3 posting.php,1.159.2.3,1.159.2.4 privmsg.php,1.96.2.4,1.96.2.5

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv9802

Modified Files:
      Tag: phpBB-2_0_0
	modcp.php posting.php privmsg.php 
Log Message:
Yep, more updates and fixes

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.71.2.2
retrieving revision 1.71.2.3
diff -C2 -r1.71.2.2 -r1.71.2.3
*** modcp.php	12 May 2002 00:47:40 -0000	1.71.2.2
--- modcp.php	12 May 2002 15:57:45 -0000	1.71.2.3
***************
*** 70,96 ****
  
  //
- // Check if user did or did not confirm
- // If they did not, forward them to the last page they were on
- //
- if ( isset($HTTP_POST_VARS['cancel']) )
- {
- 	if ( $topic_id )
- 	{
- 		$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
- 	}
- 	else if ( $forum_id )
- 	{
- 		$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
- 	}
- 	else
- 	{
- 		$redirect = "index.$phpEx";
- 	}
- 
- 	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- 	header($header_location . append_sid($redirect, true));
- }
- 
- //
  // Continue var definitions
  //
--- 70,73 ----
***************
*** 176,179 ****
--- 153,179 ----
  // End session management
  //
+ 
+ //
+ // Check if user did or did not confirm
+ // If they did not, forward them to the last page they were on
+ //
+ if ( isset($HTTP_POST_VARS['cancel']) )
+ {
+ 	if ( $topic_id )
+ 	{
+ 		$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
+ 	}
+ 	else if ( $forum_id )
+ 	{
+ 		$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
+ 	}
+ 	else
+ 	{
+ 		$redirect = "index.$phpEx";
+ 	}
+ 
+ 	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
+ 	header($header_location . append_sid($redirect, true));
+ }
  
  //

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.159.2.3
retrieving revision 1.159.2.4
diff -C2 -r1.159.2.3 -r1.159.2.4
*** posting.php	12 May 2002 01:21:57 -0000	1.159.2.3
--- posting.php	12 May 2002 15:57:46 -0000	1.159.2.4
***************
*** 70,73 ****
--- 70,82 ----
  
  //
+ // Start session management
+ //
+ $userdata = session_pagestart($user_ip, PAGE_POSTING);
+ init_userprefs($userdata);
+ //
+ // End session management
+ //
+ 
+ //
  // Was cancel pressed? If so then redirect to the appropriate
  // page, no point in continuing with any further checks
***************
*** 97,112 ****
  
  	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! 	header($header_location . append_sid($redirect) . $post_append, true);
  	exit;
  }
- 
- //
- // Start session management
- //
- $userdata = session_pagestart($user_ip, PAGE_POSTING);
- init_userprefs($userdata);
- //
- // End session management
- //
  
  //
--- 106,112 ----
  
  	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! 	header($header_location . append_sid($redirect, true) . $post_append);
  	exit;
  }
  
  //

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.96.2.4
retrieving revision 1.96.2.5
diff -C2 -r1.96.2.4 -r1.96.2.5
*** privmsg.php	12 May 2002 01:36:08 -0000	1.96.2.4
--- privmsg.php	12 May 2002 15:57:47 -0000	1.96.2.5
***************
*** 408,412 ****
  	$s_hidden_fields = '<input type="hidden" name="mark[]" value="' . $privmsgs_id . '" />';
  
! 	$page_title = $lang['Read_private_message'];
  	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
--- 408,412 ----
  	$s_hidden_fields = '<input type="hidden" name="mark[]" value="' . $privmsgs_id . '" />';
  
! 	$page_title = $lang['Read_pm'];
  	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
***************
*** 441,444 ****
--- 441,445 ----
  		'BOX_NAME' => $l_box_name, 
  
+ 		'L_MESSAGE' => $lang['Message'], 
  		'L_INBOX' => $lang['Inbox'],
  		'L_OUTBOX' => $lang['Outbox'],
***************
*** 1181,1185 ****
  		if ( $mode == 'post' )
  		{
! 			$page_title = $lang['Send_new_privmsg'];
  
  			$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
--- 1182,1186 ----
  		if ( $mode == 'post' )
  		{
! 			$page_title = $lang['Post_new_pm'];
  
  			$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
***************
*** 1188,1192 ****
  		else if ( $mode == 'reply' )
  		{
! 			$page_title = $lang['Reply_privmsg'];
  
  			$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
--- 1189,1193 ----
  		else if ( $mode == 'reply' )
  		{
! 			$page_title = $lang['Post_reply_pm'];
  
  			$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
***************
*** 1195,1199 ****
  		else if ( $mode == 'edit' )
  		{
! 			$page_title = $lang['Edit_privmsg'];
  
  			$sql = "SELECT u.user_id, u.user_sig 
--- 1196,1200 ----
  		else if ( $mode == 'edit' )
  		{
! 			$page_title = $lang['Edit_pm'];
  
  			$sql = "SELECT u.user_id, u.user_sig 
***************
*** 1210,1214 ****
  				if ( $userdata['user_id'] != $postrow['user_id'] )
  				{
! 					message_die(GENERAL_MESSAGE, $lang['Sorry_edit_own_posts']);
  				}
  
--- 1211,1215 ----
  				if ( $userdata['user_id'] != $postrow['user_id'] )
  				{
! 					message_die(GENERAL_MESSAGE, $lang['Edit_own_posts']);
  				}
  
***************
*** 1809,1813 ****
  		break;
  	case 'savebox':
! 		$l_box_name = $lang['Savedbox'];
  		break;
  	case 'sentbox':
--- 1810,1814 ----
  		break;
  	case 'savebox':
! 		$l_box_name = $lang['Savebox'];
  		break;
  	case 'sentbox':