[Phpbb-checkins] CVS: phpBB2 common.php,1.71,1.72 posting.php,1.144,1.145 privmsg.php,1.81,1.82 profile.php,1.179,1.180

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

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

Modified Files:
	common.php posting.php privmsg.php profile.php 
Log Message:
Somewhat overhauled posting, fixed various bugs, completed new way of handling URIs in emails, blah blah

Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** common.php	18 Feb 2002 08:57:28 -0000	1.71
--- common.php	18 Feb 2002 12:34:13 -0000	1.72
***************
*** 173,230 ****
  
  //
- // Set some server variables related to the current URL, mostly used for Email
- //
- if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
- {
- 	$server_protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
- }
- else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
- {
- 	$server_protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
- }
- else
- {
- 	$server_protocol = "http://";
- }
- 
- if ( !empty($board_config['server_name']) )
- {
- 	$server_name = $board_config['server_name'];
- }
- else if ( !empty($board_config['cookie_domain']) )
- {
- 	$server_name = $board_config['cookie_domain'];
- }
- else if( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
- {
- 	$server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
- }
- else if( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
- {
- 	$server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
- }
- else
- {
- 	$server_name = "";
- }
- 
- $server_port = ( !empty($board_config['server_port']) && $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] : '';
- 
- if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
- {
- 	$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
- }
- else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
- {
- 	$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
- }
- else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
- {
- 	$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
- }
- 
- $script_url = $server_protocol . $server_name . $server_port . $script_name;
- 
- //
  // Show 'Board is disabled' message if needed.
  //
--- 173,176 ----
***************
*** 234,236 ****
  }
  
! ?>
--- 180,182 ----
  }
  
! ?>
\ No newline at end of file

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -r1.144 -r1.145
*** posting.php	17 Feb 2002 17:02:03 -0000	1.144
--- posting.php	18 Feb 2002 12:34:15 -0000	1.145
***************
*** 28,309 ****
  include($phpbb_root_path . 'includes/search.'.$phpEx);
  
- // -----------------------
- // Page specific functions
  //
  
! function topic_review($topic_id, $is_inline_review)
  {
! 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
! 	global $userdata, $user_ip;
[...3343 lines suppressed...]
--- 1061,1069 ----
  // Topic review
  //
! if( $mode == 'reply' )
  {
+ 	require($phpbb_root_path . 'includes/topic_review.'.$phpEx);
  	topic_review($topic_id, true);
  
  	$template->assign_block_vars("switch_inline_mode", array());
  	$template->assign_var_from_handle("TOPIC_REVIEW_BOX", "reviewbody");
***************
*** 2552,2554 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 1077,1079 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** privmsg.php	17 Feb 2002 17:02:03 -0000	1.81
--- privmsg.php	18 Feb 2002 12:34:15 -0000	1.82
***************
*** 44,48 ****
  // Parameters
  //
! $submit = ( isset($HTTP_POST_VARS['submit']) ) ? TRUE : 0;
  $submit_search = ( isset($HTTP_POST_VARS['usersubmit']) ) ? TRUE : 0; 
  $submit_msgdays = ( isset($HTTP_POST_VARS['submit_msgdays']) ) ? TRUE : 0;
--- 44,48 ----
  // Parameters
  //
! $submit = ( isset($HTTP_POST_VARS['post']) ) ? TRUE : 0;
  $submit_search = ( isset($HTTP_POST_VARS['usersubmit']) ) ? TRUE : 0; 
  $submit_msgdays = ( isset($HTTP_POST_VARS['submit_msgdays']) ) ? TRUE : 0;
***************
*** 198,202 ****
  			$pm_sql_user = "AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " 
  				AND ( pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " 
! 					OR pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )";
  		}
  		else if($folder == "outbox")
--- 198,203 ----
  			$pm_sql_user = "AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " 
  				AND ( pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " 
! 					OR pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 					OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  		}
  		else if($folder == "outbox")
***************
*** 205,209 ****
  
  			$pm_sql_user = "AND pm.privmsgs_from_userid =  " . $userdata['user_id'] . " 
! 				AND pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL;
  		}
  		else if($folder == "sentbox")
--- 206,211 ----
  
  			$pm_sql_user = "AND pm.privmsgs_from_userid =  " . $userdata['user_id'] . " 
! 				AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
! 					OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) ";
  		}
  		else if($folder == "sentbox")
***************
*** 263,267 ****
  	// a copy in the posters sent box
  	//
