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

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.107,1.108

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

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

Modified Files:
	functions.php 
Log Message:
Fix various bugs; password length warning, proper warnings for username/email errors

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -r1.107 -r1.108
*** functions.php	2002/01/22 18:13:59	1.107
--- functions.php	2002/01/27 03:10:19	1.108
***************
*** 192,196 ****
  	if( isset($SID) )
  	{
! //		$boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
  	}
  
--- 192,196 ----
  	if( isset($SID) )
  	{
! 		$boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
  	}
  
***************
*** 305,309 ****
  	
  			$images[$key] = ( file_exists($new_value) ) ? $new_value : str_replace("_lang", "_english", $value);
- //			list($images_width[$key], $images_height[$key]) = getimagesize($images[$key]);
  		}
  	}
--- 305,308 ----
***************
*** 499,569 ****
  function validate_username($username)
  {
! 	global $db;
  
! 	switch(SQL_LAYER)
  	{
! 		case 'mysql':
! 		case 'mysql4':
! 			$sql_users = "SELECT u.username, g.group_name
! 				FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 				WHERE ug.user_id = u.user_id
! 					AND g.group_id = ug.group_id
! 					AND	( LOWER(u.username) = '" . strtolower(str_replace("\'", "''", $username)) . "'
! 						OR LOWER(g.group_name) = '" . strtolower(str_replace("\'", "''", $username)) . "' )";
! 			$sql_disallow = "SELECT disallow_username
! 				FROM " . DISALLOW_TABLE . "
! 				WHERE '" . str_replace("\'", "''", $username) . "' LIKE disallow_username";
! 			if($result = $db->sql_query($sql_users))
! 			{
! 				if($db->sql_numrows($result) > 0)
! 				{
! 					return(FALSE);
! 				}
! 			}
! 			if($result = $db->sql_query($sql_disallow))
! 			{
! 				if($db->sql_numrows($result) > 0)
! 				{
! 					return(FALSE);
! 				}
! 			}
! 			break;
  
! 		default:
! 			$sql = "SELECT u.username, g.group_name
! 				FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 				WHERE ug.user_id = u.user_id
! 					AND g.group_id = ug.group_id
! 					AND	( LOWER(u.username) = '" . strtolower(str_replace("\'", "''", $username)) . "'
! 						OR LOWER(g.group_name) = '" . strtolower(str_replace("\'", "''", $username)) . "' )
! 				UNION
! 				SELECT disallow_username, NULL
! 					FROM " . DISALLOW_TABLE . "
! 					WHERE '" . str_replace("\'", "''", $username) . "' LIKE disallow_username";
! 			if($result = $db->sql_query($sql))
! 			{
! 				if($db->sql_numrows($result) > 0)
! 				{
! 					return(FALSE);
! 				}
! 			}
! 			break;
  	}
  
  	$sql = "SELECT word 
  		FROM  " . WORDS_TABLE;
! 	if( !$words_result = $db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, "Couldn't get censored words from database.", "", __LINE__, __FILE__, $sql);
! 	}
! 	else
! 	{
! 		$word_list = $db->sql_fetchrowset($words_result);
! 
! 		for($i = 0; $i < count($word_list); $i++)
  		{
! 			if( preg_match("/\b(" . str_replace("\*", "\w*?", preg_quote($word_list[$i]['word'])) . ")\b/i", $username) )
  			{
! 				return(FALSE);
  			}
  		}
--- 498,537 ----
  function validate_username($username)
  {
! 	global $db, $lang;
  
! 	$sql = "SELECT u.username, g.group_name
! 		FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 		WHERE ug.user_id = u.user_id
! 			AND g.group_id = ug.group_id
! 			AND	( LOWER(u.username) = '" . strtolower(str_replace("\'", "''", $username)) . "'
! 				OR LOWER(g.group_name) = '" . strtolower(str_replace("\'", "''", $username)) . "' )";
! 	if ( $result = $db->sql_query($sql) )
  	{
! 		if ( $db->sql_fetchrow($result) )
! 		{
! 			return array('error' => $lang['Username_taken']);
! 		}
! 	}
  
! 	$sql = "SELECT disallow_username
! 		FROM " . DISALLOW_TABLE . "
! 		WHERE '" . str_replace("\'", "''", $username) . "' LIKE disallow_username";
! 	if ( $result = $db->sql_query($sql) )
! 	{
! 		if ( $db->sql_fetchrow($result) )
! 		{
! 			return array('error' => $lang['Username_disallowed']);
! 		}
  	}
  
  	$sql = "SELECT word 
  		FROM  " . WORDS_TABLE;
! 	if ( $result = $db->sql_query($sql) )
  	{
! 		while( $row = $db->sql_fetchrow($result) )
  		{
! 			if( preg_match("/\b(" . str_replace("\*", "\w*?", preg_quote($row['word'])) . ")\b/i", $username) )
  			{
! 				return array('error' => $lang['Username_disallowed']);
  			}
  		}
***************
*** 573,580 ****
  	if ( strstr($username, '"') )
  	{
! 		return FALSE;
  	}
  
! 	return(TRUE);
  }
  
--- 541,548 ----
  	if ( strstr($username, '"') )
  	{
! 		return array('error' => $lang['Username_invalid']);
  	}
  
! 	return array('error' => '');
  }
  

[Phpbb-checkins] CVS: phpBB2 profile.php,1.172,1.173

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

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

Modified Files:
	profile.php 
Log Message:
Fix various bugs; password length warning, proper warnings for username/email errors

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -r1.172 -r1.173
*** profile.php	2002/01/25 02:37:04	1.172
--- profile.php	2002/01/27 03:10:12	1.173
***************
*** 46,50 ****
  function validate_email($email)
  {
! 	global $db;
  
  	if($email != "")
--- 46,50 ----
  function validate_email($email)
  {
! 	global $db, $lang;
  
  	if($email != "")
***************
*** 54,94 ****
  			$sql = "SELECT ban_email
  				FROM " . BANLIST_TABLE;
! 			if(!$result = $db->sql_query($sql))
  			{
! 				message_die(GENERAL_ERROR, "Couldn't obtain email ban information.", "", __LINE__, __FILE__, $sql);
! 			}
! 			$ban_email_list = $db->sql_fetchrowset($result);
! 			for($i = 0; $i < count($ban_email_list); $i++)
! 			{
! 				$match_email = str_replace("*@", ".*@", $ban_email_list[$i]['ban_email']);
! 				if( preg_match("/^" . $match_email . "$/is", $email) )
  				{
! 					return(0);
  				}
  			}
  			$sql = "SELECT user_email
  				FROM " . USERS_TABLE . "
  				WHERE user_email = '" . str_replace("\'", "''", $email) . "'";
! 			if(!$result = $db->sql_query($sql))
  			{
  				message_die(GENERAL_ERROR, "Couldn't obtain user email information.", "", __LINE__, __FILE__, $sql);
  			}
! 			$email_taken = $db->sql_fetchrow($result);
! 			if($email_taken['user_email'] != "")
  			{
! 				return false;
  			}
  
! 			return true;
  		}
- 		else
- 		{
- 			return false;
- 		}
- 	}
- 	else
- 	{
- 		return false;
  	}
  }
  
--- 54,87 ----
  			$sql = "SELECT ban_email
  				FROM " . BANLIST_TABLE;
! 			if ( $result = $db->sql_query($sql) )
  			{
! 				while( $row = $db->sql_fetchrow($result) )
  				{
! 					$match_email = str_replace("*@", ".*@", $row['ban_email']);
! 					if ( preg_match("/^" . $match_email . "$/is", $email) )
! 					{
! 						return array('error' => $lang['Email_banned']);
! 					}
  				}
  			}
+ 
  			$sql = "SELECT user_email
  				FROM " . USERS_TABLE . "
  				WHERE user_email = '" . str_replace("\'", "''", $email) . "'";
! 			if ( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't obtain user email information.", "", __LINE__, __FILE__, $sql);
  			}
! 
! 			if ( $email_taken = $db->sql_fetchrow($result) )
  			{
! 				return array('error' => $lang['Email_taken']);
  			}
  
! 			return array('error' => '');
  		}
  	}
+ 
+ 	return array('error' => $lang['Email_invalid']);
  }
  
***************
*** 584,587 ****
--- 577,585 ----
  					$error_msg = $lang['Password_mismatch'];
  				}
