phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com

[Phpbb-checkins] CVS: phpBB2 login.php,1.43,1.44

[Doug K. <dou...@us...>]

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

Modified Files:
	login.php 
Log Message:
Here we have the pleasure of fixing bugs 526891 and 530830.  Both have been tested on my local copy, and they should be ready!


Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** login.php	18 Mar 2002 13:35:42 -0000	1.43
--- login.php	19 Mar 2002 15:39:05 -0000	1.44
***************
*** 98,105 ****
  
  					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?$redirect") . '">')
  					);
  
! 					$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?$redirect") . '">', '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  					message_die(GENERAL_MESSAGE, $message);
--- 98,105 ----
  
  					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
  					);
  
! 					$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  					message_die(GENERAL_MESSAGE, $message);
***************
*** 112,119 ****
  
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?$redirect") . '">')
  			);
  
! 			$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?$redirect") . '">', '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  			message_die(GENERAL_MESSAGE, $message);
--- 112,119 ----
  
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
  			);
  
! 			$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  			message_die(GENERAL_MESSAGE, $message);
***************
*** 228,230 ****
  }
  
! ?>
\ No newline at end of file
--- 228,230 ----
  }
  
! ?>

[Phpbb-checkins] CVS: phpBB2/admin admin_groups.php,1.23,1.24

[Doug K. <dou...@us...>]

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

Modified Files:
	admin_groups.php 
Log Message:
Here we have the pleasure of fixing bugs 526891 and 530830.  Both have been tested on my local copy, and they should be ready!


Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** admin_groups.php	18 Mar 2002 14:54:25 -0000	1.23
--- admin_groups.php	19 Mar 2002 15:39:06 -0000	1.24
***************
*** 344,347 ****
--- 344,355 ----
  	);
  
+ 	//
+ 	// Faking the IF... ELSE statements again...
+ 	//
+ 	if( count($group_list) > 0 )
+ 	{
+ 		$template->assign_block_vars("select_box", array());
+ 	}
+ 
  	$template->pparse('body');
  }
***************
*** 349,351 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 357,359 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.66,1.67

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

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

Modified Files:
	modcp.php 
Log Message:
Fix unecessary ( ) around GROUP BY clause for IP section

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** modcp.php	19 Mar 2002 12:26:52 -0000	1.66
--- modcp.php	19 Mar 2002 13:07:35 -0000	1.67
***************
*** 31,35 ****
  
  define('IN_PHPBB', true);
! $phpbb_root_path = "./";
  include($phpbb_root_path . 'extension.inc');
  include($phpbb_root_path . 'common.'.$phpEx);
--- 31,35 ----
  
  define('IN_PHPBB', true);
! $phpbb_root_path = './';
  include($phpbb_root_path . 'extension.inc');
[...1628 lines suppressed...]
! 			'PAGINATION' => generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id", $forum_topics, $board_config['topics_per_page'], $start),
  
! 			'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $forum_topics / $board_config['topics_per_page'] )), 
  
! 			'L_GOTO_PAGE' => $lang['Goto_page'])
  		);
  
! 		$template->pparse('body');
  
  		break;
***************
*** 1128,1130 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 1085,1087 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 index.php,1.96,1.97

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

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

Modified Files:
	index.php 
Log Message:
Remove HIDDEN_GROUP check in user mod SQL ... no valid there.

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** index.php	18 Mar 2002 13:35:42 -0000	1.96
--- index.php	19 Mar 2002 12:38:12 -0000	1.97
***************
*** 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');
  include($phpbb_root_path . 'common.'.$phpEx);
***************
*** 43,47 ****
  else
  {
! 	$mark_read = "";
  }
  
--- 43,47 ----
  else
  {
! 	$mark_read = '';
  }
  
***************
*** 49,57 ****
  // Handle marking posts
  //
! if( $mark_read == "forums" )
  {
  	if( $userdata['session_logged_in'] )
  	{
! 		setcookie($board_config['cookie_name'] . "_f_all", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
  	}
  
--- 49,57 ----
  // Handle marking posts
  //
! if( $mark_read == 'forums' )
  {
  	if( $userdata['session_logged_in'] )
  	{
! 		setcookie($board_config['cookie_name'] . '_f_all', time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
  	}
  
***************
*** 60,67 ****
  	);
  
! 	$message = $lang['Forums_marked_read'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a> ");
  
  	message_die(GENERAL_MESSAGE, $message);
- 
  }
  //
--- 60,66 ----
  	);
  
! 	$message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a> ');
  
  	message_die(GENERAL_MESSAGE, $message);
  }
  //
***************
*** 69,80 ****
  //
  
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
  
  //
! // If you don't use these stats on your index
! // you may want to consider removing them since
! // it will reduce the number of queries speeding
! // up page generation a little
  //
  $total_posts = get_db_stat('postcount');
--- 68,77 ----
  //
  
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
  
  //
! // If you don't use these stats on your index you may want to consider
! // removing them
  //
  $total_posts = get_db_stat('postcount');
***************
*** 119,123 ****
  if( !($result = $db->sql_query($sql)) )
  {
! 	message_die(GENERAL_ERROR, "Could not query categories list", "", __LINE__, __FILE__, $sql);
  }
  
--- 116,120 ----
  if( !($result = $db->sql_query($sql)) )
  {
! 	message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql);
  }
  
***************
*** 164,170 ****
  			break;
  	}
! 	if( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_ERROR, "Could not query forums information", "", __LINE__, __FILE__, $sql);
  	}
  
--- 161,167 ----
  			break;
  	}
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not query forums information', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 175,179 ****
  	}
  
! 	if( !($total_forums = count($forum_data)) )
  	{
  		message_die(GENERAL_MESSAGE, $lang['No_forums']);
--- 172,176 ----
  	}
  