! 	if( $privmsg['privmsgs_type'] == PRIVMSGS_NEW_MAIL && $folder == "inbox" )
  	{
  		$sql = "UPDATE " . PRIVMSGS_TABLE . "
--- 265,269 ----
  	// a copy in the posters sent box
  	//
! 	if( ( $privmsg['privmsgs_type'] == PRIVMSGS_NEW_MAIL || $privmsg['privmsgs_type'] == PRIVMSGS_UNREAD_MAIL ) && $folder == "inbox" )
  	{
  		$sql = "UPDATE " . PRIVMSGS_TABLE . "
***************
*** 453,478 ****
  	$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id_from") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
  
! 	if( !empty($privmsg['user_viewemail']) )
  	{
! 		$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $user_id_from) : "mailto:" . $privmsg['user_email'];
  
! 		$email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . "\" border=\"0\" /></a>";
  	}
  	else
  	{
! 		$email_img = "";
  	}
  
! 	$www_img = ( $privmsg['user_website'])  ? "<a href=\"" . $privmsg['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : "";
  
  	if( $privmsg['user_icq'] )
  	{
! 		$icq_status_img = "<a href=\"http://wwp.icq.com/" . $privmsg['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $privmsg['user_icq'] . "&amp;img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
! 		$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $privmsg['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
  	}
  	else
  	{
! 		$icq_status_img = "";
! 		$icq_add_img = "";
  	}
  
--- 455,480 ----
  	$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id_from") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
  
! 	if ( !empty($privmsg['user_viewemail']) )
  	{
! 		$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $user_id_from) : 'mailto:' . $privmsg['user_email'];
  
! 		$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" border="0" /></a>';
  	}
  	else
  	{
! 		$email_img = '';
  	}
  
! 	$www_img = ( $privmsg['user_website'])  ? '<a href="' .$privmsg['user_website'] . '" target="_userwww"><img src="' .$images['icon_www'] . '" alt="' .$lang['Visit_website'] . '" border="0" /></a>' : '';
  
  	if( $privmsg['user_icq'] )
  	{
! 		$icq_status_img = '<a href="http://wwp.icq.com/"' . $privmsg['user_icq'] . '"#pager"><img src="http://web.icq.com/whitepages/online?icq="' . $privmsg['user_icq'] . '"&amp;img=5" width="18" height="18" border="0" /></a>';
! 		$icq_add_img = '<a href="http://wwp.icq.com/scripts/search.dll?to="' . $privmsg['user_icq'] . '"><img src="' .$images['icon_icq'] . '" alt="' .$lang['ICQ'] . '" border="0" /></a>';
  	}
  	else
  	{
! 		$icq_status_img = '';
! 		$icq_add_img = '';
  	}
  
***************
*** 635,643 ****
  				case 'inbox':
  					$delete_type = "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
! 					privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )";
  					break;
  
  				case 'outbox':
! 					$delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL;
  					break;
  
--- 637,645 ----
  				case 'inbox':
  					$delete_type = "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
! 					privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  					break;
  
  				case 'outbox':
! 					$delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  					break;
  
***************
*** 704,707 ****
--- 706,733 ----
  					message_die(GENERAL_ERROR, "Couldn't update users new msg counters", "", __LINE__, __FILE__, $sql);
  				}
+ 
+ 				$sql = "SELECT privmsgs_to_userid 
+ 					FROM " . PRIVMSGS_TABLE . " 
+ 					WHERE privmsgs_id IN ($delete_sql_id) 
+ 						AND privmsgs_from_userid = " . $userdata['user_id'] . " 
+ 						AND privmsgs_type = " . PRIVMSGS_UNREAD_MAIL;
+ 				if ( !($result = $db->sql_query($sql)) )
+ 				{
+ 					message_die(GENERAL_ERROR, "Couldn't obtain user id list for outbox messages", "", __LINE__, __FILE__, $sql);
+ 				}
+ 
+ 				$update_pm_sql = "";
+ 				while( $row = $db->sql_fetchrow($result) )
+ 				{
+ 					$update_pm_sql .= ( ( $update_pm_sql != "" ) ? ", " : "" ) . $row['privmsgs_to_userid'];
+ 				}
+ 
+ 				$sql = "UPDATE " . USERS_TABLE . "  
+ 					SET user_unread_privmsg = user_unread_privmsg - 1 
+ 					WHERE user_id IN ($update_pm_sql)";
+ 				if ( !($result = $db->sql_query($sql)) )
+ 				{
+ 					message_die(GENERAL_ERROR, "Couldn't update users new msg counters", "", __LINE__, __FILE__, $sql);
+ 				}
  			}
  
***************
*** 716,720 ****
  				case 'inbox':
  					$delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
! 						privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )";
  					break;
  