+ 				else if( strlen($password) > 32 )
+ 				{
+ 					$error = TRUE;
+ 					$error_msg = $lang['Password_long'];
+ 				}
  				else
  				{
***************
*** 625,636 ****
  			if( $email != $userdata['user_email'] || $mode == "register" )
  			{
! 				if( !validate_email($email) )
  				{
  					$error = TRUE;
  					if(isset($error_msg))
  					{
  						$error_msg .= "<br />";
  					}
- 					$error_msg .= $lang['Sorry_banned_or_taken_email'];
  				}
  			}
--- 623,660 ----
  			if( $email != $userdata['user_email'] || $mode == "register" )
  			{
! 				$result = validate_email($email);
! 				if( $result['error'] != '' )
  				{
+ 					$email = $userdata['user_email'];
+ 
  					$error = TRUE;
  					if(isset($error_msg))
  					{
  						$error_msg .= "<br />";
+ 					}
+ 					$error_msg .= $result['error'];
+ 				}
+ 					
+ 				if ( $mode == "editprofile" )
+ 				{
+ 					$sql = "SELECT user_password 
+ 						FROM " . USERS_TABLE . " 
+ 						WHERE user_id = $user_id";
+ 					if( $result = $db->sql_query($sql) )
+ 					{
+ 						$row = $db->sql_fetchrow($result);
+ 
+ 						if( $row['user_password'] != md5($password_current) )
+ 						{
+ 							$email = $userdata['user_email'];
+ 
+ 							$error = TRUE;
+ 							$error_msg = $lang['Current_password_mismatch'];
+ 						}
+ 					}
+ 					else
+ 					{
+ 						message_die(GENERAL_ERROR, "Couldn't obtain user_password information.", "", __LINE__, __FILE__, $sql);
  					}
  				}
  			}
***************
*** 641,652 ****
  				if( $username != $userdata['username'] || $mode == "register" )
  				{
! 					if( !validate_username($username) )
  					{
  						$error = TRUE;
! 						if( isset($error_msg) )
  						{
  							$error_msg .= "<br />";
  						}
! 						$error_msg .= $lang['Invalid_username'];
  					}
  					else
--- 665,677 ----
  				if( $username != $userdata['username'] || $mode == "register" )
  				{
! 					$result = validate_username($username);
! 					if( $result['error'] != '' )
  					{
  						$error = TRUE;
! 						if(isset($error_msg))
  						{
  							$error_msg .= "<br />";
  						}
! 						$error_msg .= $result['error'];
  					}
  					else
***************
*** 1579,1582 ****
--- 1604,1608 ----
  				"L_NEW_PASSWORD" => ( $mode == "register" ) ? $lang['Password'] : $lang['New_password'], 
  				"L_CONFIRM_PASSWORD" => $lang['Confirm_password'],
+ 				"L_CONFIRM_PASSWORD_EXPLAIN" => ($mode == "editprofile") ? $lang['Confirm_password_explain'] : "",
  				"L_PASSWORD_IF_CHANGED" => ($mode == "editprofile") ? $lang['password_if_changed'] : "",
  				"L_PASSWORD_CONFIRM_IF_CHANGED" => ($mode == "editprofile") ? $lang['password_confirm_if_changed'] : "",

[Phpbb-checkins] CVS: phpBB2 search.php,1.59,1.60

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

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

Modified Files:
	search.php 
Log Message:
Fixed stripslashing problem which would lead to incorrect search results in some cases

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** search.php	2002/01/25 02:34:49	1.59
--- search.php	2002/01/27 02:24:05	1.60
***************
*** 232,236 ****
  	
  		$split_search = array();
! 		$cleaned_search = clean_words("search", $query_keywords, $synonym_array);
  		$split_search = split_words($cleaned_search, "search");
  
--- 232,236 ----
  	
  		$split_search = array();
! 		$cleaned_search = clean_words("search", stripslashes($query_keywords), $synonym_array);
  		$split_search = split_words($cleaned_search, "search");
  
***************
*** 518,527 ****
  	}
  
- 
  	//
  	// Finish building query (for all combinations)
  	// and run it ...
  	//
! 	if( $total_match_count )
  	{
  		//
--- 518,530 ----
  	}
  
  	//
  	// Finish building query (for all combinations)
  	// and run it ...
  	//
! 	if( !$total_match_count )
! 	{
! 		message_die(GENERAL_MESSAGE, $lang['No_search_match']);
! 	}
! 	else if( $total_match_count )
  	{
  		//
***************
*** 630,637 ****
  			header("Location: " . append_sid("search.$phpEx", true));
  		}
- 	}
- 	else
- 	{
- 		message_die(GENERAL_MESSAGE, $lang['No_search_match']);
  	}
  
--- 633,636 ----

[Phpbb-checkins] CVS: phpBB2/admin index.php,1.33,1.34

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

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

Modified Files:
	index.php 
Log Message:
Remove hard-coded .php

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** index.php	2002/01/25 12:42:49	1.33
--- index.php	2002/01/27 02:19:45	1.34
***************
*** 57,61 ****
  	while( $file = @readdir($dir) )
  	{
! 		if( preg_match("/^admin_.*?\.php$/", $file) )
  		{
  			include($file);
--- 57,61 ----
  	while( $file = @readdir($dir) )
  	{
! 		if( preg_match("/^admin_.*?\." . $phpEx . "$/", $file) )
  		{
  			include($file);

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.121,1.122

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

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

Modified Files:
	viewforum.php 
Log Message:
Remove hard-coded .php

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -r1.121 -r1.122
*** viewforum.php	2002/01/27 01:56:05	1.121
--- viewforum.php	2002/01/27 02:18:32	1.122
***************
*** 170,174 ****
  	if( $forum_row['prune_next'] < time() && $forum_row['prune_enable'] )
  	{
! 		include($phpbb_root_path . 'includes/prune.php');
  		auto_prune($forum_id);
  	}
--- 170,174 ----
  	if( $forum_row['prune_next'] < time() && $forum_row['prune_enable'] )
  	{
! 		include($phpbb_root_path . 'includes/prune.$phpEx');
  		auto_prune($forum_id);
  	}

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.120,1.121

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

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

Modified Files:
	viewforum.php 
Log Message:
Fix unread marker after own post, change moderator listing method to that of index

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -r1.120 -r1.121
*** viewforum.php	2002/01/14 23:24:53	1.120
--- viewforum.php	2002/01/27 01:56:05	1.121
***************
*** 132,137 ****
  
  			$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
  
! 			if( count($tracking_forums) == 150 && empty($tracking_forums['' . $forum_id . '']) )
  			{
  				asort($tracking_forums);
--- 132,138 ----
  
  			$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
+ 			$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
  
! 			if( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums['' . $forum_id . '']) )
  			{
  				asort($tracking_forums);
***************
*** 159,167 ****
  //
  
- 
  $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : "";
  $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : "";
  
- 
  //
  // Do the forum Prune
--- 160,166 ----
***************
*** 180,231 ****
  
  //
! // Obtain list of moderators of this forum
  //
! $sql = "SELECT g.group_name, g.group_id, g.group_single_user, u.user_id, u.username
! 	FROM " . AUTH_ACCESS_TABLE . " aa,  " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
! 	WHERE aa.forum_id = $forum_id
! 		AND aa.auth_mod = " . TRUE . "
! 		AND ug.group_id = aa.group_id
! 		AND g.group_id = aa.group_id
! 		AND u.user_id = ug.user_id";
! if( !$result_mods = $db->sql_query($sql) )
  {
! 	message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql);
  }
  
! if( $total_mods = $db->sql_numrows($result_mods) )
  {
! 	$mods_rowset = $db->sql_fetchrowset($result_mods);
! 
! 	$forum_moderators = "";
! 
! 	for($i = 0; $i < $total_mods; $i++)
! 	{
! 		if( $mods_rowset[$i]['group_single_user'] )
! 		{
! 			$mod_url = "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $mods_rowset[$i]['user_id'];
! 			$mod_name = $mods_rowset[$i]['username'];
! 		}
! 		else
! 		{
! 			$mod_url = "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $mods_rowset[$i]['group_id'];
! 			$mod_name = $mods_rowset[$i]['group_name'];
! 		}
! 
! 		if( !strstr($forum_moderators, $mod_name) )
! 		{
! 			if( $i > 0 )
! 			{
! 				$forum_moderators .= ", ";
! 			}
  
! 			$forum_moderators .= "<a href=\"" . append_sid($mod_url) . "\">$mod_name</a>";
! 		}
! 	}
  }
! else
  {
! 	$forum_moderators = $lang['None'];
  }
  
  //
--- 179,227 ----
  
  //
! // Obtain list of moderators of each forum
! // First users, then groups ... broken into two queries
  //
! $sql = "SELECT u.user_id, u.username 
! 	FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
! 	WHERE aa.forum_id = $forum_id 
! 		AND aa.auth_mod = " . TRUE . " 
! 		AND g.group_single_user = 1
! 		AND ug.group_id = aa.group_id 
! 		AND g.group_id = aa.group_id 
! 		AND u.user_id = ug.user_id 
! 	GROUP BY u.user_id, u.username  
! 	ORDER BY u.user_id";
! if(!$result = $db->sql_query($sql))
  {
! 	message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
  }
  
! $moderators = array();
! while( $row = $db->sql_fetchrow($result) )
  {
! 	$moderators[] = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>';
! }
  
! $sql = "SELECT g.group_id, g.group_name 
! 	FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
! 	WHERE aa.forum_id = $forum_id
! 		AND aa.auth_mod = " . TRUE . " 
! 		AND g.group_single_user = 0
! 		AND ug.group_id = aa.group_id 
! 		AND g.group_id = aa.group_id 
! 	GROUP BY g.group_id, g.group_name  
! 	ORDER BY g.group_id";
! if(!$result = $db->sql_query($sql))
! {
! 	message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
  }
! 
! while( $row = $db->sql_fetchrow($result) )
  {
! 	$moderators[] = '<a href="' . append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>';
  }
+ 	
+ $forum_moderators = ( count($moderators) ) ? implode(", ", $moderators) : $lang['None'];
+ unset($moderators);
  
  //
***************
*** 537,546 ****
  					if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  					{
- 
  						$unread_topics = true;
  
  						if( !empty($tracking_topics['' . $topic_id . '']) )
  						{
! 							if( $tracking_topics['' . $topic_id . ''] > $topic_rowset[$i]['post_time'] )
  							{
  								$unread_topics = false;
--- 533,541 ----
  					if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  					{
  						$unread_topics = true;
  
  						if( !empty($tracking_topics['' . $topic_id . '']) )
  						{
! 							if( $tracking_topics['' . $topic_id . ''] >= $topic_rowset[$i]['post_time'] )
  							{
  								$unread_topics = false;
***************
*** 550,554 ****
  						if( !empty($tracking_forums['' . $forum_id . '']) )
  						{
! 							if( $tracking_forums['' . $forum_id . ''] > $topic_rowset[$i]['post_time'] )
  							{
  								$unread_topics = false;
--- 545,549 ----
  						if( !empty($tracking_forums['' . $forum_id . '']) )
  						{
! 							if( $tracking_forums['' . $forum_id . ''] >= $topic_rowset[$i]['post_time'] )
  							{
  								$unread_topics = false;
***************
*** 558,562 ****
  						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $topic_rowset[$i]['post_time'] )
  							{
  								$unread_topics = false;
--- 553,557 ----
  						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] >= $topic_rowset[$i]['post_time'] )
  							{
  								$unread_topics = false;

[Phpbb-checkins] CVS: phpBB2/templates/subSilver viewforum_body.tpl,1.15,1.16

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

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

Modified Files:
	viewforum_body.tpl 
Log Message:
Browsing this forum var added to template

Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewforum_body.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** viewforum_body.tpl	2002/01/14 19:38:51	1.15
--- viewforum_body.tpl	2002/01/27 01:21:06	1.16
***************
*** 3,10 ****
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left" valign="bottom" colspan="3"><a class="maintitle" href="{REQUEST_URI}">{FORUM_NAME}</a><br />
! 		<b><span class="gensmall">{L_MODERATOR}: {MODERATORS}<br />
! 		{PAGINATION}<br />
! 		&nbsp;</span></b></td>
  	</tr>
  	<tr> 
--- 3,8 ----
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{REQUEST_URI}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td>
! 	  <td align="right" valign="bottom" nowrap><span class="gensmall"><b>{PAGINATION}</b></span></td>
  	</tr>
  	<tr> 

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.93,1.94

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

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

Modified Files:
	page_header.php 
Log Message:
Uncomment and 'complete' browsing in forum online list

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** page_header.php	2002/01/25 23:22:38	1.93
--- page_header.php	2002/01/27 01:20:42	1.94
***************
*** 90,100 ****
  // situation
  //
! /*
! if( !empty($forum_id) )
! {
! 	$user_forum_sql = "AND ( u.user_session_page = $forum_id 
! 		OR s.session_page = $forum_id)";
! }
! */
  $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
  	FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
--- 90,96 ----
  // situation
  //
! $user_forum_sql = ( !empty($forum_id) ) ? "AND ( u.user_session_page = $forum_id 
! 	OR s.session_page = $forum_id)" : "";
! 
  $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
  	FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
***************
*** 102,107 ****
  		AND ( s.session_time >= ".( time() - 300 ) . " 
  			OR u.user_session_time >= " . ( time() - 300 ) . " )
  	ORDER BY u.username ASC";
- //$user_forum_sql 
  $result = $db->sql_query($sql);
  if(!$result)
--- 98,103 ----
  		AND ( s.session_time >= ".( time() - 300 ) . " 
  			OR u.user_session_time >= " . ( time() - 300 ) . " )
+ 		$user_forum_sql 
  	ORDER BY u.username ASC";
  $result = $db->sql_query($sql);
  if(!$result)
***************
*** 112,118 ****
--- 108,117 ----
  $userlist_ary = array();
  $userlist_visible = array();
+ 
  $logged_visible_online = 0;
  $logged_hidden_online = 0;
  $guests_online = 0;
+ $online_userlist = "";
+ 
  $prev_user_id = 0;
  
***************
*** 162,166 ****
  }
  
! $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
  
  $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
--- 161,169 ----
  }
  
! if( $online_userlist == "" )
! {
! 	$online_userlist = $lang['None'];
! }
! $online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . " " . $online_userlist;
  
  $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
***************
*** 240,244 ****
  }
  
- 
  $l_online_users = sprintf($l_t_user_s, $total_online_users);
  $l_online_users .= sprintf($l_r_user_s, $logged_visible_online); 
--- 243,246 ----
***************
*** 382,386 ****
  	"L_WHOSONLINE_ADMIN" => sprintf($lang['Admin_online_color'], '<span style="color:' . $theme['fontcolor3'] . '">', '</span>'), 
  	"L_WHOSONLINE_MOD" => sprintf($lang['Mod_online_color'], '<span style="color:' . $theme['fontcolor2'] . '">', '</span>'), 
! 	"L_RECORD_USERS" => sprintf($lang['Record_online_users'], $board_config['record_online_users'], date($lang['DATE_FORMAT'], $board_config['record_online_date']) ),
  
  	"U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"),
--- 384,388 ----
  	"L_WHOSONLINE_ADMIN" => sprintf($lang['Admin_online_color'], '<span style="color:' . $theme['fontcolor3'] . '">', '</span>'), 
  	"L_WHOSONLINE_MOD" => sprintf($lang['Mod_online_color'], '<span style="color:' . $theme['fontcolor2'] . '">', '</span>'), 
! 	"L_RECORD_USERS" => sprintf($lang['Record_online_users'], $board_config['record_online_users'], date($board_config['default_dateformat'], $board_config['record_online_date']) ),
  
  	"U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"),

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.78,1.79

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

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv24832/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
Add $lang['Browsing_forum'] ... at least two more additions to come

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** lang_main.php	2002/01/25 21:53:05	1.78
--- lang_main.php	2002/01/27 01:20:15	1.79
***************
*** 121,124 ****
--- 121,125 ----
  //
  $lang['Registered_users'] = "Registered Users:";
+ $lang['Browsing_forum'] = "Users browsing this forum:";
  $lang['Online_users_zero_total'] = "In total there are <b>0</b> users online :: ";
  $lang['Online_users_total'] = "In total there are <b>%d</b> users online :: ";
***************
*** 454,457 ****
--- 455,462 ----
  $lang['No_to_user'] = "You must specify a username to send this message";
  $lang['No_such_user'] = "Sorry but no such user exists";
+ 
+ $lang['Disable_HTML_pm'] = "Disable HTML in this message";
+ $lang['Disable_BBCode_pm'] = "Disable BBCode in this message";
+ $lang['Disable_Smilies_pm'] = "Disable Smilies in this message";
  
  $lang['Message_sent'] = "Your message has been sent";

[Phpbb-checkins] CVS: phpBB2 index.php,1.90,1.91

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

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

Modified Files:
	index.php 
Log Message:
Numerous updates and changes

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** index.php	2002/01/12 17:00:31	1.90
--- index.php	2002/01/27 00:55:20	1.91
***************
*** 34,38 ****
  //
  
! $viewcat = (!empty($HTTP_GET_VARS[POST_CAT_URL])) ? $HTTP_GET_VARS[POST_CAT_URL] : -1;
  
  if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) )
--- 34,38 ----
  //
  
! $viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1;
  
  if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) )
***************
*** 52,73 ****
  	if( $userdata['session_logged_in'] )
  	{
! 		$sql = "SELECT MAX(post_time) AS last_post 
! 			FROM " . POSTS_TABLE;
! 		if(!$result = $db->sql_query($sql))
! 		{
! 			message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
! 		}
! 
! 		if( $forum_count = $db->sql_numrows($result) )
! 		{
! 			$mark_read_list = $db->sql_fetchrow($result);
! 
! 			$last_post_time = $mark_read_list['last_post'];
! 
! 			if( $last_post_time > $userdata['user_lastvisit'] ) 
! 			{
! 				setcookie($board_config['cookie_name'] . "_f_all", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! 			}
! 		}
  	}
  
--- 52,56 ----
  	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']);
  	}
  
***************
*** 85,93 ****
  //
  
- 
  $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : "";
  $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : "";
  
- 
  //
  // If you don't use these stats on your index
--- 68,74 ----
***************
*** 133,151 ****
  //
  $sql = "SELECT c.cat_id, c.cat_title, c.cat_order
! 	FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f
! 	WHERE f.cat_id = c.cat_id
! 	GROUP BY c.cat_id, c.cat_title, c.cat_order
  	ORDER BY c.cat_order";
! if(!$q_categories = $db->sql_query($sql))
  {
  	message_die(GENERAL_ERROR, "Could not query categories list", "", __LINE__, __FILE__, $sql);
  }
- 
- if($total_categories = $db->sql_numrows($q_categories))
- {
- 	$category_rows = $db->sql_fetchrowset($q_categories);
  
! 	$limit_forums = "";
  
  	//
  	// Define appropriate SQL
--- 114,128 ----
  //
  $sql = "SELECT c.cat_id, c.cat_title, c.cat_order
! 	FROM " . CATEGORIES_TABLE . " c 
  	ORDER BY c.cat_order";
! if( !($result = $db->sql_query($sql)) )
  {
  	message_die(GENERAL_ERROR, "Could not query categories list", "", __LINE__, __FILE__, $sql);
  }
  
! while( $category_rows[] = $db->sql_fetchrow($result) );
  
+ if( ( $total_categories = count($category_rows) ) )
+ {
  	//
  	// Define appropriate SQL
***************
*** 154,164 ****
  	{
  		case 'postgresql':
- 			$limit_forums = ($viewcat != -1) ? "AND f.cat_id = $viewcat " : "";
- 
  			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id 
  				FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u
  				WHERE p.post_id = f.forum_last_post_id 
  					AND u.user_id = p.poster_id  
- 					$limit_forums
  					UNION (
  						SELECT f.*, NULL, NULL, NULL, NULL
--- 131,138 ----
***************
*** 169,173 ****
  							WHERE p.post_id = f.forum_last_post_id  
  						)
- 						$limit_forums
  					)
  					ORDER BY cat_id, forum_order";
--- 143,146 ----
***************
*** 175,224 ****
  
  		case 'oracle':
- 			$limit_forums = ($viewcat != -1) ? "AND f.cat_id = $viewcat " : "";
- 
  			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id 
  				FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u
  				WHERE p.post_id = f.forum_last_post_id(+)
  					AND u.user_id = p.poster_id(+)
- 					$limit_forums
  				ORDER BY f.cat_id, f.forum_order";
  			break;
  
  		default:
- 			$limit_forums = ($viewcat != -1) ? "WHERE f.cat_id = $viewcat " : "";
- 
  			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id
  				FROM (( " . FORUMS_TABLE . " f
  				LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id )
  				LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id )
- 				$limit_forums
  				ORDER BY f.cat_id, f.forum_order";
  			break;
  	}
! 
! 	if(!$q_forums = $db->sql_query($sql))
  	{
  		message_die(GENERAL_ERROR, "Could not query forums information", "", __LINE__, __FILE__, $sql);
  	}
! 	if( !$total_forums = $db->sql_numrows($q_forums) )
  	{
  		message_die(GENERAL_MESSAGE, $lang['No_forums']);
  	}
- 	$forum_rows = $db->sql_fetchrowset($q_forums);
  
  	if( $userdata['session_logged_in'] )
  	{
! 		$sql = "SELECT f.forum_id, t.topic_id, p.post_time
! 			FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p
! 			WHERE t.forum_id = f.forum_id
! 				AND p.post_id = t.topic_last_post_id
  				AND p.post_time > " . $userdata['user_lastvisit'] . " 
! 				AND t.topic_moved_id = 0";
! 		if(!$new_topic_ids = $db->sql_query($sql))
  		{
  			message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
  		}
  
! 		while( $topic_data = $db->sql_fetchrow($new_topic_ids) )
  		{
  			$new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time'];
--- 148,199 ----
  
  		case 'oracle':
  			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id 
  				FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u
  				WHERE p.post_id = f.forum_last_post_id(+)
  					AND u.user_id = p.poster_id(+)
  				ORDER BY f.cat_id, f.forum_order";
  			break;
  
  		default:
  			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id
  				FROM (( " . FORUMS_TABLE . " f
  				LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id )
  				LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id )
  				ORDER BY f.cat_id, f.forum_order";
  			break;
  	}
! 	if( !($result = $db->sql_query($sql)) )
  	{
  		message_die(GENERAL_ERROR, "Could not query forums information", "", __LINE__, __FILE__, $sql);
+ 	}
+ 
+ 	$forum_data = array();
+ 	while( $row = $db->sql_fetchrow($result) )
+ 	{
+ 		$forum_data[] = $row;
  	}
! 
! 	if( !($total_forums = count($forum_data)) )
  	{
  		message_die(GENERAL_MESSAGE, $lang['No_forums']);
  	}
  
+ 	//
+ 	// Obtain a list of topic ids which contain
+ 	// posts made since user last visited
+ 	//
  	if( $userdata['session_logged_in'] )
  	{
! 		$sql = "SELECT t.forum_id, t.topic_id, p.post_time 
! 			FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p 
! 			WHERE p.post_id = t.topic_last_post_id 
  				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);
  		}
  
! 		while( $topic_data = $db->sql_fetchrow($result) )
  		{
  			$new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time'];
***************
*** 228,261 ****
  	//
  	// Obtain list of moderators of each forum
  	//
! 	$sql = "SELECT aa.forum_id, g.group_name, g.group_id, g.group_single_user, u.user_id, u.username
  		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
! 		WHERE aa.auth_mod = " . TRUE . "
  			AND ug.group_id = aa.group_id 
  			AND g.group_id = aa.group_id 
  			AND u.user_id = ug.user_id 
! 		ORDER BY aa.forum_id, g.group_id, u.user_id";
! 	if(!$q_forum_mods = $db->sql_query($sql))
  	{
  		message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
  	}
- 	$forum_mods_list = $db->sql_fetchrowset($q_forum_mods);
  
! 	for($i = 0; $i < count($forum_mods_list); $i++)
  	{
! 		if($forum_mods_list[$i]['group_single_user'] || !$forum_mods_list[$i]['group_id'])
! 		{
! 			$forum_mods_single_user[$forum_mods_list[$i]['forum_id']][] = 1;
  
! 			$forum_mods_name[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['username'];
! 			$forum_mods_id[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['user_id'];
! 		}
! 		else
! 		{
! 			$forum_mods_single_user[$forum_mods_list[$i]['forum_id']][] = 0;
  
! 			$forum_mods_name[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['group_name'];
! 			$forum_mods_id[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['group_id'];
! 		}
  	}
  
--- 203,244 ----
  	//
  	// Obtain list of moderators of each forum
+ 	// First users, then groups ... broken into two queries
  	//
! 	$sql = "SELECT aa.forum_id, u.user_id, u.username 
  		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 
  			AND u.user_id = ug.user_id 
! 		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);
  	}
  
! 	$forum_moderators = array();
! 	while( $row = $db->sql_fetchrow($result) )
  	{
! 		$forum_moderators[$row['forum_id']][] = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>';
! 	}
  
! 	$sql = "SELECT aa.forum_id, g.group_id, g.group_name 
! 		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
! 		WHERE aa.auth_mod = " . TRUE . " 
! 			AND g.group_single_user = 0
! 			AND ug.group_id = aa.group_id 
! 			AND g.group_id = aa.group_id 
! 		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);
! 	}
  
! 	while( $row = $db->sql_fetchrow($result) )
! 	{
! 		$forum_moderators[$row['forum_id']][] = '<a href="' . append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>';
  	}
  
***************
*** 264,268 ****
  	//
  	$is_auth_ary = array();
! 	$is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata, $forum_rows);
  
  	$template->set_filenames(array(
--- 247,257 ----
  	//
  	$is_auth_ary = array();
! 	$is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata, $forum_data);
! 
! 	//
! 	// Start output of page
! 	//
! 	$page_title = $lang['Index'];
! 	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
  	$template->set_filenames(array(
***************
*** 273,277 ****
  		"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'],
--- 262,266 ----
  		"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'],
***************
*** 289,458 ****
  	// Okay, let's build the index
  	//
- 	$gen_cat = array();
- 
  	for($i = 0; $i < $total_categories; $i++)
  	{
  		$cat_id = $category_rows[$i]['cat_id'];
- 
- 		$count = 0;
  
  		for($j = 0; $j < $total_forums; $j++)
  		{
! 			$forum_id = $forum_rows[$j]['forum_id'];
! 
! 			if( $is_auth_ary[$forum_id]['auth_view'] && ( ( $forum_rows[$j]['cat_id'] == $cat_id && $viewcat == -1 ) || $cat_id == $viewcat) )
  			{
! 				if(!$gen_cat[$cat_id])
! 				{
! 					$template->assign_block_vars("catrow", array(
! 						"CAT_ID" => $cat_id,
! 						"CAT_DESC" => $category_rows[$i]['cat_title'],
! 						"U_VIEWCAT" => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
! 					);
! 					$gen_cat[$cat_id] = 1;
! 				}
  
! 				if($forum_rows[$j]['forum_status'] == FORUM_LOCKED)
! 				{
! 					$folder_image = "<img src=\"" . $images['forum_locked'] . "\" alt=\"" . $lang['Forum_locked'] . "\" />";
! 				}
! 				else
  				{
! 					$unread_topics = false;
! 					if( $userdata['session_logged_in'] )
  					{
! 						if( count($new_topic_data[$forum_id]) )
! 						{
! 							$forum_last_post_time = 0;
  
! 							while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) )
  							{
! 								if( empty($tracking_topics['' . $check_topic_id . '']) )
! 								{
! 									$unread_topics = true;
! 									$forum_last_post_time = max($check_post_time, $forum_last_post_time);
! 
! 								}
! 								else
  								{
! 									if( $tracking_topics['' . $check_topic_id . ''] < $check_post_time )
  									{
! 										$unread_topics = true;
! 										$forum_last_post_time = max($check_post_time, $forum_last_post_time);
  									}
  								}
- 							}
  
! 							if( !empty($tracking_forums['' . $forum_id . '']) )
! 							{
! 								if( $tracking_forums['' . $forum_id . ''] > $forum_last_post_time )
! 								{
! 									$unread_topics = false;
! 								}
  							}
  
! 							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;
! 								}
! 							}
  
! 						}
! 					}
  
! 					$folder_image = ( $unread_topics ) ? "<img src=\"" . $images['forum_new'] . "\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />" : "<img src=\"" . $images['forum'] . "\" alt=\"" . $lang['No_new_posts'] . "\" title=\"" . $lang['No_new_posts'] . "\" />";
! 				}
  
! 				$posts = $forum_rows[$j]['forum_posts'];
! 				$topics = $forum_rows[$j]['forum_topics'];
  
! 				if( $forum_rows[$j]['username'] != "" && $forum_rows[$j]['post_time'] > 0 )
! 				{
! 					$last_post_time = create_date($board_config['default_dateformat'], $forum_rows[$j]['post_time'], $board_config['board_timezone']);
  
! 					$last_post = $last_post_time . "<br />";
  
! 					$last_post .= ( $forum_rows[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_rows[$j]['post_username'] != "" ) ? $forum_rows[$j]['post_username'] . " " : $lang['Guest'] . " " ) : "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $forum_rows[$j]['user_id']) . "\">" . $forum_rows[$j]['username'] . "</a> ";
! 					
! 					$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $forum_rows[$j]['forum_last_post_id']) . "#" . $forum_rows[$j]['forum_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" title=\"" . $lang['View_latest_post'] . "\" /></a>";
! 				}
! 				else
! 				{
! 					$last_post = $lang['No_Posts'];
! 				}
  
! 				$mod_count = 0;
! 				$moderators_links = "";
! 				for($mods = 0; $mods < count($forum_mods_name[$forum_id]); $mods++)
! 				{
! 					if( !strstr($moderators_links, $forum_mods_name[$forum_id][$mods]) )
! 					{
! 						if($mods > 0)
! 						{
! 							$moderators_links .= ", ";
! 						}
! 
! 						if( $forum_mods_single_user[$forum_id][$mods])
! 						{
! 							$moderators_links .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $forum_mods_id[$forum_id][$mods]) . "\">" . $forum_mods_name[$forum_id][$mods] . "</a>";
  						}
- 						else
- 						{
- 							$moderators_links .= "<a href=\"" . append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $forum_mods_id[$forum_id][$mods]) . "\">" . $forum_mods_name[$forum_id][$mods] . "</a>";
- 						}
- 
- 						$mod_count++;
  					}
  				}
- 
- 				if( $moderators_links == "" )
- 				{
- 					$moderators_links = "&nbsp;";
- 				}
- 
- 				if( $mods > 0 )
- 				{
- 					$l_moderators = ( $mods == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
- 				}
- 				else
- 				{
- 					$l_moderators = "&nbsp;";
- 				}
- 
- 				$row_color = ( !($count % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
- 				$row_class = ( !($count % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
- 
- 				$template->assign_block_vars("catrow.forumrow",	array(
- 					"ROW_COLOR" => "#" . $row_color,
- 					"ROW_CLASS" => $row_class,
- 					"FOLDER" => $folder_image,
- 					"FORUM_NAME" => $forum_rows[$j]['forum_name'],
- 					"FORUM_DESC" => $forum_rows[$j]['forum_desc'],
- 					"POSTS" => $forum_rows[$j]['forum_posts'],
- 					"TOPICS" => $forum_rows[$j]['forum_topics'],
- 					"LAST_POST" => $last_post,
- 					"MODERATORS" => $moderators_links,
- 
- 					"L_MODERATOR" => $l_moderators, 
- 
- 					"U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
- 				);
- 
- 				$count++;
  			}
- 			else if($viewcat != -1)
- 			{
- 				if(!$gen_cat[$cat_id])
- 				{
- 					$template->assign_block_vars("catrow", array(
- 						"CAT_ID" => $cat_id,
- 						"CAT_DESC" => $category_rows[$i]['cat_title'],
- 						"U_VIEWCAT" => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
- 					);
- 					$gen_cat[$cat_id] = 1;
- 				}
- 			}
  		}
  	} // for ... categories
--- 278,423 ----
  	// Okay, let's build the index
  	//
  	for($i = 0; $i < $total_categories; $i++)
  	{
  		$cat_id = $category_rows[$i]['cat_id'];
  
+ 		//
+ 		// Should we display this category/forum set?
+ 		//
+ 		$display_forums = false;
  		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;
! 			}
! 		}
  
! 		//
! 		// Yes, we should, so first dump out the category
! 		// title, then, if appropriate the forum list
! 		//
! 		if( $display_forums )
! 		{
! 			$template->assign_block_vars("catrow", array(
! 				"CAT_ID" => $cat_id,
! 				"CAT_DESC" => $category_rows[$i]['cat_title'],
! 				"U_VIEWCAT" => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
! 			);
! 
! 			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'] . '" />';
! 							}
! 							else
! 							{
! 								$unread_topics = false;
! 								if( $userdata['session_logged_in'] )
  								{
! 									if( count($new_topic_data[$forum_id]) )
  									{
! 										$forum_last_post_time = 0;
! 
! 										while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) )
! 										{
! 											if( empty($tracking_topics['' . $check_topic_id . '']) )
! 											{
! 												$unread_topics = true;
! 												$forum_last_post_time = max($check_post_time, $forum_last_post_time);
! 
! 											}
! 											else
! 											{
! 												if( $tracking_topics['' . $check_topic_id . ''] < $check_post_time )
! 												{
! 													$unread_topics = true;
! 													$forum_last_post_time = max($check_post_time, $forum_last_post_time);
! 												}
! 											}
! 										}
! 
! 										if( !empty($tracking_forums['' . $forum_id . '']) )
! 										{
! 											if( $tracking_forums['' . $forum_id . ''] > $forum_last_post_time )
! 											{
! 												$unread_topics = false;
! 											}
! 										}
! 
! 										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;
! 											}
! 										}
! 
  									}
  								}
  
! 								$folder_image = ( $unread_topics ) ? '<img src="' . $images['forum_new'] . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />' : '<img src="' . $images['forum'] . '" alt="' . $lang['No_new_posts'] . '" title="' . $lang['No_new_posts'] . '" />';
  							}
+ 
+ 							$posts = $forum_data[$j]['forum_posts'];
+ 							$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> ';
! 								
! 								$last_post .= '<a href="' . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>';
! 							}
! 							else
! 							{
! 								$last_post = $lang['No_Posts'];
! 							}
  
! 							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;";
! 							}
  
! 							$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! 							$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 							$template->assign_block_vars("catrow.forumrow",	array(
! 								"ROW_COLOR" => "#" . $row_color,
! 								"ROW_CLASS" => $row_class,
! 								"FOLDER" => $folder_image,
! 								"FORUM_NAME" => $forum_data[$j]['forum_name'],
! 								"FORUM_DESC" => $forum_data[$j]['forum_desc'],
! 								"POSTS" => $forum_data[$j]['forum_posts'],
! 								"TOPICS" => $forum_data[$j]['forum_topics'],
! 								"LAST_POST" => $last_post,
! 								"MODERATORS" => $moderator_list,
  
! 								"L_MODERATOR" => $l_moderators, 
  
! 								"U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
! 							);
  						}
  					}
  				}
  			}
  		}
  	} // for ... categories