! 	if ( !($total_forums = count($forum_data)) )
  	{
  		message_die(GENERAL_MESSAGE, $lang['No_forums']);
***************
*** 184,188 ****
  	// posts made since user last visited
  	//
! 	if( $userdata['session_logged_in'] )
  	{
  		$sql = "SELECT t.forum_id, t.topic_id, p.post_time 
--- 181,185 ----
  	// posts made since user last visited
  	//
! 	if ( $userdata['session_logged_in'] )
  	{
  		$sql = "SELECT t.forum_id, t.topic_id, p.post_time 
***************
*** 191,197 ****
  				AND p.post_time > " . $userdata['user_lastvisit'] . " 
  				AND t.topic_moved_id = 0"; 
! 		if( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
  		}
  
--- 188,194 ----
  				AND p.post_time > " . $userdata['user_lastvisit'] . " 
  				AND t.topic_moved_id = 0"; 
! 		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 210,215 ****
  		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
  		WHERE aa.auth_mod = " . TRUE . " 
! 			AND g.group_single_user = 1
! 			AND g.group_type <> " . GROUP_HIDDEN . "
  			AND ug.group_id = aa.group_id 
  			AND g.group_id = aa.group_id 
--- 207,211 ----
  		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
  		WHERE aa.auth_mod = " . TRUE . " 
! 			AND g.group_single_user = 1 
  			AND ug.group_id = aa.group_id 
  			AND g.group_id = aa.group_id 
***************
*** 217,223 ****
  		GROUP BY u.user_id, u.username, aa.forum_id 
  		ORDER BY aa.forum_id, u.user_id";
! 	if(!$result = $db->sql_query($sql))
  	{
! 		message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
  	}
  
--- 213,219 ----
  		GROUP BY u.user_id, u.username, aa.forum_id 
  		ORDER BY aa.forum_id, u.user_id";
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 231,235 ****
  		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
  		WHERE aa.auth_mod = " . TRUE . " 
! 			AND g.group_single_user = 0
  			AND g.group_type <> " . GROUP_HIDDEN . "
  			AND ug.group_id = aa.group_id 
--- 227,231 ----
  		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
  		WHERE aa.auth_mod = " . TRUE . " 
! 			AND g.group_single_user = 0 
  			AND g.group_type <> " . GROUP_HIDDEN . "
  			AND ug.group_id = aa.group_id 
***************
*** 237,243 ****
  		GROUP BY g.group_id, g.group_name, aa.forum_id 
  		ORDER BY aa.forum_id, g.group_id";
! 	if(!$result = $db->sql_query($sql))
  	{
! 		message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
  	}
  
--- 233,239 ----
  		GROUP BY g.group_id, g.group_name, aa.forum_id 
  		ORDER BY aa.forum_id, g.group_id";
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 260,280 ****
  
  	$template->set_filenames(array(
! 		"body" => "index_body.tpl")
  	);
  
  	$template->assign_vars(array(
! 		"TOTAL_POSTS" => sprintf($l_total_post_s, $total_posts),
! 		"TOTAL_USERS" => sprintf($l_total_user_s, $total_users),
! 		"NEWEST_USER" => sprintf($lang['Newest_user'], '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), 
! 
! 		"FORUM_IMG" => $images['forum'],
! 		"FORUM_NEW_IMG" => $images['forum_new'],
! 		"FORUM_LOCKED_IMG" => $images['forum_locked'],
! 
! 		"L_MODERATOR" => $lang['Moderators'], 
! 		"L_FORUM_LOCKED" => $lang['Forum_is_locked'],
! 		"L_MARK_FORUMS_READ" => $lang['Mark_all_forums'], 
  
! 		"U_MARK_READ" => append_sid("index.$phpEx?mark=forums"))
  	);
  
--- 256,276 ----
  
  	$template->set_filenames(array(
! 		'body' => 'index_body.tpl')
  	);
  
  	$template->assign_vars(array(
! 		'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts),
! 		'TOTAL_USERS' => sprintf($l_total_user_s, $total_users),
! 		'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), 
! 
! 		'FORUM_IMG' => $images['forum'],
! 		'FORUM_NEW_IMG' => $images['forum_new'],
! 		'FORUM_LOCKED_IMG' => $images['forum_locked'],
! 
! 		'L_MODERATOR' => $lang['Moderators'], 
! 		'L_FORUM_LOCKED' => $lang['Forum_is_locked'],
! 		'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], 
  
! 		'U_MARK_READ' => append_sid("index.$phpEx?mark=forums"))
  	);
  
***************
*** 292,296 ****
  		for($j = 0; $j < $total_forums; $j++)
  		{
! 			if( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id )
  			{
  				$display_forums = true;
--- 288,292 ----
  		for($j = 0; $j < $total_forums; $j++)
  		{
! 			if ( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id )
  			{
  				$display_forums = true;
***************
*** 302,306 ****
  		// title, then, if appropriate the forum list
  		//
! 		if( $display_forums )
  		{
  			$template->assign_block_vars("catrow", array(
--- 298,302 ----
  		// title, then, if appropriate the forum list
  		//
! 		if ( $display_forums )
  		{
  			$template->assign_block_vars("catrow", array(
***************
*** 310,324 ****
  			);
  
! 			if( $viewcat == $cat_id || $viewcat == -1 )
  			{
  				for($j = 0; $j < $total_forums; $j++)
  				{
! 					if( $forum_data[$j]['cat_id'] == $cat_id )
  					{
  						$forum_id = $forum_data[$j]['forum_id'];
  
! 						if( $is_auth_ary[$forum_id]['auth_view'] )
  						{
! 							if( $forum_data[$j]['forum_status'] == FORUM_LOCKED )
  							{
  								$folder_image = '<img src="' . $images['forum_locked'] . '" alt="' . $lang['Forum_locked'] . '" />';
--- 306,320 ----
  			);
  
! 			if ( $viewcat == $cat_id || $viewcat == -1 )
  			{
  				for($j = 0; $j < $total_forums; $j++)
  				{
! 					if ( $forum_data[$j]['cat_id'] == $cat_id )
  					{
  						$forum_id = $forum_data[$j]['forum_id'];
  
! 						if ( $is_auth_ary[$forum_id]['auth_view'] )
  						{
! 							if ( $forum_data[$j]['forum_status'] == FORUM_LOCKED )
  							{
  								$folder_image = '<img src="' . $images['forum_locked'] . '" alt="' . $lang['Forum_locked'] . '" />';
***************
*** 327,333 ****
  							{
  								$unread_topics = false;
! 								if( $userdata['session_logged_in'] )
  								{
! 									if( !empty($new_topic_data[$forum_id]) )
  									{
  										$forum_last_post_time = 0;
--- 323,329 ----
  							{
  								$unread_topics = false;
! 								if ( $userdata['session_logged_in'] )
  								{
! 									if ( !empty($new_topic_data[$forum_id]) )
  									{
  										$forum_last_post_time = 0;
***************
*** 335,339 ****
  										while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) )
  										{
! 											if( empty($tracking_topics['' . $check_topic_id . '']) )
  											{
  												$unread_topics = true;
--- 331,335 ----
  										while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) )
  										{
! 											if ( empty($tracking_topics[$check_topic_id]) )
  											{
  												$unread_topics = true;
***************
*** 343,347 ****
  											else
  											{
! 												if( $tracking_topics['' . $check_topic_id . ''] < $check_post_time )
  												{
  													$unread_topics = true;
--- 339,343 ----
  											else
  											{
! 												if ( $tracking_topics[$check_topic_id] < $check_post_time )
  												{
  													$unread_topics = true;
***************
*** 351,357 ****
  										}
  
! 										if( !empty($tracking_forums['' . $forum_id . '']) )
  										{
! 											if( $tracking_forums['' . $forum_id . ''] > $forum_last_post_time )
  											{
  												$unread_topics = false;
--- 347,353 ----
  										}
  
! 										if ( !empty($tracking_forums[$forum_id]) )
  										{
! 											if ( $tracking_forums[$forum_id] > $forum_last_post_time )
  											{
  												$unread_topics = false;
***************
*** 359,365 ****
  										}
  
! 										if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
  										{
! 											if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time )
  											{
  												$unread_topics = false;
--- 355,361 ----
  										}
  
! 										if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
  										{
! 											if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time )
  											{
  												$unread_topics = false;
***************
*** 376,384 ****
  							$topics = $forum_data[$j]['forum_topics'];
  
! 							if( $forum_data[$j]['forum_last_post_id'] )
  							{
  								$last_post_time = create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']);
  
! 								$last_post = $last_post_time . "<br />";
  
  								$last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != "" ) ? $forum_data[$j]['post_username'] . " " : $lang['Guest'] . " " ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> ';
--- 372,380 ----
  							$topics = $forum_data[$j]['forum_topics'];
  
! 							if ( $forum_data[$j]['forum_last_post_id'] )
  							{
  								$last_post_time = create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']);
  
! 								$last_post = $last_post_time . '<br />';
  
  								$last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != "" ) ? $forum_data[$j]['post_username'] . " " : $lang['Guest'] . " " ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> ';
***************
*** 391,403 ****
  							}
  
! 							if( count($forum_moderators[$forum_id]) > 0 )
  							{
  								$l_moderators = ( count($forum_moderators[$forum_id]) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
! 								$moderator_list = implode(", ", $forum_moderators[$forum_id]);
  							}
  							else
  							{
! 								$l_moderators = "&nbsp;";
! 								$moderator_list = "&nbsp;";
  							}
  
--- 387,399 ----
  							}
  
! 							if ( count($forum_moderators[$forum_id]) > 0 )
  							{
  								$l_moderators = ( count($forum_moderators[$forum_id]) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
! 								$moderator_list = implode(', ', $forum_moderators[$forum_id]);
  							}
  							else
  							{
! 								$l_moderators = '&nbsp;';
! 								$moderator_list = '&nbsp;';
  							}
  
***************
*** 406,410 ****
  
  							$template->assign_block_vars("catrow.forumrow",	array(
! 								"ROW_COLOR" => "#" . $row_color,
  								"ROW_CLASS" => $row_class,
  								"FOLDER" => $folder_image,
--- 402,406 ----
  
  							$template->assign_block_vars("catrow.forumrow",	array(
! 								"ROW_COLOR" => '#' . $row_color,
  								"ROW_CLASS" => $row_class,
  								"FOLDER" => $folder_image,
***************
*** 436,442 ****
  // Generate the page
  //
! $template->pparse("body");
  
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 432,438 ----
  // Generate the page
  //
! $template->pparse('body');
  
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/admin admin_ug_auth.php,1.6,1.7

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

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

Modified Files:
	admin_ug_auth.php 
Log Message:
Missed  a couple of $phpEx extensions of some redirects

Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** admin_ug_auth.php	18 Mar 2002 14:54:25 -0000	1.6
--- admin_ug_auth.php	19 Mar 2002 12:35:13 -0000	1.7
***************
*** 179,183 ****
  		}
  
! 		header("Location: " . append_sid("admin_ug_auth?" . POST_USERS_URL . "=$user_id", true));
  		exit;
  	}
--- 179,183 ----
  		}
  
! 		header("Location: " . append_sid("admin_ug_auth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
  		exit;
  	}
***************
*** 218,222 ****
  		}
  
! 		header("Location: " . append_sid("admin_ug_auth?" . POST_USERS_URL . "=$user_id", true));
  		exit;
  	}
--- 218,222 ----
  		}
  
! 		header("Location: " . append_sid("admin_ug_auth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
  		exit;
  	}

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.65,1.66

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

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

Modified Files:
	modcp.php 
Log Message:
Output message if neither a forum nor topic id are specified

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** modcp.php	19 Mar 2002 00:47:52 -0000	1.65
--- modcp.php	19 Mar 2002 12:26:52 -0000	1.66
***************
*** 36,40 ****
  include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
  include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
- include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
  
  //
--- 36,39 ----
***************
*** 132,136 ****
  // Obtain relevant data
  //
! if( $topic_id )
  {
  	$sql = "SELECT f.forum_id, f.forum_name, f.forum_topics
--- 131,135 ----
  // Obtain relevant data
  //
! if ( !empty($topic_id) )
  {
  	$sql = "SELECT f.forum_id, f.forum_name, f.forum_topics
***************
*** 138,144 ****
  		WHERE t.topic_id = " . $topic_id . "
  			AND f.forum_id = t.forum_id";
! 	if(!$result = $db->sql_query($sql))
  	{
! 		message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist'], "", __LINE__, __FILE__, $sql);
  	}
  	$topic_row = $db->sql_fetchrow($result);
--- 137,143 ----
  		WHERE t.topic_id = " . $topic_id . "
  			AND f.forum_id = t.forum_id";
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
  	}
  	$topic_row = $db->sql_fetchrow($result);
***************
*** 148,159 ****
  	$forum_name = $topic_row['forum_name'];
  }
! else if( $forum_id )
  {
  	$sql = "SELECT forum_name, forum_topics
  		FROM " . FORUMS_TABLE . "
  		WHERE forum_id = " . $forum_id;
! 	if(!$result = $db->sql_query($sql))
  	{
! 		message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist'], "", __LINE__, __FILE__, $sql);
  	}
  	$topic_row = $db->sql_fetchrow($result);
--- 147,158 ----
  	$forum_name = $topic_row['forum_name'];
  }
! else if ( !empty($forum_id) )
  {
  	$sql = "SELECT forum_name, forum_topics
  		FROM " . FORUMS_TABLE . "
  		WHERE forum_id = " . $forum_id;
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_MESSAGE, 'Forum_not_exist');
  	}
  	$topic_row = $db->sql_fetchrow($result);
***************
*** 162,165 ****
--- 161,168 ----
  	$forum_name = $topic_row['forum_name'];
  }
+ else
+ {
+ 	message_die(GENERAL_MESSAGE, 'Forum_not_exist');
+ }
  
  //
***************
*** 196,199 ****
--- 199,204 ----
  		if ( $confirm )
  		{
+ 			include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
+ 
  			$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ?  $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
  

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images/lang_finnish icon_email.gif,NONE,1.1 icon_emai.gif,1.1,NONE

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

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_finnish
In directory usw-pr-cvs1:/tmp/cvs-serv22015/templates/subSilver/images/lang_finnish

Added Files:
	icon_email.gif 
Removed Files:
	icon_emai.gif 
Log Message:
Rename icon

--- NEW FILE ---
GIF89a;
¡¢k¿¦ÅJNµ……BN	]=§		H»ß	»¤ÄÆÉ
iÔ
Ó k§
ƙÚ
Á6oLÊQè  B:bwH% 
ÐA”ØeÁ͈	à¬/@#
--- icon_emai.gif DELETED ---

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.57,1.58

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

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

Modified Files:
	sessions.php 
Log Message:
Remove stripslashes from pagestart and begin session_id ...

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** sessions.php	18 Mar 2002 23:53:12 -0000	1.57
--- sessions.php	19 Mar 2002 11:59:36 -0000	1.58
***************
*** 39,43 ****
  	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
  	{
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : '';
  		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
--- 39,43 ----
  	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
  	{
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
  		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
***************
*** 215,219 ****
  	{
  		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : '';
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
--- 215,219 ----
  	{
  		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : '';
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}

[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.89,1.90

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

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

Modified Files:
	privmsg.php 
Log Message:
Fix quoting problem

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** privmsg.php	18 Mar 2002 13:35:43 -0000	1.89
--- privmsg.php	19 Mar 2002 01:53:19 -0000	1.90
***************
*** 39,44 ****
  // Var definitions
  //
! $html_entities_match = array("#&#", "#<#", "#>#", "#\"#");
! $html_entities_replace = array("&amp;", "&lt;", "&gt;", "&quot;");
  
  //
--- 39,44 ----
  // Var definitions
  //
! $html_entities_match = array("#&#", "#<#", "#>#");
! $html_entities_replace = array("&amp;", "&lt;", "&gt;");
  
  //
***************
*** 1335,1339 ****
  				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); 
  
! 				$privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]\n";
  
  				$mode = "reply";
--- 1335,1339 ----
  				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); 
  
! 				$privmsg_message = "[quote=\"" . $to_username . "\"]" . $privmsg_message . "[/quote]\n";
  
  				$mode = "reply";
***************
*** 1362,1366 ****
  		$orig_word = array();
  		$replacement_word = array();
! 		$result = obtain_word_list($orig_word, $replacement_word);
  
  		if( $bbcode_on )
--- 1362,1366 ----
  		$orig_word = array();
  		$replacement_word = array();
! 		obtain_word_list($orig_word, $replacement_word);
  
  		if( $bbcode_on )

[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.5,1.6

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

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

Modified Files:
	usercp_register.php 
Log Message:
One more error and this computer gets to see the Ionosphere close up ...

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** usercp_register.php	19 Mar 2002 01:10:21 -0000	1.5
--- usercp_register.php	19 Mar 2002 01:11:27 -0000	1.6
***************
*** 493,497 ****
  			}
  
! 			if ( !($row = $db->sql_fetchrow($result) )
  			{
  				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
--- 493,497 ----
  			}
  
! 			if ( !($row = $db->sql_fetchrow($result)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);

[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.4,1.5

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

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

Modified Files:
	usercp_register.php 
Log Message:
Me getting irritated now ...

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** usercp_register.php	18 Mar 2002 23:53:12 -0000	1.4
--- usercp_register.php	19 Mar 2002 01:10:21 -0000	1.5
***************
*** 480,484 ****
  			}
  
! 			if ( !($row = $db->sql_fetchrow($result) )
  			{
  				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
--- 480,484 ----
  			}
  
! 			if ( !($row = $db->sql_fetchrow($result)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
***************
*** 488,492 ****
  			$sql = "SELECT MAX(group_id) AS total
  				FROM " . GROUPS_TABLE;
! 			if ( !($result = $db->sql_query($sql) ) )
  			{
  				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
--- 488,492 ----
  			$sql = "SELECT MAX(group_id) AS total
  				FROM " . GROUPS_TABLE;
! 			if ( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);

[Phpbb-checkins] CVS: phpBB2/db mysql.php,1.15,1.16

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

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

Modified Files:
	mysql.php 
Log Message:
Minor update to return true should a transaction be ended without a query ... does nothing except prevent premature failure of calling routine

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mysql.php	12 Feb 2002 16:59:49 -0000	1.15
--- mysql.php	19 Mar 2002 01:07:36 -0000	1.16
***************
*** 115,119 ****
  		else
  		{
! 			return false;
  		}
  	}
--- 115,119 ----
  		else
  		{
! 			return ( $transaction == END_TRANSACTION ) ? true : false;
  		}
  	}

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin page_header.tpl,1.10,1.11

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

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv8891/templates/subSilver/admin

Modified Files:
	page_header.tpl 
Log Message:
More stylesheet link commenting out

Index: page_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/page_header.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** page_header.tpl	8 Mar 2002 17:03:27 -0000	1.10
--- page_header.tpl	19 Mar 2002 01:05:00 -0000	1.11
***************
*** 4,8 ****
  {META}
  <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}"  />
! <link rel="stylesheet" href="../templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" />
  <style type="text/css">
  <!--
--- 4,8 ----
  {META}
  <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}"  />
! <!-- link rel="stylesheet" href="../templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" -->
  <style type="text/css">
  <!--

[Phpbb-checkins] CVS: phpBB2/templates/subSilver overall_header.tpl,1.23,1.24 simple_header.tpl,1.6,1.7

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

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv8814/templates/subSilver

Modified Files:
	overall_header.tpl simple_header.tpl 
Log Message:
Comment out stylesheet link ... I bet we get complaints from the 'other camp' over this

Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/overall_header.tpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** overall_header.tpl	2 Feb 2002 18:12:15 -0000	1.23
--- overall_header.tpl	19 Mar 2002 01:04:32 -0000	1.24
***************
*** 8,12 ****
  {NAV_LINKS}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
! <link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" />
  <style type="text/css">
  <!--
--- 8,12 ----
  {NAV_LINKS}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
! <!-- link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" -->
  <style type="text/css">
  <!--

Index: simple_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/simple_header.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** simple_header.tpl	2 Feb 2002 18:12:15 -0000	1.6
--- simple_header.tpl	19 Mar 2002 01:04:32 -0000	1.7
***************
*** 13,17 ****
  {META}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
! <link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" />
  <style type="text/css">
  <!--
--- 13,17 ----
  {META}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
! <!-- link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" -->
  <style type="text/css">
  <!--

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.127,1.128

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

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

Modified Files:
	functions.php 
Log Message:
bah

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -r1.127 -r1.128
*** functions.php	19 Mar 2002 00:43:51 -0000	1.127
--- functions.php	19 Mar 2002 01:00:37 -0000	1.128
***************
*** 446,451 ****
  		do 
  		{
! 			$orig_word[] = '#\W(' . str_replace('\*', '\w*?', preg_quote($row['word']) ) . ')\W#is';
! 			$replacement_word[] = $row['replacement'];
  		}
  		while ( $row = $db->sql_fetchrow($result) );
--- 446,451 ----
  		do 
  		{
! 			$orig_word[] = '#(\W)' . str_replace('\*', '\w*?', preg_quote($row['word']) ) . '(\W)#is';
! 			$replacement_word[] = '\1' . $row['replacement'] . '\2';
  		}
  		while ( $row = $db->sql_fetchrow($result) );

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.64,1.65

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

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

Modified Files:
	modcp.php 
Log Message:
Update for change in remove search word function ... bug #531662

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** modcp.php	18 Mar 2002 18:05:53 -0000	1.64
--- modcp.php	19 Mar 2002 00:47:52 -0000	1.65
***************
*** 287,291 ****
  				// Delete unmatched words
  				//
! 				remove_unmatched_words();
  
  			}
--- 287,291 ----
  				// Delete unmatched words
  				//
! 				remove_search_post($post_id_sql);
  
  			}

[Phpbb-checkins] CVS: phpBB2/includes functions_search.php,1.4,1.5

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

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

Modified Files:
	functions_search.php 
Log Message:
Allow a a comma delimited set of post id's to be sent to remove words function ... for modcp et al

Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_search.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** functions_search.php	18 Mar 2002 23:53:12 -0000	1.4
--- functions_search.php	19 Mar 2002 00:46:22 -0000	1.5
***************
*** 348,352 ****
  }
  
! function remove_search_post($post_id)
  {
  	global $db;
--- 348,352 ----
  }
  
! function remove_search_post($post_id_sql)
  {
  	global $db;
***************
*** 360,364 ****
  			$sql = "SELECT word_id 
  				FROM " . SEARCH_MATCH_TABLE . " 
! 				WHERE post_id = $post_id";
  			if ( $result = $db->sql_query($sql) )
  			{
--- 360,365 ----
  			$sql = "SELECT word_id 
  				FROM " . SEARCH_MATCH_TABLE . " 
! 				WHERE post_id IN ($post_id_sql) 
! 				GROUP BY word_id";
  			if ( $result = $db->sql_query($sql) )
  			{
***************
*** 405,409 ****
  						SELECT word_id 
  						FROM " . SEARCH_MATCH_TABLE . " 
! 						WHERE post_id = $post_id 
  					) 
  					GROUP BY word_id 
--- 406,411 ----
  						SELECT word_id 
  						FROM " . SEARCH_MATCH_TABLE . " 
! 						WHERE post_id IN ($post_id_sql) 
! 						GROUP BY word_id 
  					) 
  					GROUP BY word_id 
***************
*** 421,425 ****
  
  	$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
! 		WHERE post_id = $post_id";
  	if ( !($db->sql_query($sql)) )
  	{
--- 423,427 ----
  
  	$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
! 		WHERE post_id IN ($post_id_sql)";
  	if ( !($db->sql_query($sql)) )
  	{

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.126,1.127

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

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

Modified Files:
	functions.php 
Log Message:
Stuff that phpbb_preg ... not including bbcode and can't be bothered to move phpbb_preg out ...

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -r1.126 -r1.127
*** functions.php	19 Mar 2002 00:08:18 -0000	1.126
--- functions.php	19 Mar 2002 00:43:51 -0000	1.127
***************
*** 446,450 ****
  		do 
  		{
! 			$orig_word[] = '#\W(' . str_replace('\*', '\w*?', phpbb_preg_quote($row['word']), "#") . ')\W#is';
  			$replacement_word[] = $row['replacement'];
  		}
--- 446,450 ----
  		do 
  		{
! 			$orig_word[] = '#\W(' . str_replace('\*', '\w*?', preg_quote($row['word']) ) . ')\W#is';
  			$replacement_word[] = $row['replacement'];
  		}

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.180,1.181

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

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

Modified Files:
	viewtopic.php 
Log Message:
Minor rewrite of some sql fetchrow stuff

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -r1.180 -r1.181
*** viewtopic.php	18 Mar 2002 13:35:43 -0000	1.180
--- viewtopic.php	19 Mar 2002 00:43:19 -0000	1.181
***************
*** 404,427 ****
  	ORDER BY p.post_time $post_time_order
  	LIMIT $start, ".$board_config['posts_per_page'];
! if(!$result = $db->sql_query($sql))
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain post/user information.", "", __LINE__, __FILE__, $sql);
  }
  
! if(!$total_posts = $db->sql_numrows($result))
  {
  	message_die(GENERAL_MESSAGE, $lang['No_posts_topic']);
  }
- $postrow = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
  
  $sql = "SELECT *
  	FROM " . RANKS_TABLE . "
  	ORDER BY rank_special, rank_min";
! if( !($result = $db->sql_query($sql)) )
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain ranks information.", "", __LINE__, __FILE__, $sql);
  }
! $ranksrow = $db->sql_fetchrowset($result);
  
  //
--- 404,443 ----
  	ORDER BY p.post_time $post_time_order
  	LIMIT $start, ".$board_config['posts_per_page'];
! if ( !($result = $db->sql_query($sql)) )
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain post/user information.", "", __LINE__, __FILE__, $sql);
  }
  
! if ( $row = $db->sql_fetchrow($result) )
! {
! 	$postrow = array();
! 	do
! 	{
! 		$postrow[] = $row;
! 	}
! 	while ( $row = $db->sql_fetchrow($result) );
! 	$db->sql_freeresult($result);
! 
! 	$total_posts = count($postrow);
! }
! else
  {
  	message_die(GENERAL_MESSAGE, $lang['No_posts_topic']);
  }
  
  $sql = "SELECT *
  	FROM " . RANKS_TABLE . "
  	ORDER BY rank_special, rank_min";
! if ( !($result = $db->sql_query($sql)) )
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain ranks information.", "", __LINE__, __FILE__, $sql);
  }
! 
! $ranksrow = array();
! while ( $row = $db->sql_fetchrow($result) )
! {
! 	$ranksrow[] = $row;
! }
! $db->sql_freeresult($result);
  
  //

[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.52,1.53

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

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

Modified Files:
	admin_users.php 
Log Message:
This is what I get when I delete a file that I've already updated ... because I think it's too 'new' ... :)

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** admin_users.php	18 Mar 2002 19:16:44 -0000	1.52
--- admin_users.php	19 Mar 2002 00:26:49 -0000	1.53
***************
*** 38,42 ****
  require('pagestart.inc');
  include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
! include($phpbb_root_dir . 'includes/post.'.$phpEx);
  include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
  include($phpbb_root_dir . 'includes/functions_validate.'.$phpEx);
--- 38,42 ----
  require('pagestart.inc');
  include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
! include($phpbb_root_dir . 'includes/functions_post.'.$phpEx);
  include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
  include($phpbb_root_dir . 'includes/functions_validate.'.$phpEx);

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.24,1.25

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

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

Modified Files:
	admin_styles.php 
Log Message:
Fix 'each' warning, bug #528254

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** admin_styles.php	18 Mar 2002 14:54:25 -0000	1.24
--- admin_styles.php	19 Mar 2002 00:25:03 -0000	1.25
***************
*** 505,509 ****
  				}
  				
! 				$selected_values = $db->sql_fetchrow($result);
  				
  				//
--- 505,515 ----
  				}
  				
! 				if ( $selected_values = $db->sql_fetchrow($result) )
! 				{
! 					while(list($key, $val) = @each($selected_values))
! 					{
! 						$selected[$key] = $val;
! 					}
! 				}
  				
  				//
***************
*** 518,528 ****
  				}
  				
! 				$selected_names = $db->sql_fetchrow($result);
! 
! 				reset($selected_values);
! 				//$selected = array_merge($selected_values, $selected_names);
! 				if(count($selected_values))
  				{
! 					while(list($key, $val) = each($selected_values))
  					{
  						$selected[$key] = $val;
--- 524,530 ----
  				}
  				
! 				if ( $selected_names = $db->sql_fetchrow($result) )
  				{
! 					while(list($key, $val) = @each($selected_names))
  					{
  						$selected[$key] = $val;
***************
*** 530,542 ****
  				}
  
- 				reset($selected_names);
- 				if($selected_names)
- 				{
- 					while(list($key, $val) = each($selected_names))
- 					{
- 						$selected[$key] = $val;
- 					}
- 				}
- 				
  				$s_hidden_fields = '<input type="hidden" name="style_id" value="' . $style_id . '" />';
  			}
--- 532,535 ----

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.125,1.126

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

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

Modified Files:
	functions.php 
Log Message:
phpbb_preg_quote that bad word replace ... just in case ...

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -r1.125 -r1.126
*** functions.php	18 Mar 2002 23:53:12 -0000	1.125
--- functions.php	19 Mar 2002 00:08:18 -0000	1.126
***************
*** 446,450 ****
  		do 
  		{
! 			$orig_word[] = '#\W(' . str_replace('\*', '\w*?', preg_quote($row['word'])) . ')\W#is';
  			$replacement_word[] = $row['replacement'];
  		}
--- 446,450 ----
  		do 
  		{
! 			$orig_word[] = '#\W(' . str_replace('\*', '\w*?', phpbb_preg_quote($row['word']), "#") . ')\W#is';
  			$replacement_word[] = $row['replacement'];
  		}

[Phpbb-checkins] CVS: phpBB2/includes topic_review.php,1.3,1.4

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

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

Modified Files:
	topic_review.php 
Log Message:
Non-authed user could potentially utilise topic_review to read denied forums .... thanks Ashe

Index: topic_review.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/topic_review.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** topic_review.php	18 Mar 2002 23:53:12 -0000	1.3
--- topic_review.php	18 Mar 2002 23:56:36 -0000	1.4
***************
*** 67,70 ****
--- 67,75 ----
  		$is_auth = array();
  		$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row);
+ 
+ 		if ( !$is_auth['auth_read'] )
+ 		{
+ 			message_die(GENERAL_MESSAGE, sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']));
+ 		}
  	}
  

[Phpbb-checkins] CVS: phpBB2 extension.inc,1.3,1.4 profile.php,1.190,1.191

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

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

Modified Files:
	extension.inc profile.php 
Log Message:
No need for IN_PROFILE, can just use IN_PHPBB

Index: extension.inc
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/extension.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** extension.inc	26 Aug 2001 13:53:41 -0000	1.3
--- extension.inc	18 Mar 2002 23:53:38 -0000	1.4
***************
*** 1,5 ****
  <?php
  /***************************************************************************  
!  *                                 extention.inc
   *                            -------------------                         
   *   begin                : Saturday, Feb 13, 2001 
--- 1,5 ----
  <?php
  /***************************************************************************  
!  *                               extension.inc
   *                            -------------------                         
   *   begin                : Saturday, Feb 13, 2001 
***************
*** 12,16 ****
--- 12,28 ----
   ***************************************************************************/ 
  
+ if ( !defined('IN_PHPBB') )
+ {
+ 	die("Hacking attempt");
+ }
+ 
+ //
+ // Change this if your extension is not .php!
+ //
  $phpEx = "php";
+ 
+ //
+ // For debug timing
+ // 
  $mtime = microtime();
  $mtime = explode(" ",$mtime);

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.190
retrieving revision 1.191
diff -C2 -r1.190 -r1.191
*** profile.php	18 Mar 2002 13:35:43 -0000	1.190
--- profile.php	18 Mar 2002 23:53:38 -0000	1.191
***************
*** 35,40 ****
  //
  
- define('IN_PROFILE', true);
- 
  //
  // Set default email variables
--- 35,38 ----

[Phpbb-checkins] CVS: phpBB2/includes auth.php,1.35,1.36 emailer.php,1.13,1.14 functions.php,1.124,1.125 functions_admin.php,1.2,1.3 functions_search.php,1.3,1.4 functions_selects.php,1.2,1.3 functions_validate.php,1.3,1.4 prune.php,1.11,1.12 sessions.php,1.56,1.57 smtp.php,1.14,1.15 sql_parse.php,1.7,1.8 template.php,1.8,1.9 topic_review.php,1.2,1.3 usercp_activate.php,1.2,1.3 usercp_avatar.php,1.2,1.3 usercp_email.php,1.3,1.4 usercp_register.php,1.3,1.4 usercp_sendpasswd.php,1.2,1.3 usercp_viewprofile.php,1.2,1.3

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

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

Modified Files:
	auth.php emailer.php functions.php functions_admin.php 
	functions_search.php functions_selects.php 
	functions_validate.php prune.php sessions.php smtp.php 
	sql_parse.php template.php topic_review.php 
	usercp_activate.php usercp_avatar.php usercp_email.php 
	usercp_register.php usercp_sendpasswd.php 
	usercp_viewprofile.php 
Log Message:
Stop being too paranoid about hacking of includes containing only fully inclusive functions

Index: auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/auth.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** auth.php	18 Mar 2002 13:35:21 -0000	1.35
--- auth.php	18 Mar 2002 23:53:12 -0000	1.36
***************
*** 21,29 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  /*
  	$type's accepted (pre-pend with AUTH_):
--- 21,24 ----

Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** emailer.php	18 Mar 2002 13:35:22 -0000	1.13
--- emailer.php	18 Mar 2002 23:53:12 -0000	1.14
***************
*** 20,28 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  //
  // The emailer class has support for attaching files, that isn't implemented
--- 20,23 ----
***************
*** 333,335 ****
  } // class emailer
  
! ?>
--- 328,330 ----
  } // class emailer
  
! ?>
\ No newline at end of file

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -r1.124 -r1.125
*** functions.php	18 Mar 2002 13:35:22 -0000	1.124
--- functions.php	18 Mar 2002 23:53:12 -0000	1.125
***************
*** 22,30 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  function get_db_stat($mode)
  {
--- 22,25 ----

Index: functions_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** functions_admin.php	18 Mar 2002 13:35:22 -0000	1.2
--- functions_admin.php	18 Mar 2002 23:53:12 -0000	1.3
***************
*** 22,30 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  //
  // Simple version of jumpbox, just lists authed forums
--- 22,25 ----

Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_search.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** functions_search.php	18 Mar 2002 13:35:22 -0000	1.3
--- functions_search.php	18 Mar 2002 23:53:12 -0000	1.4
***************
*** 20,28 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
  {
--- 20,23 ----

Index: functions_selects.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_selects.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** functions_selects.php	18 Mar 2002 13:35:22 -0000	1.2
--- functions_selects.php	18 Mar 2002 23:53:12 -0000	1.3
***************
*** 22,30 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  //
  // Pick a language, any language ...
--- 22,25 ----

Index: functions_validate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_validate.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** functions_validate.php	18 Mar 2002 19:42:05 -0000	1.3
--- functions_validate.php	18 Mar 2002 23:53:12 -0000	1.4
***************
*** 22,30 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  //
  // Check to see if the username has been taken, or if it is disallowed.
--- 22,25 ----

Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/prune.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** prune.php	18 Mar 2002 13:35:22 -0000	1.11
--- prune.php	18 Mar 2002 23:53:12 -0000	1.12
***************
*** 21,29 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  require($phpbb_root_path . 'includes/functions_search.'.$phpEx);
  
--- 21,24 ----

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** sessions.php	18 Mar 2002 15:00:35 -0000	1.56
--- sessions.php	18 Mar 2002 23:53:12 -0000	1.57
***************
*** 21,29 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  //
  // session_begin()
--- 21,24 ----

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** smtp.php	18 Mar 2002 13:35:22 -0000	1.14
--- smtp.php	18 Mar 2002 23:53:12 -0000	1.15
***************
*** 20,28 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  define('SMTP_INCLUDED', 1);
  //
--- 20,23 ----
***************
*** 234,236 ****
  }
  
! ?>
--- 229,231 ----
  }
  
! ?>
\ No newline at end of file

Index: sql_parse.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sql_parse.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** sql_parse.php	18 Mar 2002 13:35:22 -0000	1.7
--- sql_parse.php	18 Mar 2002 23:53:12 -0000	1.8
***************
*** 29,37 ****
  \***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  //
  // remove_comments will strip the sql comment lines out of an uploaded sql file
--- 29,32 ----
***************
*** 68,71 ****
--- 63,67 ----
  	return $output;
  }
+ 
  //
  // remove_remarks will strip the sql comment lines out of an uploaded sql file
***************
*** 193,195 ****
  	return $output;
  }
! ?>
--- 189,192 ----
  	return $output;
  }
! 
! ?>
\ No newline at end of file

Index: template.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/template.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** template.php	18 Mar 2002 13:35:22 -0000	1.8
--- template.php	18 Mar 2002 23:53:12 -0000	1.9
***************
*** 21,29 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
  /**
   * Template class. By Nathan Codding of the phpBB group.
--- 21,24 ----

Index: topic_review.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/topic_review.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** topic_review.php	18 Mar 2002 13:35:23 -0000	1.2
--- topic_review.php	18 Mar 2002 23:53:12 -0000	1.3
***************
*** 22,34 ****
   ***************************************************************************/
  
- if ( !defined('IN_PHPBB') )
- {
- 	die("Hacking attempt");
- }
- 
- // -----------------------
- // Page specific functions
- //
- 
  function topic_review($topic_id, $is_inline_review)
  {
--- 22,25 ----
***************
*** 217,223 ****
  	}
  }
- //
- // End page specific functions
- // ---------------------------
  
  ?>
--- 208,211 ----

Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_activate.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** usercp_activate.php	18 Mar 2002 13:35:23 -0000	1.2
--- usercp_activate.php	18 Mar 2002 23:53:12 -0000	1.3
***************
*** 22,26 ****
   ***************************************************************************/
  
! if ( !defined('IN_PROFILE') )
  {
  	die("Hacking attempt");
--- 22,26 ----
   ***************************************************************************/
  
! if ( !defined('IN_PHPBB') )
  {
  	die("Hacking attempt");

Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_avatar.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** usercp_avatar.php	18 Mar 2002 13:35:23 -0000	1.2
--- usercp_avatar.php	18 Mar 2002 23:53:12 -0000	1.3
***************
*** 22,31 ****
   ***************************************************************************/
  
- if ( !defined('IN_PROFILE') )
- {
- 	die("Hacking attempt");
- 	exit;
- }
- 
  function check_image_type(&$type, &$error, &$error_msg)
  {
--- 22,25 ----

Index: usercp_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_email.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** usercp_email.php	18 Mar 2002 18:42:25 -0000	1.3
--- usercp_email.php	18 Mar 2002 23:53:12 -0000	1.4
***************
*** 22,26 ****
   ***************************************************************************/
  
! if ( !defined('IN_PROFILE') )
  {
  	die("Hacking attempt");
--- 22,26 ----
   ***************************************************************************/
  
! if ( !defined('IN_PHPBB') )
  {
  	die("Hacking attempt");

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** usercp_register.php	18 Mar 2002 19:00:35 -0000	1.3
--- usercp_register.php	18 Mar 2002 23:53:12 -0000	1.4
***************
*** 22,26 ****
   ***************************************************************************/
  
! if ( !defined('IN_PROFILE') )
  {
  	die("Hacking attempt");
--- 22,26 ----
   ***************************************************************************/
  
! if ( !defined('IN_PHPBB') )
  {
  	die("Hacking attempt");
***************
*** 477,494 ****
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not obtained next user_id information', '', __LINE__, __FILE__, $sql);
  			}
  
! 			$row = $db->sql_fetchrow($result);
  			$user_id = $row['total'] + 1;
  
  			$sql = "SELECT MAX(group_id) AS total
  				FROM " . GROUPS_TABLE;
! 			if (!( $result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not obtained next user_id information', '', __LINE__, __FILE__, $sql);
  			}
  
! 			$row = $db->sql_fetchrow($result);
  			$group_id = $row['total'] + 1;
  
--- 477,500 ----
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
  			}
  
! 			if ( !($row = $db->sql_fetchrow($result) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
! 			}
  			$user_id = $row['total'] + 1;
  
  			$sql = "SELECT MAX(group_id) AS total
  				FROM " . GROUPS_TABLE;
! 			if ( !($result = $db->sql_query($sql) ) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
  			}
  
! 			if ( !($row = $db->sql_fetchrow($result) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
! 			}
  			$group_id = $row['total'] + 1;
  

Index: usercp_sendpasswd.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_sendpasswd.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** usercp_sendpasswd.php	18 Mar 2002 13:35:23 -0000	1.2
--- usercp_sendpasswd.php	18 Mar 2002 23:53:12 -0000	1.3
***************
*** 22,26 ****
   ***************************************************************************/
  
! if ( !defined('IN_PROFILE') )
  {
  	die("Hacking attempt");
--- 22,26 ----
   ***************************************************************************/
  
! if ( !defined('IN_PHPBB') )
  {
  	die("Hacking attempt");

Index: usercp_viewprofile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_viewprofile.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** usercp_viewprofile.php	18 Mar 2002 13:35:23 -0000	1.2
--- usercp_viewprofile.php	18 Mar 2002 23:53:12 -0000	1.3
***************
*** 22,26 ****
   ***************************************************************************/
  
! if ( !defined('IN_PROFILE') )
  {
  	die("Hacking attempt");
--- 22,26 ----
   ***************************************************************************/
  
! if ( !defined('IN_PHPBB') )
  {
  	die("Hacking attempt");