--- 742,746 ----
  				case 'inbox':
  					$delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
! 						privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . "  OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  					break;
  
***************
*** 798,802 ****
  				WHERE privmsgs_to_userid = " . $userdata['user_id'] . " 
  					AND ( privmsgs_type = " . PRIVMSGS_READ_MAIL . " 
! 						OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )";
  			break;
  
--- 824,829 ----
  				WHERE privmsgs_to_userid = " . $userdata['user_id'] . " 
  					AND ( privmsgs_type = " . PRIVMSGS_READ_MAIL . " 
! 						OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 						OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . ")";
  			break;
  
***************
*** 804,808 ****
  			$saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " 
  				WHERE privmsgs_from_userid = " . $userdata['user_id'] . " 
! 					AND privmsgs_type = " . PRIVMSGS_NEW_MAIL;
  			break;
  
--- 831,836 ----
  			$saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " 
  				WHERE privmsgs_from_userid = " . $userdata['user_id'] . " 
! 					AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 						OR privmsgs_type = " . PRIVMSGS_UNERAD_MAIL . " ) ";
  			break;
  
***************
*** 840,855 ****
  	if(!$userdata['session_logged_in'])
  	{
! 		header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode", true));
! 	}
! 
! 	if( $mode == "searchuser" )
! 	{
! 		//
! 		// This 'will' handle a simple user search 
! 		// performed from within the private message post
! 		// form ... for 2.2 now, too late for 2.0 ... if we
! 		// decide to do it all, I'm sooo lazy!
! 		//
! 
  	}
  
--- 868,873 ----
  	if(!$userdata['session_logged_in'])
  	{
! 		$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));
  	}
  
***************
*** 998,1002 ****
  				FROM " . PRIVMSGS_TABLE . " 
  				WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 						OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " ) 
  					AND privmsgs_to_userid = " . $to_userdata['user_id'];
  			if( !$result = $db->sql_query($sql) )
--- 1016,1021 ----
  				FROM " . PRIVMSGS_TABLE . " 
  				WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 						OR privmsgs_type = " . PRIVMSGS_READ_MAIL . "  
! 						OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) 
  					AND privmsgs_to_userid = " . $to_userdata['user_id'];
  			if( !$result = $db->sql_query($sql) )
***************
*** 1015,1019 ****
  					$sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " 
  						WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 								OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " ) 
  							AND privmsgs_date = " . $inbox_info['oldest_post_time'] . " 
  							AND privmsgs_to_userid = " . $to_userdata['user_id'];
--- 1034,1039 ----
  					$sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " 
  						WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 								OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " 
! 								OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . "  ) 
  							AND privmsgs_date = " . $inbox_info['oldest_post_time'] . " 
  							AND privmsgs_to_userid = " . $to_userdata['user_id'];
***************
*** 1085,1088 ****
--- 1105,1114 ----
  					$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
+ 					$script_name = preg_replace("/^\/?(.*?)\/?$/", "\\1", trim($board_config['script_path']));
+ 					$script_name = ( $script_name != '' ) ? $script_name . '/privmsg.'.$phpEx : 'privmsg.'.$phpEx;
+ 					$server_name = trim($board_config['server_name']);
+ 					$server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://";
+ 					$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
+ 
  					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  					$emailer = new emailer($board_config['smtp_delivery']);
***************
*** 1101,1105 ****
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_INBOX" => $script_url . "?folder=inbox")
  					);
  
--- 1127,1131 ----
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_INBOX" => $server_protocol . $server_name . $server_port . $script_name . "?folder=inbox")
  					);
  
***************
*** 1243,1247 ****
  					AND pmt.privmsgs_text_id = pm.privmsgs_id
  					AND pm.privmsgs_from_userid = " . $userdata['user_id'] . "
! 					AND pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
  					AND u.user_id = pm.privmsgs_to_userid";
  			if( !$pm_edit_status = $db->sql_query($sql) )
--- 1269,1274 ----
  					AND pmt.privmsgs_text_id = pm.privmsgs_id
  					AND pm.privmsgs_from_userid = " . $userdata['user_id'] . "
! 					AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
! 						OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) 
  					AND u.user_id = pm.privmsgs_to_userid";
  			if( !$pm_edit_status = $db->sql_query($sql) )
***************
*** 1464,1487 ****
  
  	//