***************
*** 463,474 ****
  	message_die(GENERAL_MESSAGE, $lang['No_forums']);
  }
- 
- //
- // Output page header and open the index body template
- // we do this here because of the mark topics read cookie
- // code
- //
- $page_title = $lang['Index'];
- include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
  //
--- 428,431 ----

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.92,1.93

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

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

Modified Files:
	page_header.php 
Log Message:
Removed INSERT code into separate routine, this separated update should be added to update_to before RC-3 is deemed final ...

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** page_header.php	2002/01/25 22:16:08	1.92
--- page_header.php	2002/01/25 23:22:38	1.93
***************
*** 166,193 ****
  $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
  
! //
! // This block of INSERTs is only here for people that are running RC1 or RC2 of phpBB2.
! // Can be removed after most of those users have migrated to a version that has inserted
! // the needed conifg keys.
! //
! if(!isset($board_config['record_online_users']) )
  {
- 	$sql = "INSERT INTO ". CONFIG_TABLE ."
- 		(config_name, config_value) VALUES ('record_online_users', '".$total_online_users."')";
- 	if( !$result = $db->sql_query($sql) )
- 	{  
- 		message_die(GENERAL_ERROR, "Couldn't insert config key 'record_online_users'", "", __LINE__, __FILE__, $sql);
- 	}
- 	$sql = "INSERT INTO ". CONFIG_TABLE ."
- 		(config_name, config_value) VALUES ('record_online_date', '".time()."')";
- 	if( !$result = $db->sql_query($sql) )
- 	{  
- 		message_die(GENERAL_ERROR, "Couldn't insert config key 'record_online_date'", "", __LINE__, __FILE__, $sql);
- 	}
- 	$board_config['record_online_users'] = $total_online_users;
- 	$board_config['record_online_date'] = time();
- }
- else if($total_online_users > $board_config['record_online_users'])
- {
  	$sql = "UPDATE " . CONFIG_TABLE . "
  		SET config_value = '$total_online_users'
--- 166,171 ----
  $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
  
! if($total_online_users > $board_config['record_online_users'])
  {
  	$sql = "UPDATE " . CONFIG_TABLE . "
  		SET config_value = '$total_online_users'
***************
*** 197,200 ****
--- 175,179 ----
  		message_die(GENERAL_ERROR, "Couldn't update online user record (nr of users)", "", __LINE__, __FILE__, $sql);
  	}
+ 
  	$sql = "UPDATE " . CONFIG_TABLE . "
  		SET config_value = '" . time() . "'
***************
*** 204,207 ****
--- 183,187 ----
  		message_die(GENERAL_ERROR, "Couldn't update online user record (date)", "", __LINE__, __FILE__, $sql);
  	}
+ 
  	$board_config['record_online_users'] = $total_online_users;
  	$board_config['record_online_date'] = time();

[Phpbb-checkins] CVS: phpBB2/develop most_users_update.php,NONE,1.1

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

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

Added Files:
	most_users_update.php 
Log Message:
Update for most online ... separated from page_header

--- NEW FILE ---
<html>
<body>
<?php

	$phpbb_root_path = "../";

	include($phpbb_root_path . 'extension.inc');
	include($phpbb_root_path . 'common.'.$phpEx);

	echo "\n<br >\n" . $sql = "INSERT INTO " . CONFIG_TABLE . "
		(config_name, config_value) VALUES ('record_online_users', '1')";
	if( !$result = $db->sql_query($sql) )
	{

		message_die(GENERAL_ERROR, "Couldn't insert config key 'record_online_users'", "", __LINE__, __FILE__, $sql);
	}

	echo "\n<br >\n" . $sql = "INSERT INTO " . CONFIG_TABLE . "
		(config_name, config_value) VALUES ('record_online_date', '".time()."')";
	if( !$result = $db->sql_query($sql) )
	{  
		message_die(GENERAL_ERROR, "Couldn't insert config key 'record_online_date'", "", __LINE__, __FILE__, $sql);
	}

	echo "\n<br />\nCOMPLETE";