- 	// Generate username search output
- 	//
- 	$result = $db->sql_query($sql_namesearch);
- 	$name_set = $db->sql_fetchrowset($result);
- 
- 	$user_names_select = "";
- 	if($db->sql_numrows($result))
- 	{
- 		for($i = 0; $i < count($name_set); $i++)
- 		{
- 			$name_selected = ($to_username == $name_set[$i]['username']) ? " selected=\"selected\"" : "";
- 			$user_names_select .=  "<option value=\"" . $name_set[$i]['username'] . "\"$name_selected>" . $name_set[$i]['username'] . "</option>\n";
- 		}
- 	}
- 	else
- 	{
- 		$user_names_select .=  "<option value=\"" . ANONYMOUS . "\"$name_selected>" . $lang['No_match'] . "</option>\n";
- 	}
- 
- 	//
  	// Enable extensions in posting_body
  	//
--- 1491,1494 ----
***************
*** 1672,1676 ****
  //
  $sql = "UPDATE " . USERS_TABLE . "
! 	SET user_unread_privmsg = " . ( $userdata['user_new_privmsg'] + $userdata['user_unread_privmsg'] ) . ", user_new_privmsg = 0, user_last_privmsg = " . $userdata['session_start'] . " 
  	WHERE user_id = " . $userdata['user_id'];
  if( !$status = $db->sql_query($sql) )
--- 1679,1683 ----
  //
  $sql = "UPDATE " . USERS_TABLE . "
! 	SET user_unread_privmsg = user_unread_privmsg + user_new_privmsg, user_new_privmsg = 0, user_last_privmsg = " . $userdata['session_start'] . " 
  	WHERE user_id = " . $userdata['user_id'];
  if( !$status = $db->sql_query($sql) )
***************
*** 1679,1682 ****
--- 1686,1698 ----
  }
  
+ $sql = "UPDATE " . PRIVMSGS_TABLE . "
+ 	SET privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " 
+ 	WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
+ 		AND privmsgs_to_userid = " . $userdata['user_id'];
+ if( !$status = $db->sql_query($sql) )
+ {
+ 	message_die(GENERAL_ERROR, "Could not update private message new/read status (2) for user.", "", __LINE__, __FILE__, $sql);
+ }
+ 
  //
  // Reset PM counters
***************
*** 1728,1746 ****
  		$sql_tot .= "WHERE privmsgs_to_userid = " . $userdata['user_id'] . "
  			AND ( privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
! 				OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " )";
  
  		$sql .= "WHERE pm.privmsgs_to_userid = " . $userdata['user_id'] . "
  			AND u.user_id = pm.privmsgs_from_userid
  			AND ( pm.privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
! 				OR pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " )";
  		break;
  
  	case 'outbox':
  		$sql_tot .= "WHERE privmsgs_from_userid = " . $userdata['user_id'] . "
! 			AND privmsgs_type =  " . PRIVMSGS_NEW_MAIL;
  
  		$sql .= "WHERE pm.privmsgs_from_userid = " . $userdata['user_id'] . "
  			AND u.user_id = pm.privmsgs_to_userid
! 			AND pm.privmsgs_type =  " . PRIVMSGS_NEW_MAIL;
  		break;
  
--- 1744,1766 ----
  		$sql_tot .= "WHERE privmsgs_to_userid = " . $userdata['user_id'] . "
  			AND ( privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
! 				OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " 
! 				OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  
  		$sql .= "WHERE pm.privmsgs_to_userid = " . $userdata['user_id'] . "
  			AND u.user_id = pm.privmsgs_from_userid
  			AND ( pm.privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
! 				OR pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " 
! 				OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  		break;
  
  	case 'outbox':
  		$sql_tot .= "WHERE privmsgs_from_userid = " . $userdata['user_id'] . "
! 			AND ( privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
! 				OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  
  		$sql .= "WHERE pm.privmsgs_from_userid = " . $userdata['user_id'] . "
  			AND u.user_id = pm.privmsgs_to_userid
! 			AND pm.privmsgs_type =  " . PRIVMSGS_NEW_MAIL . "
! 				OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  		break;
  
***************
*** 1767,1770 ****
--- 1787,1791 ----
  				AND u.user_id = pm.privmsgs_from_userid ) )";
  		break;
+ 
  	default:
  		message_die(GENERAL_ERROR, "Could not query private message information. No folder specified.", "", __LINE__, __FILE__, $sql);
***************
*** 1972,1976 ****
  
  		$flag = $pm_list[$i]['privmsgs_type'];
! 		$icon_flag = ($flag == PRIVMSGS_NEW_MAIL ) ? "<img src=\"" . $images['pm_unreadmsg'] . "\" alt=\"" . $lang['Unread_message'] . "\" border=\"0\">" : "<img src=\"" . $images['pm_readmsg'] . "\" alt=\"" . $lang['Read_message'] . "\" border=\"0\">";
  
  		$msg_userid = $pm_list[$i]['user_id'];
--- 1993,1997 ----
  
  		$flag = $pm_list[$i]['privmsgs_type'];
! 		$icon_flag = ($flag == PRIVMSGS_NEW_MAIL || $flag == PRIVMSGS_UNREAD_MAIL ) ? "<img src=\"" . $images['pm_unreadmsg'] . "\" alt=\"" . $lang['Unread_message'] . "\" border=\"0\">" : "<img src=\"" . $images['pm_readmsg'] . "\" alt=\"" . $lang['Read_message'] . "\" border=\"0\">";
  
  		$msg_userid = $pm_list[$i]['user_id'];
***************
*** 2036,2038 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 2057,2059 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -r1.179 -r1.180
*** profile.php	17 Feb 2002 17:02:03 -0000	1.179
--- profile.php	18 Feb 2002 12:34:15 -0000	1.180
***************
*** 30,34 ****
  // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_PROFILE, $session_length);
  init_userprefs($userdata);
  //
--- 30,34 ----
  // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_PROFILE);
  init_userprefs($userdata);
  //
***************
*** 36,39 ****
--- 36,50 ----
  //
  
+ //
+ // Set default email variables
+ //
+ $script_name = preg_replace("/^\/?(.*?)\/?$/", "\\1", trim($board_config['script_path']));
+ $script_name = ( $script_name != '' ) ? $script_name . '/profile.'.$phpEx : 'profile.'.$phpEx;
+ $server_name = trim($board_config['server_name']);
+ $server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://";
+ $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
+ 
+ $server_url = $server_protocol . $script_name . $server_name . $server_port;
+ 
  // -----------------------
  // Page specific functions
***************
*** 1066,1070 ****
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
  							);
  							$emailer->send();
--- 1077,1081 ----
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => $server_url . "?mode=activate&act_key=$user_actkey")
  							);
  							$emailer->send();