?>
</body>
</html>

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.91,1.92

[Bart v. B. <ba...@us...>]

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

Modified Files:
	page_header.php 
Log Message:
Oops, why do I always screw up in the first checkin?

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** page_header.php	2002/01/25 21:53:05	1.91
--- page_header.php	2002/01/25 22:16:08	1.92
***************
*** 162,165 ****
--- 162,169 ----
  }
  
+ $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
+ 
+ $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
+ 
  //
  // This block of INSERTs is only here for people that are running RC1 or RC2 of phpBB2.
***************
*** 203,210 ****
  	$board_config['record_online_date'] = time();
  }
- 
- $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
- 
- $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
  
  if( $total_online_users == 0 )
--- 207,210 ----

[Phpbb-checkins] CVS: phpBB2/templates/subSilver index_body.tpl,1.18,1.19

[Bart v. B. <ba...@us...>]

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

Modified Files:
	index_body.tpl 
Log Message:
Implemented Record of online users

Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/index_body.tpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** index_body.tpl	2002/01/13 15:42:44	1.18
--- index_body.tpl	2002/01/25 21:53:05	1.19
***************
*** 57,61 ****
    </tr>
    <tr> 
! 	<td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE} &nbsp; [ {L_WHOSONLINE_ADMIN} ] &nbsp; [ {L_WHOSONLINE_MOD} ]<br />{LOGGED_IN_USER_LIST}</span></td>
    </tr>
  </table>
--- 57,61 ----
    </tr>
    <tr> 
! 	<td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE} &nbsp; [ {L_WHOSONLINE_ADMIN} ] &nbsp; [ {L_WHOSONLINE_MOD} ]<br />{L_RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td>
    </tr>
  </table>

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.77,1.78

[Bart v. B. <ba...@us...>]

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv5878/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
Implemented Record of online users

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** lang_main.php	2002/01/13 15:39:36	1.77
--- lang_main.php	2002/01/25 21:53:05	1.78
***************
*** 133,136 ****
--- 133,137 ----
  $lang['Guest_users_total'] = "%d Guests";
  $lang['Guest_user_total'] = "%d Guest";
+ $lang['Record_online_users'] = "Most users ever online was <b>%s</b> on %s"; // first %s = number of users, second %s is the date.
  
  $lang['Admin_online_color'] = "%sAdministrator%s";

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.90,1.91

[Bart v. B. <ba...@us...>]

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

Modified Files:
	page_header.php 
Log Message:
Implemented Record of online users

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** page_header.php	2002/01/24 02:59:21	1.90
--- page_header.php	2002/01/25 21:53:05	1.91
***************
*** 162,165 ****
--- 162,207 ----
  }
  
+ //
+ // This block of INSERTs is only here for people that are running RC1 or RC2 of phpBB2.
+ // Can be removed after most of those users have migrated to a version that has inserted
+ // the needed conifg keys.
+ //
+ if(!isset($board_config['record_online_users']) )
+ {
+ 	$sql = "INSERT INTO ". CONFIG_TABLE ."
+ 		(config_name, config_value) VALUES ('record_online_users', '".$total_online_users."')";
+ 	if( !$result = $db->sql_query($sql) )
+ 	{  
+ 		message_die(GENERAL_ERROR, "Couldn't insert config key 'record_online_users'", "", __LINE__, __FILE__, $sql);
+ 	}
+ 	$sql = "INSERT INTO ". CONFIG_TABLE ."
+ 		(config_name, config_value) VALUES ('record_online_date', '".time()."')";
+ 	if( !$result = $db->sql_query($sql) )
+ 	{  
+ 		message_die(GENERAL_ERROR, "Couldn't insert config key 'record_online_date'", "", __LINE__, __FILE__, $sql);
+ 	}
+ 	$board_config['record_online_users'] = $total_online_users;
+ 	$board_config['record_online_date'] = time();
+ }
+ else if($total_online_users > $board_config['record_online_users'])
+ {
+ 	$sql = "UPDATE " . CONFIG_TABLE . "
+ 		SET config_value = '$total_online_users'
+ 		WHERE config_name = 'record_online_users'";
+ 	if( !$result = $db->sql_query($sql) )
+ 	{
+ 		message_die(GENERAL_ERROR, "Couldn't update online user record (nr of users)", "", __LINE__, __FILE__, $sql);
+ 	}
+ 	$sql = "UPDATE " . CONFIG_TABLE . "
+ 		SET config_value = '" . time() . "'
+ 		WHERE config_name = 'record_online_date'";
+ 	if( !$result = $db->sql_query($sql) )
+ 	{
+ 		message_die(GENERAL_ERROR, "Couldn't update online user record (date)", "", __LINE__, __FILE__, $sql);
+ 	}
+ 	$board_config['record_online_users'] = $total_online_users;
+ 	$board_config['record_online_date'] = time();
+ }
+ 
  $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
  
***************
*** 360,363 ****
--- 402,406 ----
  	"L_WHOSONLINE_ADMIN" => sprintf($lang['Admin_online_color'], '<span style="color:' . $theme['fontcolor3'] . '">', '</span>'), 
  	"L_WHOSONLINE_MOD" => sprintf($lang['Mod_online_color'], '<span style="color:' . $theme['fontcolor2'] . '">', '</span>'), 
+ 	"L_RECORD_USERS" => sprintf($lang['Record_online_users'], $board_config['record_online_users'], date($lang['DATE_FORMAT'], $board_config['record_online_date']) ),
  
  	"U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"),

[Phpbb-checkins] CVS: phpBB2/db/schemas mysql_basic.sql,1.9,1.10 postgres_basic.sql,1.9,1.10

[Bart v. B. <ba...@us...>]

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

Modified Files:
	mysql_basic.sql postgres_basic.sql 
Log Message:
Implemented Record of online users

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mysql_basic.sql	2002/01/11 11:14:15	1.9
--- mysql_basic.sql	2002/01/25 21:53:05	1.10
***************
*** 54,57 ****
--- 54,59 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date', '0');
  
  

Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** postgres_basic.sql	2002/01/11 11:14:15	1.9
--- postgres_basic.sql	2002/01/25 21:53:05	1.10
***************
*** 55,58 ****
--- 55,60 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date', '0');
  
  

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

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

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

Modified Files:
	search.php 
Log Message:
Error with adding search matches, wrong variable being used for insert ... select

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/search.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** search.php	2002/01/25 00:48:46	1.3
--- search.php	2002/01/25 13:36:50	1.4
***************
*** 193,202 ****
  			}
  
- 			$word_sql_in = implode(", ", $match_word);
- 
  			$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) 
  				SELECT $post_id, word_id, $title_match  
  					FROM " . SEARCH_WORD_TABLE . " 
! 					WHERE word_text IN ($word_sql_in)"; 
  			$result = $db->sql_query($sql); 
  			if( !$result )
--- 193,200 ----
  			}
  
  			$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) 
  				SELECT $post_id, word_id, $title_match  
  					FROM " . SEARCH_WORD_TABLE . " 
! 					WHERE word_text IN ($word_text_sql)"; 
  			$result = $db->sql_query($sql); 
  			if( !$result )
***************
*** 207,211 ****
  	}
  
! 	remove_common("single", 40, $word_id_list);
  
  	return;
--- 205,209 ----
  	}
  
! 	remove_common("single", 0.4, $word_id_list);
  
  	return;

[Phpbb-checkins] CVS: phpBB2 posting.php,1.137,1.138

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

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

Modified Files:
	posting.php 
Log Message:
htmlspecialchars for subject, poll title and options

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -r1.137 -r1.138
*** posting.php	2002/01/12 17:00:32	1.137
--- posting.php	2002/01/25 12:58:24	1.138
***************
*** 382,392 ****
  $attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? 0 : $userdata['user_attachsig'] );
  
- 
- 
- 
- 
- 
- 
- 
  //
  // Here we do various lookups to find topic_id, forum_id, post_id etc.
--- 382,385 ----
***************
*** 728,732 ****
  	}
  
! 	$post_subject = trim(strip_tags($HTTP_POST_VARS['subject']));
  	if( ( $mode == "newtopic" || ( $mode == "editpost" && $is_first_post_topic ) ) && empty($post_subject) )
  	{
--- 721,725 ----
  	}
  