***************
*** 1164,1168 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey",
  										"FAX_INFO" => $board_config['coppa_fax'],
  										"MAIL_INFO" => $board_config['coppa_mail'],
--- 1175,1180 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => $server_url . "?mode=activate&act_key=$user_actkey",
! 
  										"FAX_INFO" => $board_config['coppa_fax'],
  										"MAIL_INFO" => $board_config['coppa_mail'],
***************
*** 1186,1190 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  	
! 										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
  									);
  								}
--- 1198,1202 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  	
! 										"U_ACTIVATE" => $server_url . "?mode=activate&act_key=$user_actkey")
  									);
  								}
***************
*** 1205,1209 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
  									);
  									$emailer->send();
--- 1217,1221 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => $server_url . "?mode=activate&act_key=$user_actkey")
  									);
  									$emailer->send();
***************
*** 1718,1723 ****
  					"PASSWORD" => $user_password,
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
! 					
! 					"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
  				);
  				$emailer->send();
--- 1730,1735 ----
  					"PASSWORD" => $user_password,
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
! 
! 					"U_ACTIVATE" => $server_url . "?mode=activate&act_key=$user_actkey")
  				);
  				$emailer->send();
***************
*** 1925,1929 ****
  							$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
  							$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
! 							$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\n";
  
  							$emailer->use_template("profile_send_email", $user_lang);
--- 1937,1941 ----
  							$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
  							$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
! 							$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
  
  							$emailer->use_template("profile_send_email", $user_lang);
***************
*** 1946,1950 ****
  							);
  
! 							$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_index'],  "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
  
  							message_die(GENERAL_MESSAGE, $message);
--- 1958,1962 ----
  							);
  
! 							$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_index'],  '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  							message_die(GENERAL_MESSAGE, $message);
***************
*** 1994,1998 ****
  					"USERNAME" => $username,
  
! 					"S_SIGNATURE_CHECKED" => ( $attach_sig ) ? "checked=\"checked\"" : "", 
  					"S_POST_ACTION" => append_sid("profile.$phpEx?&amp;mode=email&amp;" . POST_USERS_URL . "=$user_id"), 
  
--- 2006,2010 ----
  					"USERNAME" => $username,
  
! 					"S_SIGNATURE_CHECKED" => ( $attach_sig ) ? 'checked="checked"' : '', 
  					"S_POST_ACTION" => append_sid("profile.$phpEx?&amp;mode=email&amp;" . POST_USERS_URL . "=$user_id"), 
  
***************
*** 2025,2027 ****
  }
  
! ?>
--- 2037,2039 ----
  }
  
! ?>
\ No newline at end of file