! 	$post_subject = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['subject'])));
  	if( ( $mode == "newtopic" || ( $mode == "editpost" && $is_first_post_topic ) ) && empty($post_subject) )
  	{
***************
*** 771,775 ****
  		if( $is_auth['auth_pollcreate'] && $is_first_post_topic )
  		{
! 			$poll_title = ( isset($HTTP_POST_VARS['poll_title']) ) ? trim(strip_tags($HTTP_POST_VARS['poll_title'])) : "";
  			$poll_length = ( isset($HTTP_POST_VARS['poll_length']) ) ? intval($HTTP_POST_VARS['poll_length']) : 0;
  			if( $poll_length < 0 )
--- 764,768 ----
  		if( $is_auth['auth_pollcreate'] && $is_first_post_topic )
  		{
! 			$poll_title = ( isset($HTTP_POST_VARS['poll_title']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['poll_title']))) : "";
  			$poll_length = ( isset($HTTP_POST_VARS['poll_length']) ) ? intval($HTTP_POST_VARS['poll_length']) : 0;
  			if( $poll_length < 0 )
***************
*** 784,788 ****
  				while( list($option_id, $option_text) = each($HTTP_POST_VARS['poll_option_text']) )
  				{
! 					$poll_option_list[$option_id] = trim(strip_tags($option_text));
  					$poll_options++;
  				}
--- 777,781 ----
  				while( list($option_id, $option_text) = each($HTTP_POST_VARS['poll_option_text']) )
  				{
! 					$poll_option_list[$option_id] = trim(strip_tags(htmlspecialchars($option_text)));
  					$poll_options++;
  				}

[Phpbb-checkins] CVS: phpBB2/admin index.php,1.32,1.33

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

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

Modified Files:
	index.php 
Log Message:
Fixed viewforum/admin_forum bug for guests

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** index.php	2002/01/11 10:26:52	1.32
--- index.php	2002/01/25 12:42:49	1.33
***************
*** 509,513 ****
  			else
  			{
! 				$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']);
  				$location = $forum_data[$onlinerow_guest[$i]['session_page']];
  			}
--- 509,513 ----
  			else
  			{
! 				$location_url = append_sid("admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']);
  				$location = $forum_data[$onlinerow_guest[$i]['session_page']];
  			}

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images icon_aim_russian.gif,NONE,1.1 icon_edit_russian.gif,NONE,1.1 icon_email_russian.gif,NONE,1.1 icon_icq_add_russian.gif,NONE,1.1 icon_ip_russian.gif,NONE,1.1 icon_msnm_russian.gif,NONE,1.1 icon_pm_russian.gif,NONE,1.1 icon_profile_russian.gif,NONE,1.1 icon_quote_russian.gif,NONE,1.1 icon_search_russian.gif,NONE,1.1 icon_www_russian.gif,NONE,1.1 icon_yim_russian.gif,NONE,1.1 msg_newpost_russian.gif,NONE,1.1 post_russian.gif,NONE,1.1 reply-locked_russian.gif,NONE,1.1 reply_russian.gif,NONE,1.1

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

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

Added Files:
	icon_aim_russian.gif icon_edit_russian.gif 
	icon_email_russian.gif icon_icq_add_russian.gif 
	icon_ip_russian.gif icon_msnm_russian.gif icon_pm_russian.gif 
	icon_profile_russian.gif icon_quote_russian.gif 
	icon_search_russian.gif icon_www_russian.gif 
	icon_yim_russian.gif msg_newpost_russian.gif post_russian.gif 
	reply-locked_russian.gif reply_russian.gif 
Log Message:
Initial version by borz_off

--- NEW FILE ---
GIF89a8
‡˜˜›œ=!c"‚56
˜£„vwž=
º»/cƒ;*”–‡7'›"œ("»»×ؾ‚
!ºÍ	Øöø
½‚f6 ‚àE	‚:…hE®v
>XxÐ

+ äÃ× £G~8U
Œè  àV,8aA
E@

w"ÐÀP2“#¼h«šHhÑÂG‚Ð郢EÓ%@
--- NEW FILE ---
GIF89aG
ª«ª
g*Š€5ž8!R¤¦§¨’¬¬
Ç9É9)g‹	&T=!;==	ÁŒÃÄÅ­ÈÊééÍŠ
8.ÒÒ=T	Ú	8à‹
ÇZ‘á Q£/(ˆ•`ð%Ôn\(À·ÀÔwHf͊Cƒ	À}`%–lÄÊ<q@è
teŒ 
P€~H"T%𐢊D¹¢
<\B@4àäPN
--- NEW FILE ---
GIF89a9
d
… 4„Š Š#£¤#_…8d-
 
©¡ ¥020Ã_†'5Z)€œ 
øài@‚ä¥P@ 2\Đ¡Ã
ÈÀ….Ìø
0,Àt
7HT aǎ‹h€Cʕ¿ˆÛVº|ïÍ:tÈ 1hÛ÷Ø>Ÿ¼™

--- NEW FILE ---
GIF89a7
ñññFõFåååöööùùùÿÿ±ÿÿÿ¾¾¼éééÖãèíîîÿÿ*¤þ¤
‡»Ž
,/
8)0'
&&
/*ªÌñÌό((25Ø=qBA
ðÁÅN¸(
--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a;
>´x/42%%è=èâ'ç//½ýӆVäV‚…
:(dà
ÖÀŸrD(á„

--- NEW FILE ---
GIF89a6
œ¦§¨©œ1?œµµ6:œ:Ÿ „*¤ªÃ2ÆÇ2u»
šœ2Ù*Õ¦È7Æãþá40OÁˆ;XএC‰= *°x÷-™ŒĹø0
F
C
$ÈIÂ
2X¨± Á®>jDà
Ã
Üþ…«1
€„ÿ0 

t¶þº:}óê´4@@Gò
Ø@	`^
  
@à}Ò§ƒ<ðÃ3×àxã5èá
--- NEW FILE ---
GIF89aH
ÂÃ2­2ÇâãÉ!ë'
òò5

@Î8@Á‰ш
--- NEW FILE ---
GIF89a>
<
Å}
|
·¸4†º¤½½ÖÖÁ†ÅàÅ
	Í.•.!,¤ì#ô#
ŒøGc„>²@à@D}3ܼ)CaS<ÜX«áü*ÀȔÅ
(d›ú
x°ƒ$) 
--- NEW FILE ---
GIF89a9
PsJeT"Ñ •©z—°8á1D›¥Õ»ßð¸Ü=¤\†¼À1z…†‡ˆ‰y.)
?)‡>   Y#Šˆ# ¡#¤$a†#“ (("„žŠ¢¡¤¸¸
aˆ<­®y1´z¶
£¹º
Í
<<6½‡5-–(&8y	ßß


0#	¤1;13æ$
<&
!
ú
Ò‡'hdðÀÂnzDX‘âÁ
dh ·âÛ»
.T€
¹-Ë/ :Ó
mŸï²j!'µ
¹¸ñãk/
--- NEW FILE ---
GIF89a;
…%´9ž¸„º¢¼¦¿Õ
×0Â	 !#'ƒ &#$‡5!„**¢!
4!¦,,*¾!2
hhp
›¶-F¸0 A
(V€
--- NEW FILE ---
GIF89a;

="
ˆ‰Ø@,‚Áƒ”ÕcÁ‹\b8
^"ø
Á`C;Pd ؀A
!2°@hp‚K—ä ”Z gz¿,ºÈŒBÉÿ’5(ŒŒp@4Dx9!€Ó§1EõhÑ°¦<zˆ–1JÊ
--- NEW FILE ---
GIF89a\
`Œ©ÂÏÇÉÊñöùÝ} ÁÆÈí´|çìîùûüñéâøúûÅÍÑê„ ÿÿÿ!ù

¾
„	
a˜áy¦÷¡‡)d©å
}ä H¦8И‹ò¨
ÀaÃÔÞ°ÃP;ÙEµ<ð0#0Pق@Å
NDðI	9PR<Ö(n@
2
'8áj_1	
V0¹‰Š

	R°äe€
X°dš,	6€$Ìe¢·I6”@è@…œ€Œ¿J
ˆXéÊ@ÁX³”e.§IMjf 0nAˆ)ÈÁwˆ2ขé²èL'×ÉNàðŒ§<çIÏzÂÓ	1ˆ ‚›øC0€%
Iˆ€BÊІ:ô¡=ˆ¨D'JъZô¢ł²ƒ ! šˆÃ0àž%˜ô¤(M©JWÊҖºô¥'¦ÀMB
--- NEW FILE ---
GIF89aY
¥@Œ^dœú #ÄRr YчMÀœév)2!P¡C‰Š%ja
4N½” Ü84iÿV”x:JŠžºwÑø¹"ØÀjW®øXÇÕ'‚%Lþ@4ŠØ%K”„˜¬¡2‡,v˜’ £ÂúH0JG‹V넁¨š/˜0°e°Q
Ì`°ÃDx0áì		y¨Q3Á83†¡à†Q3$ó˜A=JeØûlÙb¯
˜£ÃuÐh
‰ÔiZ§_@
ç
£Z
`¨P…jb´Q
[ÐWn\àlC^„±
4„ñ†;íyça€aCV0
À0
[ˆEœ!Ä0‚×i©ip1…/L1f` @
_„Q„‘CPä(,0Y“š 
NPa
plBÈaÀȉ ‚˜¥–Ú€, LT-Á¥AFTðA; À€ýÁ@UàPEh

U €
ÜÀ'¤CÀ>+$0@U„Dú> 
1ÑG|pXÀXFD
gV0…°G
ôà¡	/ØQv
WȺð…-¼
	HP‚

~ð@ ;ÔDh ƒ³Ôà‹`£ÇHÆ2šñŒhü‚
¼@AB
--- NEW FILE ---
GIF89aO

;4P‰WêF!ÑóÁ
¢¢,ä=££•3jt´d‚D€Öî–Ø3"ö¦ã³’)WNA¼„ñ7,fü4‡
åΉÒs Ã($š.á‘Àj*ÙG 
àÂ
R-ñK¨pÆ
|àØÀ;ïPj$J
²
.LpDÁ…ÊYf©B
*\@„ D¡Æ	~” F”ÞÁÿ
=za¾ù)àÇâ6ôÁô@
"ˆ¶LH
>,!øNˆBÚ@2L¢»„´É"TˆB
--- NEW FILE ---
GIF89aL
u4ví"¤@’$Ÿ4fÈP3
(€1àâÛ	bÈ
LRäÁ’@Kz0 aC¤\ð Ð™
0a8œ81`ªŽ<
ú|¨‡¯(Âށ¢‚„"-1ÐÀáN
l0k-E´$ùZ!ÉÖS’háà¸xN¢D¹ªÀ‰
Üi@.˜ ¸€8@AÌ-(øb‚
Ü0

’„Ä8#
AÀÁhxĀ„àE”ùã
tRÂ;
+œ€Á
tà:4eáWtÀx,‚ÿ¤ „°‘ ;Pd"pů!t`€u䫀t /ÑÙ°C	9äQP¬ ƒ~\€CY`p‚YÔP©bm6f܁	B`¤‘¿VýëÌ̬ot\G×À
1ϖGUp@

5Ã
PpÇZ5
C¤ïºó#´ BðÇúôׯÂýøç¯ÿþúÃþ<
"ðAÄ‹X 
>Ø
	B°€.@„ '8ÁZð‚Ì I° ä!Hˆ&ÌP„˜E(L¡
WȺð….¼Aà‹@

[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.37,1.38

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

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

Modified Files:
	groupcp.php 
Log Message:
Fourth attempt at this ... stupid CVS, remove global $mode requirement

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** groupcp.php	2002/01/10 00:15:13	1.37
--- groupcp.php	2002/01/25 02:41:09	1.38
***************
*** 43,46 ****
--- 43,56 ----
  }
  
+ if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
+ {
+ 	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+ }
+ else
+ {
+ 	$mode = "";
+ }
+ 
+ 
  $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0;
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0;

[Phpbb-checkins] CVS: phpBB2 profile.php,1.171,1.172

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

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

Modified Files:
	profile.php 
Log Message:
Fix display of HTML, BBCode, Smilies status next to signature to reflect global + user settings

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -r1.171 -r1.172
*** profile.php	2002/01/24 03:19:36	1.171
--- profile.php	2002/01/25 02:37:04	1.172
***************
*** 386,390 ****
  			"L_INTERESTS" => $lang['Interests'],
  
! 			"U_SEARCH_USER" => append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=posts"),
  
  			"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
--- 386,390 ----
  			"L_INTERESTS" => $lang['Interests'],
  
! 			"U_SEARCH_USER" => append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username'])),
  
  			"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
***************
*** 1462,1469 ****
  			}
  
- 			$html_status =  ($userdata['user_allowhtml']) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
- 			$bbcode_status = ($userdata['user_allowbbcode']) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
- 			$smilies_status = ($userdata['user_allowsmile']) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
- 
  			$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
  
--- 1462,1465 ----
***************
*** 1501,1504 ****
--- 1497,1504 ----
  			}
  
+ 			$html_status =  ( $userdata['user_allowhtml'] && $board_config['allow_html'] ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
+ 			$bbcode_status = ( $userdata['user_allowbbcode'] && $board_config['allow_bbcode']  ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
+ 			$smilies_status = ( $userdata['user_allowsmile'] && $board_config['allow_smilies']  ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
+ 
  			include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
***************
*** 1547,1568 ****
  				"WEBSITE" => $website,
  				"SIGNATURE" => str_replace("<br />", "\n", $signature),
! 				"VIEW_EMAIL_YES" => ($viewemail) ? "checked=\"checked\"" : "",
! 				"VIEW_EMAIL_NO" => (!$viewemail) ? "checked=\"checked\"" : "",
! 				"HIDE_USER_YES" => (!$allowviewonline) ? "checked=\"checked\"" : "",
! 				"HIDE_USER_NO" => ($allowviewonline) ? "checked=\"checked\"" : "",
! 				"NOTIFY_PM_YES" => ($notifypm) ? "checked=\"checked\"" : "",
! 				"NOTIFY_PM_NO" => (!$notifypm) ? "checked=\"checked\"" : "",
! 				"POPUP_PM_YES" => ($popuppm) ? "checked=\"checked\"" : "",
! 				"POPUP_PM_NO" => (!$popuppm) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "checked=\"checked\"" : "",
! 				"NOTIFY_REPLY_YES" => ($notifyreply) ? "checked=\"checked\"" : "",
! 				"NOTIFY_REPLY_NO" => (!$notifyreply) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? "checked=\"checked\"" : "",
  				"ALLOW_AVATAR" => $board_config['allow_avatar_upload'],
  				"AVATAR" => $avatar_img,
--- 1547,1568 ----
  				"WEBSITE" => $website,
  				"SIGNATURE" => str_replace("<br />", "\n", $signature),
! 				"VIEW_EMAIL_YES" => ($viewemail) ? 'checked="checked"' : '',
! 				"VIEW_EMAIL_NO" => (!$viewemail) ? 'checked="checked"' : '',
! 				"HIDE_USER_YES" => (!$allowviewonline) ? 'checked="checked"' : '',
! 				"HIDE_USER_NO" => ($allowviewonline) ? 'checked="checked"' : '',
! 				"NOTIFY_PM_YES" => ($notifypm) ? 'checked="checked"' : '',
! 				"NOTIFY_PM_NO" => (!$notifypm) ? 'checked="checked"' : '',
! 				"POPUP_PM_YES" => ($popuppm) ? 'checked="checked"' : '',
! 				"POPUP_PM_NO" => (!$popuppm) ? 'checked="checked"' : '',
! 				"ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? 'checked="checked"' : '',
! 				"ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? 'checked="checked"' : '',
! 				"NOTIFY_REPLY_YES" => ($notifyreply) ? 'checked="checked"' : '',
! 				"NOTIFY_REPLY_NO" => (!$notifyreply) ? 'checked="checked"' : '',
! 				"ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? 'checked="checked"' : '',
! 				"ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? 'checked="checked"' : '',
! 				"ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? 'checked="checked"' : '',
! 				"ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? 'checked="checked"' : '',
! 				"ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? 'checked="checked"' : '',
! 				"ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? 'checked="checked"' : '',
  				"ALLOW_AVATAR" => $board_config['allow_avatar_upload'],
  				"AVATAR" => $avatar_img,

[Phpbb-checkins] CVS: phpBB2 search.php,1.58,1.59

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

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

Modified Files:
	search.php 
Log Message:
Fix bug #502174, show Guest post usernames correctly ... well as correct as they currently are

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** search.php	2002/01/25 01:46:35	1.58
--- search.php	2002/01/25 02:34:49	1.59
***************
*** 760,764 ****
  			$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $searchset[$i]['forum_id']);
  			$topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id'] . "&highlight=$highlight_active");
- 			$poster_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['user_id']);
  			$post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['post_id'] . "&highlight=$highlight_active#" . $searchset[$i]['post_id']);
  
--- 760,763 ----
***************
*** 840,843 ****
--- 839,846 ----
  				}
  
+ 				$poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $searchset[$i]['user_id']) . "\">" : "";
+ 				$poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] : $lang['Guest'] );
+ 				$poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? "</a>" : "";
+ 
  				if( $userdata['session_logged_in'] && $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
  				{
***************
*** 870,874 ****
  					"POST_SUBJECT" => $post_subject,
  					"POST_DATE" => $post_date,
! 					"POSTER_NAME" => $searchset[$i]['username'],
  					"TOPIC_REPLIES" => $searchset[$i]['topic_replies'],
  					"TOPIC_VIEWS" => $searchset[$i]['topic_views'],
--- 873,877 ----
  					"POST_SUBJECT" => $post_subject,
  					"POST_DATE" => $post_date,
! 					"POSTER_NAME" => $poster,
  					"TOPIC_REPLIES" => $searchset[$i]['topic_replies'],
  					"TOPIC_VIEWS" => $searchset[$i]['topic_views'],
***************
*** 879,884 ****
  					"U_POST" => $post_url,
  					"U_TOPIC" => $topic_url,
! 					"U_FORUM" => $forum_url,
! 					"U_USER_PROFILE" => $poster_url)
  				);
  			}
--- 882,886 ----
  					"U_POST" => $post_url,
  					"U_TOPIC" => $topic_url,
! 					"U_FORUM" => $forum_url)
  				);
  			}
***************
*** 1065,1069 ****
  				}
  
! 				$topic_poster = $searchset[$i]['username'];
  
  				$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
--- 1067,1073 ----
  				}
  
! 				$topic_poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $searchset[$i]['user_id']) . "\">" : "";
! 				$topic_poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] : $lang['Guest'] );
! 				$topic_poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? "</a>" : "";
  
  				$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
***************
*** 1071,1077 ****
  				$last_post_user = ( $searchset[$i]['id2'] == ANONYMOUS && $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $searchset[$i]['user2'];
  
! 				$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
! 				$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $searchset[$i]['id2']) . "\">" . $last_post_user . "</a>&nbsp;";
! 				$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $searchset[$i]['topic_last_post_id']) . "#" . $searchset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
  
  				$template->assign_block_vars("searchresults", array( 
--- 1075,1081 ----
  				$last_post_user = ( $searchset[$i]['id2'] == ANONYMOUS && $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $searchset[$i]['user2'];
  
! 				$last_post = $last_post_time . "<br />";
! 				$last_post .= ( $searchset[$i]['id2'] == ANONYMOUS ) ? ( ($searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] . " " : $lang['Guest'] . " " ) : "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $searchset[$i]['id2']) . "\">" . $searchset[$i]['user2'] . "</a> ";
! 				$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $searchset[$i]['topic_last_post_id']) . "#" . $searchset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" alt=\"" . $lang['View_latest_post'] . "\" title=\"" . $lang['View_latest_post'] . "\" border=\"0\" /></a>";
  
  				$template->assign_block_vars("searchresults", array( 

[Phpbb-checkins] CVS: phpBB2/templates/subSilver search_results_posts.tpl,1.8,1.9 search_results_topics.tpl,1.8,1.9

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

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

Modified Files:
	search_results_posts.tpl search_results_topics.tpl 
Log Message:
Fix bug #502174, show Guest post usernames correctly ... well as correct as they currently are

Index: search_results_posts.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/search_results_posts.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** search_results_posts.tpl	2002/01/16 17:15:02	1.8
--- search_results_posts.tpl	2002/01/25 02:34:42	1.9
***************
*** 22,26 ****
    </tr>
    <tr> 
! 	<td width="22%" align="left" valign="top" class="row1" rowspan="2"><span class="name"><a href="{searchresults.U_USER_PROFILE}" class="name"><b>{searchresults.POSTER_NAME}</b></a></span><br />
  	  <br />
  	  <span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />
--- 22,26 ----
    </tr>
    <tr> 
! 	<td width="22%" align="left" valign="top" class="row1" rowspan="2"><span class="name"><b>{searchresults.POSTER_NAME}</b></span><br />
  	  <br />
  	  <span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />

Index: search_results_topics.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/search_results_topics.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** search_results_topics.tpl	2001/12/19 17:14:46	1.8
--- search_results_topics.tpl	2002/01/25 02:34:42	1.9
***************
*** 27,31 ****
  	<td class="row1"><span class="forumlink"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></span></td>
  	<td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><br /><span class="gensmall">{searchresults.GOTO_PAGE}</span></td>
! 	<td class="row1" align="center" valign="middle"><span class="name"><a href="{searchresults.U_TOPIC_POSTER_PROFILE}" class="name">{searchresults.TOPIC_POSTER}</a></span></td>
  	<td class="row2" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td>
  	<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td>
--- 27,31 ----
  	<td class="row1"><span class="forumlink"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></span></td>
  	<td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><br /><span class="gensmall">{searchresults.GOTO_PAGE}</span></td>
! 	<td class="row1" align="center" valign="middle"><span class="name">{searchresults.TOPIC_POSTER}</span></td>
  	<td class="row2" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td>
  	<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td>