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

[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.29,1.30

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

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

Modified Files:
	bbcode.php 
Log Message:
Minor change to email match

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** bbcode.php	8 Feb 2002 01:33:36 -0000	1.29
--- bbcode.php	12 Feb 2002 17:53:20 -0000	1.30
***************
*** 210,214 ****
  
  	// [email]us...@do...[/email] code..
! 	$patterns[5] = "#\[email\]([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]+)\[/email\]#si";
  	$replacements[5] = $bbcode_tpl['email'];
  
--- 210,214 ----
  
  	// [email]us...@do...[/email] code..
! 	$patterns[5] = "#\[email\]([a-z0-9\-_.]+?@[\w\-]+\.[\w\-\.]+\.[\w]+)\[/email\]#si";
  	$replacements[5] = $bbcode_tpl['email'];
  
***************
*** 612,618 ****
  
  	// matches an email@domain type address at the start of a line, or after a space.
! 	// Note: before the @ sign, the only valid characters are the alphanums and "-", "_", or ".".
! 	// After the @ sign, we accept anything up to the first space, linebreak, or comma.
! 	$ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([^, \n\r]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
  
  	// Remove our padding..
--- 612,617 ----
  
  	// matches an email@domain type address at the start of a line, or after a space.
! 	// Note: Only the followed chars are valid; alphanums, "-", "_" and or ".".
! 	$ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([\w\-]+\.[\w\-\.]+\.[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
  
  	// Remove our padding..

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.115,1.116

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

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

Modified Files:
	functions.php 
Log Message:
Change way error is returned to validate email/username, fixes problem with lack of language support for error output and subsequent doubled username, etc. issues + remove get_userdata_from_id and use get_userdata instead + other minor changes

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** functions.php	9 Feb 2002 15:54:40 -0000	1.115
--- functions.php	12 Feb 2002 17:14:39 -0000	1.116
***************
*** 75,101 ****
  }
  
! function get_userdata_from_id($user_id)
  {
  	global $db;
  
  	$sql = "SELECT *
! 		FROM " . USERS_TABLE . "
! 		WHERE user_id = $user_id";
! 	if ( !($result = $db->sql_query($sql)) )
[...971 lines suppressed...]
  		{
  			include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
***************
*** 1066,1070 ****
  
  	exit;
- 
  }
  
--- 1030,1033 ----
***************
*** 1087,1089 ****
  }
  
! ?>
--- 1050,1052 ----
  }
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 profile.php,1.176,1.177

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

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

Modified Files:
	profile.php 
Log Message:
Change way error is returned to validate email/username, fixes problem with lack of language support for error output and subsequent doubled username, etc. issues

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -r1.176 -r1.177
*** profile.php	28 Jan 2002 12:37:41 -0000	1.176
--- profile.php	12 Feb 2002 17:14:01 -0000	1.177
***************
*** 93,99 ****
  	global $db, $lang;
  
! 	if($email != "")
  	{
! 		if( preg_match("/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is", $email) )
  		{
  			$sql = "SELECT ban_email
--- 93,99 ----
  	global $db, $lang;
  
! 	if ( $email != "" )
  	{
! 		if ( preg_match("/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is", $email) )
  		{
  			$sql = "SELECT ban_email
***************
*** 106,110 ****
  					if ( preg_match("/^" . $match_email . "$/is", $email) )
  					{
! 						return array('error' => $lang['Email_banned']);
  					}
  				}
--- 106,110 ----
  					if ( preg_match("/^" . $match_email . "$/is", $email) )
  					{
! 						return array('error' => true, 'error_msg' => $lang['Email_banned']);
  					}
  				}
***************
*** 121,132 ****
  			if ( $email_taken = $db->sql_fetchrow($result) )
  			{
! 				return array('error' => $lang['Email_taken']);
  			}
  
! 			return array('error' => '');
  		}
  	}
  
! 	return array('error' => $lang['Email_invalid']);
  }
  
--- 121,132 ----
  			if ( $email_taken = $db->sql_fetchrow($result) )
  			{
! 				return array('error' => true, 'error_msg' => $lang['Email_taken']);
  			}
  
! 			return array('error' => false, 'error_msg' => '');
  		}
  	}
  
! 	return array('error' => true, 'error_msg' => $lang['Email_invalid']);
  }
  
***************
*** 235,244 ****
  	if ( $mode == "viewprofile" )
  	{
- 
  		if ( empty($HTTP_GET_VARS[POST_USERS_URL]) || $HTTP_GET_VARS[POST_USERS_URL] == ANONYMOUS )
  		{
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  		}
! 		$profiledata = get_userdata_from_id(intval($HTTP_GET_VARS[POST_USERS_URL]));
  
  		$sql = "SELECT *
--- 235,243 ----
  	if ( $mode == "viewprofile" )
  	{
  		if ( empty($HTTP_GET_VARS[POST_USERS_URL]) || $HTTP_GET_VARS[POST_USERS_URL] == ANONYMOUS )
  		{
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  		}
! 		$profiledata = get_userdata(intval($HTTP_GET_VARS[POST_USERS_URL]));
  
  		$sql = "SELECT *
***************
*** 671,675 ****
  			{
  				$result = validate_email($email);
! 				if( $result['error'] != '' )
  				{
  					$email = $userdata['user_email'];
--- 670,674 ----
  			{
  				$result = validate_email($email);
! 				if( $result['error'] )
  				{
  					$email = $userdata['user_email'];
***************
*** 680,684 ****
  						$error_msg .= "<br />";
  					}
! 					$error_msg .= $result['error'];
  				}
  					
--- 679,683 ----
  						$error_msg .= "<br />";
  					}
! 					$error_msg .= $result['error_msg'];
  				}
  					
***************
*** 713,717 ****
  				{
  					$result = validate_username($username);
! 					if( $result['error'] != '' )
  					{
  						$error = TRUE;
--- 712,716 ----
  				{
  					$result = validate_username($username);
! 					if( $result['error'] )
  					{
  						$error = TRUE;
***************
*** 720,724 ****
  							$error_msg .= "<br />";
  						}
! 						$error_msg .= $result['error'];
  					}
  					else
--- 719,723 ----
  							$error_msg .= "<br />";
  						}
! 						$error_msg .= $result['error_msg'];
  					}
  					else

[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.43,1.44

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

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

Modified Files:
	admin_users.php 
Log Message:
Fix bug with auth access entries not being deleted along with user

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** admin_users.php	12 Feb 2002 15:44:30 -0000	1.43
--- admin_users.php	12 Feb 2002 17:12:44 -0000	1.44
***************
*** 159,163 ****
  		$occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
  		$interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
! 		$signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(strip_tags(str_replace("<br />", "\n", $HTTP_POST_VARS['signature']))) : "";
  
  		validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
--- 159,163 ----
  		$occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
  		$interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
! 		$signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(str_replace("<br />", "\n", $HTTP_POST_VARS['signature'])) : "";
  
  		validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
***************
*** 286,291 ****
  		{
  			// User is (made) inactive. Delete all their sessions.
! 			$sql = "DELETE FROM ". SESSIONS_TABLE ." WHERE session_user_id = $user_id";
! 			if( !$result = $db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't delete this user's sessions", "", __LINE__, __FILE__, $sql);
--- 286,292 ----
  		{
  			// User is (made) inactive. Delete all their sessions.
! 			$sql = "DELETE FROM " . SESSIONS_TABLE . " 
! 				WHERE session_user_id = $user_id";
! 			if( !$db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't delete this user's sessions", "", __LINE__, __FILE__, $sql);
***************
*** 296,315 ****
  		{
  			$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
! 			if( $board_config['allow_html'] )
  			{
  				$sig_length_check = preg_replace("/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is", "\\1\\3\\4", $sig_length_check);
  			}
  
  			// Only create a new bbcode_uid when there was no uid yet.
! 			if($signature_bbcode_uid == '')
  			{
! 				$signature_bbcode_uid = ( $board_config['allow_bbcode'] ) ? make_bbcode_uid() : "";
  			}
! 			$signature = prepare_message($signature, $board_config['allow_html'], $board_config['allow_bbcode'], $board_config['allow_smilies'], $signature_bbcode_uid);
  
! 			if( strlen($sig_length_check) > $board_config['max_sig_chars'] )
! 			{
  				$error = TRUE;
! 				if( isset($error_msg) )
  				{
  					$error_msg .= "<br />";
--- 297,317 ----
  		{
  			$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
! 			if ( $allowhtml )
  			{
  				$sig_length_check = preg_replace("/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is", "\\1\\3\\4", $sig_length_check);
  			}
+ 			$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
  
  			// Only create a new bbcode_uid when there was no uid yet.
! 			if ( $signature_bbcode_uid == '' )
  			{
! 				$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
  			}
! 			$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
  
! 			if ( strlen($sig_length_check) > $board_config['max_sig_chars'] )
! 			{ 
  				$error = TRUE;
! 				if ( isset($error_msg) )
  				{
  					$error_msg .= "<br />";
***************
*** 598,602 ****
  						AND g.group_id = ug.group_id 
  						AND g.group_single_user = 1";
! 				if( !$result = $db->sql_query($sql) )
  				{
  					message_die(GENERAL_ERROR, "Couldn't obtain group information for this user", "", __LINE__, __FILE__, $sql);
--- 600,604 ----
  						AND g.group_id = ug.group_id 
  						AND g.group_single_user = 1";
! 				if( !($result = $db->sql_query($sql)) )
  				{
  					message_die(GENERAL_ERROR, "Couldn't obtain group information for this user", "", __LINE__, __FILE__, $sql);
***************
*** 606,669 ****
  				
  				$sql = "UPDATE " . POSTS_TABLE . "
! 					SET poster_id = '-1', post_username = '$username' 
  					WHERE poster_id = $user_id";
! 				if( $result = $db->sql_query($sql) )
  				{
! 					$sql = "UPDATE " . TOPICS_TABLE . "
! 						SET topic_poster = '-1'
! 						WHERE topic_poster = $user_id";
! 					if( $result = $db->sql_query($sql) )
! 					{
! 						$sql = "DELETE FROM " . USERS_TABLE . "
! 							WHERE user_id = $user_id";
! 						if( $result = $db->sql_query($sql) )
! 						{
! 							$sql = "DELETE FROM " . USER_GROUP_TABLE . "
! 								WHERE user_id = $user_id";
! 							if( $result = $db->sql_query($sql) )
! 							{
! 								$sql = "DELETE FROM " . GROUPS_TABLE . "
! 									WHERE group_id = " . $row['group_id'];
! 								if( $result = $db->sql_query($sql) )
! 								{
! 									$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
! 										WHERE user_id = $user_id";
! 									$result = @$db->sql_query($sql);
  
! 									$message = $lang['User_deleted'];
! 								}
! 								else
! 								{
! 									$error = TRUE;
! 								}
! 							}
! 							else
! 							{
! 								$error = TRUE;
! 							}
! 						}
! 						else
! 						{
! 							$error = TRUE;
! 						}
! 					}
! 					else
! 					{
! 						$error = TRUE;
! 					}
  				}
! 				else
  				{
! 					$error = TRUE;
  				}
  
! 				if( $error == TRUE )
  				{
! 					if( isset($error_msg) )
! 					{
! 						$error_msg .= "<br />";
! 					}
! 					$error_msg .= $lang['Admin_user_fail'];
  				}
  			}
  			else
--- 608,663 ----
  				
  				$sql = "UPDATE " . POSTS_TABLE . "
! 					SET poster_id = " . ANONYMOUS . ", post_username = '$username' 
  					WHERE poster_id = $user_id";
! 				if( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't update posts for this user", "", __LINE__, __FILE__, $sql);
! 				}
  
! 				$sql = "UPDATE " . TOPICS_TABLE . "
! 					SET topic_poster = " . ANONYMOUS . " 
! 					WHERE topic_poster = $user_id";
! 				if( !$db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't update topics for this user", "", __LINE__, __FILE__, $sql);
  				}
! 
! 				$sql = "DELETE FROM " . USERS_TABLE . "
! 					WHERE user_id = $user_id";
! 				if( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't delete user", "", __LINE__, __FILE__, $sql);
  				}
  
! 				$sql = "DELETE FROM " . USER_GROUP_TABLE . "
! 					WHERE user_id = $user_id";
! 				if( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't delete user from user_group table", "", __LINE__, __FILE__, $sql);
! 				}
! 
! 				$sql = "DELETE FROM " . GROUPS_TABLE . "
! 					WHERE group_id = " . $row['group_id'];
! 				if( !$db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't delete group for this user", "", __LINE__, __FILE__, $sql);
! 				}
! 
! 				$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! 					WHERE group_id = " . $row['group_id'];
! 				if( !$db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't delete group for this user", "", __LINE__, __FILE__, $sql);
  				}
+ 
+ 				$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
+ 					WHERE user_id = $user_id";
+ 				if ( !$db->sql_query($sql) )
+ 				{
+ 					message_die(GENERAL_ERROR, "Couldn't delete user from topic watch table", "", __LINE__, __FILE__, $sql);
+ 				}
+ 
+ 				$message = $lang['User_deleted'];
+ 
  			}
  			else

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.176,1.177

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

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

Modified Files:
	viewtopic.php 
Log Message:
Minor update to topic notification which should put an end to a rare bug

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -r1.176 -r1.177
*** viewtopic.php	11 Feb 2002 13:00:08 -0000	1.176
--- viewtopic.php	12 Feb 2002 17:04:11 -0000	1.177
***************
*** 216,225 ****
  
  //
! // Is user watching this thread? This could potentially
! // be combined into the above query but the LEFT JOIN causes
! // a number of problems which will probably end up in this
! // solution being practically as fast and certainly simpler!
  //
! if( $userdata['user_id'] != ANONYMOUS )
  {
  	$can_watch_topic = TRUE;
--- 216,222 ----
  
  //
! // Is user watching this thread? 
  //
! if( $userdata['session_logged_in'] )
  {
  	$can_watch_topic = TRUE;
***************
*** 229,237 ****
  		WHERE topic_id = $topic_id
  			AND user_id = " . $userdata['user_id'];
! 	if( !$result = $db->sql_query($sql) )
  	{
  		message_die(GENERAL_ERROR, "Couldn't obtain topic watch information", "", __LINE__, __FILE__, $sql);
  	}
! 	else if( $db->sql_numrows($result) )
  	{
  		if( isset($HTTP_GET_VARS['unwatch']) )
--- 226,235 ----
  		WHERE topic_id = $topic_id
  			AND user_id = " . $userdata['user_id'];
! 	if( !($result = $db->sql_query($sql)) )
  	{
  		message_die(GENERAL_ERROR, "Couldn't obtain topic watch information", "", __LINE__, __FILE__, $sql);
  	}
! 
! 	if( $row = $db->sql_fetchrow($result) )
  	{
  		if( isset($HTTP_GET_VARS['unwatch']) )
***************
*** 255,259 ****
  			);
  
! 			$message = $lang['No_longer_watching']. "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start") . "\">", "</a>");
  			message_die(GENERAL_MESSAGE, $message);
  		}
--- 253,257 ----
  			);
  
! 			$message = $lang['No_longer_watching'] . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start") . '">', '</a>');
  			message_die(GENERAL_MESSAGE, $message);
  		}
***************
*** 262,268 ****
  			$is_watching_topic = TRUE;
  
! 			$watch_data = $db->sql_fetchrow($result);
! 
! 			if( $watch_data['notify_status'] )
  			{
  				$sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : "";
--- 260,264 ----
  			$is_watching_topic = TRUE;
  
! 			if( $row['notify_status'] )
  			{
  				$sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : "";
***************
*** 299,303 ****
  			);
  
! 			$message = $lang['You_are_watching']. "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start") . "\">", "</a>");
  			message_die(GENERAL_MESSAGE, $message);
  		}
--- 295,299 ----
  			);
  
! 			$message = $lang['You_are_watching'] . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start") . '">', '</a>');
  			message_die(GENERAL_MESSAGE, $message);
  		}
***************
*** 363,373 ****
  }
  
! $select_post_days = "<select name=\"postdays\">";
  for($i = 0; $i < count($previous_days); $i++)
  {
  	$selected = ($post_days == $previous_days[$i]) ? ' selected="selected"' : '';
! 	$select_post_days .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>";
  }
! $select_post_days .= "</select>";
  
  //
--- 359,369 ----
  }
  
! $select_post_days = '<select name="postdays">';
  for($i = 0; $i < count($previous_days); $i++)
  {
  	$selected = ($post_days == $previous_days[$i]) ? ' selected="selected"' : '';
! 	$select_post_days .= '<option value="' . $previous_days[$i] . '"' . $selected . '>' . $previous_days_text[$i] . '</option>';
  }
! $select_post_days .= '</select>';
  
  //
***************
*** 385,398 ****
  }
  
! $select_post_order = "<select name=\"postorder\">";
  if($post_time_order == "ASC")
  {
! 	$select_post_order .= "<option value=\"asc\" selected=\"selected\">" . $lang['Oldest_First'] . "</option><option value=\"desc\">" . $lang['Newest_First'] . "</option>";
  }
  else
  {
! 	$select_post_order .= "<option value=\"asc\">" . $lang['Oldest_First'] . "</option><option value=\"desc\" selected=\"selected\">" . $lang['Newest_First'] . "</option>";
  }
! $select_post_order .= "</select>";
  
  //
--- 381,394 ----
  }
  
! $select_post_order = '<select name="postorder">';
  if($post_time_order == "ASC")
  {
! 	$select_post_order .= '<option value="asc" selected="selected">' . $lang['Oldest_First'] . '</option><option value="desc">' . $lang['Newest_First'] . '</option>';
  }
  else
  {
! 	$select_post_order .= '<option value="asc">' . $lang['Oldest_First'] . '</option><option value="desc" selected="selected">' . $lang['Newest_First'] . '</option>';
  }
! $select_post_order .= '</select>';
  
  //

[Phpbb-checkins] CVS: phpBB2/db mysql.php,1.14,1.15 mysql4.php,1.2,1.3

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

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

Modified Files:
	mysql.php mysql4.php 
Log Message:
unset stored values of row and rowset upon freeresult

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** mysql.php	28 Jan 2002 17:24:45 -0000	1.14
--- mysql.php	12 Feb 2002 16:59:49 -0000	1.15
***************
*** 306,313 ****
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			$result = @mysql_free_result($query_id);
! 			return $result;
  		}
  		else
--- 306,318 ----
  			$query_id = $this->query_result;
  		}
! 
! 		if ( $query_id )
  		{
! 			unset($this->row[$query_id]);
! 			unset($this->rowset[$query_id]);
! 
! 			@mysql_free_result($query_id);
! 
! 			return true;
  		}
  		else

Index: mysql4.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql4.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mysql4.php	28 Jan 2002 17:24:45 -0000	1.2
--- mysql4.php	12 Feb 2002 16:59:49 -0000	1.3
***************
*** 298,302 ****
  		}
  
! 		return ( $query_id ) ? mysql_free_result($query_id) : false;
  	}
  
--- 298,314 ----
  		}
  
! 		if ( $query_id )
! 		{
! 			unset($this->row[$query_id]);
! 			unset($this->rowset[$query_id]);
! 
! 			mysql_free_result($query_id);
! 
! 			return true;
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  

[Phpbb-checkins] CVS: phpBB2/templates/subSilver privmsgs_read_body.tpl,1.11,1.12

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

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

Modified Files:
	privmsgs_read_body.tpl 
Log Message:
Resolve Netscape 4.x issue with page display problems due to ICQ icon

Index: privmsgs_read_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/privmsgs_read_body.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** privmsgs_read_body.tpl	6 Jan 2002 00:51:46 -0000	1.11
--- privmsgs_read_body.tpl	12 Feb 2002 15:54:49 -0000	1.12
***************
*** 54,58 ****
  			  {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG}</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><script language="JavaScript" type="text/javascript"><!-- 
  
! 		document.write('<div style="position:relative"><div style="position:absolute">{ICQ_ADD_IMG}</div><div style="position:absolute;left:3px">{ICQ_STATUS_IMG}</div></div>');
  		  
  		  //--></script><noscript>{ICQ_ADD_IMG}</noscript></td>
--- 54,61 ----
  			  {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG}</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><script language="JavaScript" type="text/javascript"><!-- 
  
! 		if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 )
! 			document.write('{ICQ_ADD_IMG}');
! 		else
! 			document.write('<div style="position:relative"><div style="position:absolute">{ICQ_ADD_IMG}</div><div style="position:absolute;left:3px">{ICQ_STATUS_IMG}</div></div>');
  		  
  		  //--></script><noscript>{ICQ_ADD_IMG}</noscript></td>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver posting_body.tpl,1.23,1.24

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

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

Modified Files:
	posting_body.tpl 
Log Message:
oops, that name change won't work on current CVS posting ...

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** posting_body.tpl	12 Feb 2002 15:53:59 -0000	1.23
--- posting_body.tpl	12 Feb 2002 16:06:45 -0000	1.24
***************
*** 434,438 ****
  	{POLLBOX} 
  	<tr> 
! 	  <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS}<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" />&nbsp;<input type="submit" accesskey="s" tabindex="6" name="post" class="mainoption" value="{L_SUBMIT}" /></td>
  	</tr>
    </table>
--- 434,438 ----
  	{POLLBOX} 
  	<tr> 
! 	  <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS}<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" />&nbsp;<input type="submit" accesskey="s" tabindex="6" name="submit" class="mainoption" value="{L_SUBMIT}" /></td>
  	</tr>
    </table>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver posting_body.tpl,1.22,1.23

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

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

Modified Files:
	posting_body.tpl 
Log Message:
Resolve issue with Netscape 4.x failing to display page due to ICQ icons

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** posting_body.tpl	12 Jan 2002 22:58:22 -0000	1.22
--- posting_body.tpl	12 Feb 2002 15:53:59 -0000	1.23
***************
*** 1,8 ****
- <!-- Spell checker option part 1: You must sign up for an account at www.spellchecker.net to use this option -->
- <!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
- <!-- Remember to uncomment the spellchecker button near the end of this template -->
- <!-- script type="text/javascript" language="javascript" src="spellcheck/spch.js"></script -->
- <!-- End spellchecker option -->
- 
  <script language="JavaScript" type="text/javascript">
  <!--
--- 1,2 ----
***************
*** 229,233 ****
  <!-- END privmsg_extensions -->
  
! <form action="{S_POST_ACTION}" method="post" name="post" onSubmit="return checkForm(this)">
  
  {POST_PREVIEW_BOX}
--- 223,227 ----
  <!-- END privmsg_extensions -->
  
! <form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)">
  
  {POST_PREVIEW_BOX}
***************
*** 440,454 ****
  	{POLLBOX} 
  	<tr> 
! 	  <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
! 		<!-- Spell checker option part 2: You must sign up for an account at www.spellchecker.net to use this option -->
! 		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
! 		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
! 		<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->
! 		<!-- End spellchecker option -->
! 		&nbsp; 
! 		<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" />
! 		&nbsp; 
! 		<input type="submit" accesskey="s" tabindex="6" name="submit" class="mainoption" value="{L_SUBMIT}" />
! 	  </td>
  	</tr>
    </table>
--- 434,438 ----
  	{POLLBOX} 
  	<tr> 
! 	  <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS}<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" />&nbsp;<input type="submit" accesskey="s" tabindex="6" name="post" class="mainoption" value="{L_SUBMIT}" /></td>
  	</tr>
    </table>

[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.42,1.43

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

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

Modified Files:
	admin_users.php 
Log Message:
Fix missing bbcode status link to FAQ

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** admin_users.php	9 Feb 2002 16:55:19 -0000	1.42
--- admin_users.php	12 Feb 2002 15:44:30 -0000	1.43
***************
*** 138,142 ****
  		$user_id = intval($HTTP_POST_VARS['id']);
  
! 		$this_userdata = get_userdata_from_id($user_id);
  		if( !$this_userdata )
  		{
--- 138,142 ----
  		$user_id = intval($HTTP_POST_VARS['id']);
  
! 		$this_userdata = get_userdata($user_id);
  		if( !$this_userdata )
  		{
***************
*** 697,701 ****
  			}
  
! 			$message .= "<br /><br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . append_sid("admin_users.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
  
  			message_die(GENERAL_MESSAGE, $message);
--- 697,701 ----
  			}
  
! 			$message .= '<br /><br />' . sprintf($lang['Click_return_useradmin'], '<a href="' . append_sid("admin_users.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
  
  			message_die(GENERAL_MESSAGE, $message);
***************
*** 736,740 ****
  		{
  			$user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL];
! 			$this_userdata = get_userdata_from_id($user_id);
  			if( !$this_userdata )
  			{
--- 736,740 ----
  		{
  			$user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL];
! 			$this_userdata = get_userdata($user_id);
  			if( !$this_userdata )
  			{
***************
*** 946,956 ****
  			{
  				case USER_AVATAR_UPLOAD:
! 					$avatar = "<img src=\"../" . $board_config['avatar_path'] . "/" . $user_avatar . "\" alt=\"\" />";
  					break;
  				case USER_AVATAR_REMOTE:
! 					$avatar = "<img src=\"$user_avatar\" alt=\"\" />";
  					break;
  				case USER_AVATAR_GALLERY:
! 					$avatar = "<img src=\"../" . $board_config['avatar_gallery_path'] . "/" . $user_avatar . "\" alt=\"\" />";
  					break;
  			}
--- 946,956 ----
  			{
  				case USER_AVATAR_UPLOAD:
! 					$avatar = '<img src="../' . $board_config['avatar_path'] . '/' . $user_avatar . '" alt="" />';
  					break;
  				case USER_AVATAR_REMOTE:
! 					$avatar = '<img src="' . $user_avatar . '" alt="" />';
  					break;
  				case USER_AVATAR_GALLERY:
! 					$avatar = '<img src="../' . $board_config['avatar_gallery_path'] . '/' . $user_avatar . '" alt="" />';
  					break;
  			}
***************
*** 964,984 ****
  			WHERE rank_special = 1
  			ORDER BY rank_title";
! 		if( !$result = $db->sql_query($sql) )
  		{
  			message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
  		}
- 		$rank_count = $db->sql_numrows($result);
  
! 		$rank_rows = $db->sql_fetchrowset($result);
! 
! 		$rank_select_box = "<option value=\"0\">" . $lang['No_assigned_rank'] . "</option>";
! 
! 		for($i = 0; $i < $rank_count; $i++)
  		{
! 			$rank = $rank_rows[$i]['rank_title'];
! 			$rank_id = $rank_rows[$i]['rank_id'];
  			
! 			$selected = ( $this_userdata['user_rank'] == $rank_id ) ? "selected=\"selected\"" : "";
! 			$rank_select_box .= "<option value=\"" . $rank_id . "\" " . $selected . ">" . $rank . "</option>";
  		}
  
--- 964,980 ----
  			WHERE rank_special = 1
  			ORDER BY rank_title";
! 		if ( !($result = $db->sql_query($sql)) )
  		{
  			message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
  		}
  
! 		$rank_select_box = '<option value="0">' . $lang['No_assigned_rank'] . '</option>';
! 		while( $row = $db->sql_fetchrow($result) )
  		{
! 			$rank = $row['rank_title'];
! 			$rank_id = $row['rank_id'];
  			
! 			$selected = ( $this_userdata['user_rank'] == $rank_id ) ? ' selected="selected"' : '';
! 			$rank_select_box .= '<option value="' . $rank_id . '"' . $selected . '>' . $rank . '</option>';
  		}
  
***************
*** 1001,1022 ****
  			"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\"" : "",
  			"AVATAR" => $avatar,
  			"LANGUAGE_SELECT" => language_select($user_lang, 'language', '../language'),
--- 997,1018 ----
  			"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"' : '',
  			"AVATAR" => $avatar,
  			"LANGUAGE_SELECT" => language_select($user_lang, 'language', '../language'),
***************
*** 1024,1033 ****
  			"STYLE_SELECT" => style_select($user_style, 'style'),
  			"DATE_FORMAT" => $user_dateformat,
! 			"ALLOW_PM_YES" => ($user_allowpm) ? "checked=\"checked\"" : "",
! 			"ALLOW_PM_NO" => (!$user_allowpm) ? "checked=\"checked\"" : "",
! 			"ALLOW_AVATAR_YES" => ($user_allowavatar) ? "checked=\"checked\"" : "",
! 			"ALLOW_AVATAR_NO" => (!$user_allowavatar) ? "checked=\"checked\"" : "",
! 			"USER_ACTIVE_YES" => ($user_status) ? "checked=\"checked\"" : "",
! 			"USER_ACTIVE_NO" => (!$user_status) ? "checked=\"checked\"" : "", 
  			"RANK_SELECT_BOX" => $rank_select_box,
  
--- 1020,1029 ----
  			"STYLE_SELECT" => style_select($user_style, 'style'),
  			"DATE_FORMAT" => $user_dateformat,
! 			"ALLOW_PM_YES" => ($user_allowpm) ? 'checked="checked"' : '',
! 			"ALLOW_PM_NO" => (!$user_allowpm) ? 'checked="checked"' : '',
! 			"ALLOW_AVATAR_YES" => ($user_allowavatar) ? 'checked="checked"' : '',
! 			"ALLOW_AVATAR_NO" => (!$user_allowavatar) ? 'checked="checked"' : '',
! 			"USER_ACTIVE_YES" => ($user_status) ? 'checked="checked"' : '',
! 			"USER_ACTIVE_NO" => (!$user_status) ? 'checked="checked"' : '', 
  			"RANK_SELECT_BOX" => $rank_select_box,
  
***************
*** 1090,1094 ****
  
  			"HTML_STATUS" => $html_status,
! 			"BBCODE_STATUS" => $bbcode_status,
  			"SMILIES_STATUS" => $smilies_status,
  
--- 1086,1090 ----
  
  			"HTML_STATUS" => $html_status,
! 			"BBCODE_STATUS" => sprintf($bbcode_status, '<a href="../' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 
  			"SMILIES_STATUS" => $smilies_status,
  
***************
*** 1124,1136 ****
  		WHERE user_id <> " . ANONYMOUS ."
  		ORDER BY username";
! 	$u_result = $db->sql_query($sql);
! 	$user_list = $db->sql_fetchrowset($u_result);
  
! 	$select_list = "<select name=\"" . POST_USERS_URL . "\">";
! 	for($i = 0; $i < count($user_list); $i++)
  	{
! 		$select_list .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
  	}
! 	$select_list .= "</select>";
  
  	$template->set_filenames(array(
--- 1120,1131 ----
  		WHERE user_id <> " . ANONYMOUS ."
  		ORDER BY username";
! 	$result = $db->sql_query($sql);
  
! 	$select_list = '<select name="' . POST_USERS_URL . '">';
! 	while( $row = $db->sql_fetchrow($result) )
  	{
! 		$select_list .= '<option value="' . $row['user_id'] . '">' . $row['username'] . '</option>';
  	}
! 	$select_list .= '</select>';
  
  	$template->set_filenames(array(
***************
*** 1156,1158 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
--- 1151,1153 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.56,1.57

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

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

Modified Files:
	modcp.php 
Log Message:
Fix 'return to mod CP' href problem

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** modcp.php	8 Feb 2002 01:30:21 -0000	1.56
--- modcp.php	12 Feb 2002 15:14:51 -0000	1.57
***************
*** 192,196 ****
  		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
! 		if($confirm)
  		{
  			$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ?  $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
--- 192,196 ----
  		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
! 		if ( $confirm )
  		{
  			$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ?  $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
***************
*** 329,338 ****
  			{
  				$redirect_page = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 				$l_redirect = sprintf($lang['Click_return_forum'], "<a href=\"$redirect_page\">", "</a>");
  			}
  			else
  			{
! 				$redirect_page = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 				$l_redirect = sprintf($lang['Click_return_modcp'], "<a href=\"$redirect_page\">", "</a>");
  			}
  
--- 329,338 ----
  			{
  				$redirect_page = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 				$l_redirect = sprintf($lang['Click_return_forum'], '<a href="' . $redirect_page . '">', '</a>');
  			}
  			else
  			{
! 				$redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 				$l_redirect = sprintf($lang['Click_return_modcp'], '<a href="' . $redirect_page . '">', '</a>');
  			}
  
***************
*** 345,349 ****
  		else
  		{
! 		// Not confirmed, show confirmation message
  		
  			if( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
--- 345,349 ----
  		else
  		{
! 			// Not confirmed, show confirmation message
  		
  			if( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
***************
*** 416,420 ****
  				$sql_select = "SELECT * 
  					FROM " . TOPICS_TABLE . " 
! 					WHERE topic_id IN ($topic_list)";
  
  				if( !$result = $db->sql_query($sql_select, BEGIN_TRANSACTION) )
--- 416,421 ----
  				$sql_select = "SELECT * 
  					FROM " . TOPICS_TABLE . " 
! 					WHERE topic_id IN ($topic_list) 
! 						AND topic_moved_id = 0";
  
  				if( !$result = $db->sql_query($sql_select, BEGIN_TRANSACTION) )
***************
*** 424,427 ****
--- 425,429 ----
  
  				$row = $db->sql_fetchrowset($result);
+ 				$db->sql_freeresult($result);
  
  				for($i = 0; $i < count($row); $i++)
***************
*** 472,484 ****
  			{
  				$redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! 				$message .= sprintf($lang['Click_return_topic'], "<a href=\"$redirect_page\">", "</a>");
  			}
  			else
  			{
  				$redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 				$message .= sprintf($lang['Click_return_modcp'], "<a href=\"$redirect_page\">", "</a>");
  			}
  
! 			$message = $message . "<br \><br \>" . sprintf($lang['Click_return_forum'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$old_forum_id") . "\">", "</a>");
  
  			$template->assign_vars(array(
--- 474,486 ----
  			{
  				$redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! 				$message .= sprintf($lang['Click_return_topic'], '<a href="' . $redirect_page . '">', '</a>');
  			}
  			else
  			{
  				$redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 				$message .= sprintf($lang['Click_return_modcp'], '<a href="' . $redirect_page . '">', '</a>');
  			}
  
! 			$message = $message . "<br \><br \>" . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$old_forum_id") . '">', '</a>');
  
  			$template->assign_vars(array(
***************
*** 553,557 ****
  		$sql = "UPDATE " . TOPICS_TABLE . " 
  			SET topic_status = " . TOPIC_LOCKED . " 
! 			WHERE topic_id IN ($topic_id_sql)";
  		if( !$result = $db->sql_query($sql) )
  		{
--- 555,560 ----
  		$sql = "UPDATE " . TOPICS_TABLE . " 
  			SET topic_status = " . TOPIC_LOCKED . " 
! 			WHERE topic_id IN ($topic_id_sql) 
! 				AND topic_moved_id = 0";
  		if( !$result = $db->sql_query($sql) )
  		{
***************
*** 562,571 ****
  		{
  			$redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! 			$message = sprintf($lang['Click_return_topic'], "<a href=\"$redirect_page\">", "</a>");
  		}
  		else
  		{
  			$redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 			$message = sprintf($lang['Click_return_modcp'], "<a href=\"$redirect_page\">", "</a>");
  		}
  
--- 565,574 ----
  		{
  			$redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! 			$message = sprintf($lang['Click_return_topic'], '<a href="' . $redirect_page . '">', '</a>');
  		}
  		else
  		{
  			$redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 			$message = sprintf($lang['Click_return_modcp'], '<a href="' . $redirect_page . '">', '</a>');
  		}
  
***************
*** 593,597 ****
  		$sql = "UPDATE " . TOPICS_TABLE . " 
  			SET topic_status = " . TOPIC_UNLOCKED . " 
! 			WHERE topic_id IN ($topic_id_sql)";
  		if( !$result = $db->sql_query($sql) )
  		{
--- 596,601 ----
  		$sql = "UPDATE " . TOPICS_TABLE . " 
  			SET topic_status = " . TOPIC_UNLOCKED . " 
! 			WHERE topic_id IN ($topic_id_sql) 
! 				AND topic_moved_id = 0";
  		if( !$result = $db->sql_query($sql) )
  		{
***************
*** 602,611 ****
  		{
  			$redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! 			$message = sprintf($lang['Click_return_topic'], "<a href=\"$redirect_page\">", "</a>");
  		}
  		else
  		{
  			$redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 			$message = sprintf($lang['Click_return_modcp'], "<a href=\"$redirect_page\">", "</a>");
  		}
  
--- 606,615 ----
  		{
  			$redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! 			$message = sprintf($lang['Click_return_topic'], '<a href="' . $redirect_page . '">', '</a>');
  		}
  		else
  		{
  			$redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! 			$message = sprintf($lang['Click_return_modcp'], '<a href="' . $redirect_page . '">', '</a>');
  		}
  
***************
*** 695,699 ****
  			);
  
! 			$message = $lang['Topic_split'] . "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
  			message_die(GENERAL_MESSAGE, $message);
  		}
--- 699,703 ----
  			);
  
! 			$message = $lang['Topic_split'] . "<br /><br />" . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
  			message_die(GENERAL_MESSAGE, $message);
  		}
***************
*** 969,986 ****
  		);
  
- 		$sql = "SELECT t.*, u.username, u.user_id, p.post_time
- 			FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p
- 			WHERE t.forum_id = $forum_id
- 				AND t.topic_poster = u.user_id
- 				AND p.post_id = t.topic_last_post_id
- 			ORDER BY t.topic_type DESC, p.post_time DESC
- 			LIMIT $start, " . $board_config['topics_per_page'];
- 
- 		if(!$t_result = $db->sql_query($sql))
- 		{
- 	   		message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
- 		}
- 		$topic_rowset = $db->sql_fetchrowset($t_result);
- 
  		//
  		// Set template files
--- 973,976 ----
***************
*** 997,1037 ****
  		obtain_word_list($orig_word, $replacement_word);
  
! 		for($i = 0; $i < count($topic_rowset); $i++)
  		{
  			$topic_title = "";
  
! 			if( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED )
  			{
! 				$folder_image = "<img src=\"" . $images['folder_locked'] . "\" alt=\"Topic Locked\">";
  			}
  			else
  			{
! 				if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE )
  				{
! 					$folder_image = "<img src=\"" . $images['folder_announce'] . "\">";
  				}
! 				else if( $topic_rowset[$i]['topic_type'] == POST_STICKY )
  				{
! 					$folder_image = "<img src=\"" . $images['folder_sticky'] . "\">";
  				}
  				else 
  				{
! 					$folder_image = "<img src=\"" . $images['folder'] . "\">";
  				}
  			}
  
! 			$topic_id = $topic_rowset[$i]['topic_id'];
! 			$topic_type = $topic_rowset[$i]['topic_type'];
! 			$topic_status = $topic_rowset[$i]['topic_status'];
  			
! 			if($topic_type == POST_ANNOUNCE)
  			{
  				$topic_type = $lang['Topic_Announcement'] . " ";
  			}
! 			else if($topic_type == POST_STICKY)
  			{
  				$topic_type = $lang['Topic_Sticky'] . " ";
  			}
! 			else if($topic_status == TOPIC_MOVED)
  			{
  				$topic_type = $lang['Topic_Moved'] . " ";
--- 987,1046 ----
  		obtain_word_list($orig_word, $replacement_word);
  
! 		$sql = "SELECT t.*, u.username, u.user_id, p.post_time
! 			FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p
! 			WHERE t.forum_id = $forum_id
! 				AND t.topic_poster = u.user_id
! 				AND p.post_id = t.topic_last_post_id
! 			ORDER BY t.topic_type DESC, p.post_time DESC
! 			LIMIT $start, " . $board_config['topics_per_page'];
! 
! 		if ( !($result = $db->sql_query($sql)) )
! 		{
! 	   		message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
! 		}
! 
! 		while ( $row = $db->sql_fetchrow($result) )
  		{
  			$topic_title = "";
  
! 			if ( $row['topic_status'] == TOPIC_LOCKED )
  			{
! 				$folder_img = $images['folder_locked'];
! 				$folder_alt = $lang['Topic_locked'];
  			}
  			else
  			{
! 				if ( $row['topic_type'] == POST_ANNOUNCE )
  				{
! 					$folder_img = $images['folder_announce'];
! 					$folder_alt = $lang['Announcement'];
  				}
! 				else if ( $row['topic_type'] == POST_STICKY )
  				{
! 					$folder_img = $images['folder_sticky'];
! 					$folder_alt = $lang['Sticky'];
  				}
  				else 
  				{
! 					$folder_img = $images['folder'];
! 					$folder_alt = $lang['No_new_posts'];
  				}
  			}
  
! 			$folder_image = '<img src="' . $folder_img . '" alt="' . $folder_alt . '" title="' . $folder_alt . '" />';
! 
! 			$topic_id = $row['topic_id'];
! 			$topic_type = $row['topic_type'];
! 			$topic_status = $row['topic_status'];
  			
! 			if ( $topic_type == POST_ANNOUNCE )
  			{
  				$topic_type = $lang['Topic_Announcement'] . " ";
  			}
! 			else if ( $topic_type == POST_STICKY )
  			{
  				$topic_type = $lang['Topic_Sticky'] . " ";
  			}
! 			else if ( $topic_status == TOPIC_MOVED )
  			{
  				$topic_type = $lang['Topic_Moved'] . " ";
***************
*** 1042,1052 ****
  			}
  	
! 			if( $topic_rowset[$i]['topic_vote'] )
  			{
  				$topic_type .= $lang['Topic_Poll'] . " ";
  			}
  	
! 			$topic_title = $topic_rowset[$i]['topic_title'];
! 			if( count($orig_word) )
  			{
  				$topic_title = preg_replace($orig_word, $replacement_word, $topic_title);
--- 1051,1061 ----
  			}
  	
! 			if ( $row['topic_vote'] )
  			{
  				$topic_type .= $lang['Topic_Poll'] . " ";
  			}
  	
! 			$topic_title = $row['topic_title'];
! 			if ( count($orig_word) )
  			{
  				$topic_title = preg_replace($orig_word, $replacement_word, $topic_title);
***************
*** 1054,1060 ****
  
  			$u_view_topic = append_sid("modcp.$phpEx?mode=split&amp;" . POST_TOPIC_URL . "=$topic_id");
! 			$topic_replies = $topic_rowset[$i]['topic_replies'];
  
! 			$last_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$i]['post_time'], $board_config['board_timezone']);
  
  			$template->assign_block_vars("topicrow", array(
--- 1063,1069 ----
  
  			$u_view_topic = append_sid("modcp.$phpEx?mode=split&amp;" . POST_TOPIC_URL . "=$topic_id");
! 			$topic_replies = $row['topic_replies'];
  
! 			$last_post_time = create_date($board_config['default_dateformat'], $row['post_time'], $board_config['board_timezone']);
  
  			$template->assign_block_vars("topicrow", array(

[Phpbb-checkins] CVS: phpBB2 update_to_RC3.php,1.9,1.10

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

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

Modified Files:
	update_to_RC3.php 
Log Message:
Added most users + moderator user_level updates

Index: update_to_RC3.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_to_RC3.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** update_to_RC3.php	12 Feb 2002 02:55:23 -0000	1.9
--- update_to_RC3.php	12 Feb 2002 13:51:09 -0000	1.10
***************
*** 197,200 ****
--- 197,202 ----
  }
  
+ print "<br />Updating topic first post info<br />";
+ 
  $sql = "SELECT MIN(post_id) AS first_post_id, topic_id
  	FROM " . POSTS_TABLE . "
***************
*** 224,227 ****
--- 226,260 ----
  }
  
+ print "<br />Updating moderator user_level<br />";
+ $sql = "SELECT DISTINCT u.user_id 
+ 	FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa 
+ 	WHERE aa.auth_mod = 1
+ 		AND ug.group_id = aa.group_id
+ 		AND u.user_id = ug.user_id 
+ 		AND u.user_level <> 1";
+ if ( !$db->sql_query($sql) )
+ {
+ 	die("Couldn't obtain moderator user ids");
+ }
+ 
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ 	do
+ 	{
+ 		$sql = "UPDATE " . USERS_TABLE . " 
+ 			SET user_level = " . MOD . " 
+ 			WHERE user_id = " . $row['user_id'];
+ 		if ( !$db->sql_query($sql) )
+ 		{
+ 			die("Couldn't update user level");
+ 		}
+ 	}
+ 	while ( $row = $db->sql_fetchrow($result) );
+ 
+ }
+ 
+ 
+ print "<br />Updating config settings<br />";
+ 
  $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value )
  	VALUES ('version', 'RC-3')";
***************
*** 231,235 ****
  }
  
! echo "\n<br /><br />\n<b>COMPLETE! Please delete this file before continuing!</b><br />\n";
  
  ?>
--- 264,282 ----
  }
  
! $sql = "INSERT INTO " . CONFIG_TABLE . "
! 	(config_name, config_value) VALUES ('record_online_users', '1')";
! if( !$db->sql_query($sql) )
! {
! 	die("Couldn't insert config key 'record_online_users'");
! }
! 
! $sql = "INSERT INTO " . CONFIG_TABLE . "
! 	(config_name, config_value) VALUES ('record_online_date', '" . time() . "')";
! if( !$db->sql_query($sql) )
! {  
! 	die("Couldn't insert config key 'record_online_date'");
! }
! 
! echo "\n<br />\n<b>COMPLETE! Please delete this file before continuing!</b><br />\n";
  
  ?>

[Phpbb-checkins] CVS: phpBB2/docs FAQ_RC1,1.1,NONE INSTALL_RC1,1.1,NONE README_RC-1,1.1,NONE README_RC-1_pre,1.1,NONE

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

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

Removed Files:
	FAQ_RC1 INSTALL_RC1 README_RC-1 README_RC-1_pre 
Log Message:
Not relevant to CVS

--- FAQ_RC1 DELETED ---

--- INSTALL_RC1 DELETED ---

--- README_RC-1 DELETED ---

--- README_RC-1_pre DELETED ---

[Phpbb-checkins] CVS: phpBB2/docs FAQ.txt,1.1,NONE

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

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

Removed Files:
	FAQ.txt 
Log Message:
Out of date

--- FAQ.txt DELETED ---

[Phpbb-checkins] CVS: phpBB2/admin pagestart.inc,1.7,1.8

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

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

Modified Files:
	pagestart.inc 
Log Message:
Minor changes for 4.1.1 warning levels + redirect name change for login

Index: pagestart.inc
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/pagestart.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pagestart.inc	14 Oct 2001 15:46:53 -0000	1.7
--- pagestart.inc	12 Feb 2002 03:08:05 -0000	1.8
***************
*** 21,25 ****
   ***************************************************************************/
  
! define("IN_ADMIN", true);
  
  $phpbb_root_path = "../";
--- 21,25 ----
   ***************************************************************************/
  
! define('IN_ADMIN', true);
  
  $phpbb_root_path = "../";
***************
*** 30,34 ****
  // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
  init_userprefs($userdata);
  //
--- 30,34 ----
  // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_INDEX);
  init_userprefs($userdata);
  //
***************
*** 37,41 ****
  if( !$userdata['session_logged_in'] )
  {
! 	header("Location: " . append_sid("../login.$phpEx?forward_page=admin/"));
  }
  else if( $userdata['user_level'] != ADMIN )
--- 37,41 ----
  if( !$userdata['session_logged_in'] )
  {
! 	header("Location: ../" . append_sid("login.$phpEx?redirect=admin/"));
  }
  else if( $userdata['user_level'] != ADMIN )
***************
*** 44,48 ****
  }
  
! if ( !$no_page_header )
  {
  	// Not including the pageheader can be neccesarry if META tags are
--- 44,48 ----
  }
  
! if ( empty($no_page_header) )
  {
  	// Not including the pageheader can be neccesarry if META tags are

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

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

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

Modified Files:
	index.php 
Log Message:
Added MSSQL DB size as provided by Josh ... feedback/updates welcome :)

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** index.php	27 Jan 2002 02:19:45 -0000	1.34
--- index.php	12 Feb 2002 03:06:17 -0000	1.35
***************
*** 50,54 ****
  // Generate relevant output
  //
! if( $HTTP_GET_VARS['pane'] == 'left' )
  {
  	$dir = @opendir(".");
--- 50,54 ----
  // Generate relevant output
  //
! if( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' )
  {
  	$dir = @opendir(".");
***************
*** 117,121 ****
  	include('page_footer_admin.'.$phpEx);
  }
! elseif( $HTTP_GET_VARS['pane'] == 'right' )
  {
  
--- 117,121 ----
  	include('page_footer_admin.'.$phpEx);
  }
! elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
  {
  
***************
*** 258,274 ****
  						}
  					}
- 
- 					if( $dbsize >= 1048576 )
- 					{
- 						$dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 ));
- 					}
- 					else if( $dbsize >= 1024 )
- 					{
- 						$dbsize = sprintf("%.2f KB", ( $dbsize / 1024 ));
- 					}
- 					else
- 					{
- 						$dbsize = sprintf("%.2f Bytes", $dbsize);
- 					}
  				} // Else we couldn't get the table status.
  			}
--- 258,261 ----
***************
*** 283,289 ****
--- 270,308 ----
  		}
  	}
+ 	else if( preg_match("/^mssql/", SQL_LAYER) )
+ 	{
+ 		$sql = "SELECT ( SELECT SUM(reserved) 
+ 				FROM sysindexes where indid in(0,1,255)) 
+ 			* low AS dbsize 
+ 			FROM master.dbo.spt_values 
+ 			WHERE number = 1 AND type = 'E'"; 
+ 		if( $result = $db->sql_query($sql) )
+ 		{
+ 			$dbsize = ( $row = $db->sql_fetchrow($result) ) ? intval($row['dbsize']) : $lang['Not_available'];
+ 		}
+ 		else
+ 		{
+ 			$dbsize = $lang['Not_available'];
+ 		}
+ 	}
  	else
  	{
  		$dbsize = $lang['Not_available'];
+ 	}
+ 
+ 	if ( is_integer($dbsize) )
+ 	{
+ 		if( $dbsize >= 1048576 )
+ 		{
+ 			$dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 ));
+ 		}
+ 		else if( $dbsize >= 1024 )
+ 		{
+ 			$dbsize = sprintf("%.2f KB", ( $dbsize / 1024 ));
+ 		}
+ 		else
+ 		{
+ 			$dbsize = sprintf("%.2f Bytes", $dbsize);
+ 		}
  	}
  

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.97,1.98

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

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

Modified Files:
	page_header.php 
Log Message:
Minor update to template vars.

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -r1.97 -r1.98
*** page_header.php	28 Jan 2002 17:33:51 -0000	1.97
--- page_header.php	12 Feb 2002 03:04:19 -0000	1.98
***************
*** 344,349 ****
  	"PRIVMSG_IMG" => $icon_pm,
  
- 	"REQUEST_URI" => $REQUEST_URI,
- 
  	"L_USERNAME" => $lang['Username'],
  	"L_PASSWORD" => $lang['Password'],
--- 344,347 ----

[Phpbb-checkins] CVS: phpBB2 update_to_RC1.php,1.3,NONE

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

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

Removed Files:
	update_to_RC1.php 
Log Message:
Integrated as reqd into update_to_RC3.php

--- update_to_RC1.php DELETED ---

[Phpbb-checkins] CVS: phpBB2 update_to_RC3.php,1.8,1.9

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

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

Modified Files:
	update_to_RC3.php 
Log Message:
Removed die on failure of initial updates, add version var to config table

Index: update_to_RC3.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_to_RC3.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** update_to_RC3.php	11 Feb 2002 02:27:27 -0000	1.8
--- update_to_RC3.php	12 Feb 2002 02:55:23 -0000	1.9
***************
*** 13,17 ****
  	case 'mysql':
  	case 'mysql4':
! /*		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
  			ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, 
  			ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, 
--- 13,17 ----
  	case 'mysql':
  	case 'mysql4':
! 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
  			ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, 
  			ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, 
***************
*** 19,29 ****
  		$sql[] = "ALTER TABLE " . SEARCH_TABLE . " 
  			MODIFY search_id int(11) NOT NULL";
! 		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
! 			MODIFY topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL";
! 		$sql[] = "UPDATE " . THEMES_TABLE . " 
! 			SET head_stylesheet = 'subSilver.css' 
! 			WHERE template_name = 'subSilver'";
! */			
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . "  
  			ADD COLUMN topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, 
  			ADD INDEX (topic_first_post_id)";
--- 19,25 ----
  		$sql[] = "ALTER TABLE " . SEARCH_TABLE . " 
  			MODIFY search_id int(11) NOT NULL";
! 			
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . "  
+ 			MODIFY topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,  
  			ADD COLUMN topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, 
  			ADD INDEX (topic_first_post_id)";
***************
*** 45,49 ****
  
  	case 'postgresql':
! /*		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
  			ADD COLUMN user_session_time int4";
  		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
--- 41,45 ----
  
  	case 'postgresql':
! 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
  			ADD COLUMN user_session_time int4";
  		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
***************
*** 55,62 ****
  		$sql[] = "CREATE INDEX user_session_time_" . $table_prefix . "users_index 
  			ON " . USERS_TABLE . " (user_session_time)";
! 		$sql[] = "UPDATE " . THEMES_TABLE . " 
! 			SET head_stylesheet = 'subSilver.css' 
! 			WHERE template_name = 'subSilver'";
! */				
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
  			ADD COLUMN topic_first_post_id int4";
--- 51,55 ----
  		$sql[] = "CREATE INDEX user_session_time_" . $table_prefix . "users_index 
  			ON " . USERS_TABLE . " (user_session_time)";
! 				
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
  			ADD COLUMN topic_first_post_id int4";
***************
*** 92,96 ****
  	case 'mssql-odbc':
  	case 'mssql':
! /*		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
  			user_session_time int NOT NULL, 
  			user_session_page smallint NOT NULL, 
--- 85,89 ----
  	case 'mssql-odbc':
  	case 'mssql':
! 		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
  			user_session_time int NOT NULL, 
  			user_session_page smallint NOT NULL, 
***************
*** 99,106 ****
  		$sql[] = "CREATE INDEX [IX_" . $table_prefix . "users] 
  			ON [" . USERS_TABLE . "]([user_session_time]) ON [PRIMARY]";
! 		$sql[] = "UPDATE " . THEMES_TABLE . " 
! 			SET head_stylesheet = 'subSilver.css' 
! 			WHERE template_name = 'subSilver'";
! */	
  		$sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics";
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
--- 92,96 ----
  		$sql[] = "CREATE INDEX [IX_" . $table_prefix . "users] 
  			ON [" . USERS_TABLE . "]([user_session_time]) ON [PRIMARY]";
! 	
  		$sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics";
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
***************
*** 126,138 ****
  
  	case 'msaccess':
! /*		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
  			user_session_time int NOT NULL, 
  			user_session_page smallint NOT NULL";
  		$sql[] = "CREATE INDEX user_session_time 
  			ON " . USERS_TABLE . " (user_session_time)";
! 		$sql[] = "UPDATE " . THEMES_TABLE . " 
! 			SET head_stylesheet = 'subSilver.css' 
! 			WHERE template_name = 'subSilver'";
! */	
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
  			topic_first_post_id int NOT NULL";
--- 116,125 ----
  
  	case 'msaccess':
! 		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
  			user_session_time int NOT NULL, 
  			user_session_page smallint NOT NULL";
  		$sql[] = "CREATE INDEX user_session_time 
  			ON " . USERS_TABLE . " (user_session_time)";
! 	
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
  			topic_first_post_id int NOT NULL";
***************
*** 160,180 ****
  }
  
- 
- 
  $errored = false;
  for($i = 0; $i < count($sql); $i++)
  {
! 	echo "Running >>> " . $sql[$i];
  
! 	$result = $db->sql_query($sql[$i]);
! 	if ( !$result )
  	{
  		$errored = true;
  		$error = $db->sql_error();
! 		echo " :: <b>FAILED</b> <u>( " . $error['message'] . " )</u><br /><br />\n\n";
  	}
  	else
  	{
! 		echo " :: <b>COMPLETED</b><br /><br />\n\n";
  	}
  }
--- 147,164 ----
  }
  
  $errored = false;
  for($i = 0; $i < count($sql); $i++)
  {
! 	echo "Running :: " . $sql[$i];
  
! 	if ( !($result = $db->sql_query($sql[$i])) )
  	{
  		$errored = true;
  		$error = $db->sql_error();
! 		echo " -> <b>FAILED</b> ---> <u>" . $error['message'] . "</u><br /><br />\n\n";
  	}
  	else
  	{
! 		echo " -> <b>COMPLETED</b><br /><br />\n\n";
  	}
  }
***************
*** 182,247 ****
  if ( $errored )
  {
! 	echo "\n<br /><br />Errors occured! Please check and correct issues as required<br />\n";
  }
! else
  {
  
! 	$sql = "SELECT themes_id 
! 		FROM " . THEMES_TABLE . " 
! 		WHERE template_name = 'subSilver'";
! 	if( !($result = $db->sql_query($sql)) )
! 	{
! 		die("Couldn't obtain subSilver id");
! 	}
  
! 	if( $row = $db->sql_fetchrow($result) )
  	{
! 		$theme_id = $row['themes_id'];
! 
! 		$sql = "UPDATE " . THEMES_TABLE . " 
! 			SET head_stylesheet = '', body_background = '', body_bgcolor = 'E5E5E5', body_text = '000000', body_link = '006699', body_vlink = '5493B4', body_alink = '', body_hlink = 'DD6900', tr_color1 = 'EFEFEF', tr_color2 = 'DEE3E7', tr_color3 = 'D1D7DC', tr_class1 = '', tr_class2 = '', tr_class3 = '', th_color1 = '98AAB1', th_color2 = '006699', th_color3 = 'FFFFFF', th_class1 = 'cellpic1.gif', th_class2 = 'cellpic3.gif', th_class3 = 'cellpic2.jpg', td_color1 = 'FAFAFA', td_color2 = 'FFFFFF', td_color3 = '', td_class1 = 'row1', td_class2 = 'row2', td_class3 = '', fontface1 = 'Verdana, Arial, Helvetica, sans-serif', fontface2 = 'Trebuchet MS', fontface3 = 'Courier, ''Courier New'', sans-serif', fontsize1 = 10, fontsize2 = 11, fontsize3 = 12, fontcolor1 = '444444', fontcolor2 = '006600', fontcolor3 = 'FFA34F', span_class1 = '', span_class2 = '', span_class3 = ''
! 			WHERE themes_id = $theme_id";
! 		if ( !($result = $db->sql_query($sql)) )
! 		{
! 			die("Couldn't update subSilver theme");
! 		}
! 
! 		$sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) 
! 			VALUES ($theme_id, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', '')";
! 		if ( !($result = $db->sql_query($sql)) )
! 		{
! 			echo "WARNING >> Couldn't insert subSilver name info";
! 		}
  	}
  
! 	$sql = "SELECT MIN(post_id) AS first_post_id, topic_id
! 		FROM " . POSTS_TABLE . "
! 		GROUP BY topic_id
! 		ORDER BY topic_id ASC";
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		die("Couldn't obtain first post id list");
  	}
  
! 	if ( $row = $db->sql_fetchrow($result) )
  	{
! 		do
! 		{
! 			$post_id = $row['first_post_id'];
! 			$topic_id = $row['topic_id'];
  
! 			$sql = "UPDATE " . TOPICS_TABLE . " 
! 				SET topic_first_post_id = $post_id 
! 				WHERE topic_id = $topic_id";
! 			if ( !$db->sql_query($sql) )
! 			{
! 				die("Couldn't update topic first post id in topic :: $topic_id");
! 			}
  		}
- 		while ( $row = $db->sql_fetchrow($result) );
  	}
! 	
! 	echo "\n<br /><br />\nCOMPLETE! Please delete this file before continuing!<br />\n";
  }
  
  ?>
--- 166,235 ----
  if ( $errored )
  {
! 	echo "\n<br /><b>Some queries failed! This is probably nothing to worry about, update will attempt to continue. Should this fail you may need to seek help at our development board (see README)</b><br /><br />\n\n";
  }
! 
! $sql = "SELECT themes_id 
! 	FROM " . THEMES_TABLE . " 
! 	WHERE template_name = 'subSilver'";
! if( !($result = $db->sql_query($sql)) )
  {
+ 	die("Couldn't obtain subSilver id");
+ }
  
! if( $row = $db->sql_fetchrow($result) )
! {
! 	$theme_id = $row['themes_id'];
  
! 	$sql = "UPDATE " . THEMES_TABLE . " 
! 		SET head_stylesheet = 'subSilver.css', body_background = '', body_bgcolor = 'E5E5E5', body_text = '000000', body_link = '006699', body_vlink = '5493B4', body_alink = '', body_hlink = 'DD6900', tr_color1 = 'EFEFEF', tr_color2 = 'DEE3E7', tr_color3 = 'D1D7DC', tr_class1 = '', tr_class2 = '', tr_class3 = '', th_color1 = '98AAB1', th_color2 = '006699', th_color3 = 'FFFFFF', th_class1 = 'cellpic1.gif', th_class2 = 'cellpic3.gif', th_class3 = 'cellpic2.jpg', td_color1 = 'FAFAFA', td_color2 = 'FFFFFF', td_color3 = '', td_class1 = 'row1', td_class2 = 'row2', td_class3 = '', fontface1 = 'Verdana, Arial, Helvetica, sans-serif', fontface2 = 'Trebuchet MS', fontface3 = 'Courier, ''Courier New'', sans-serif', fontsize1 = 10, fontsize2 = 11, fontsize3 = 12, fontcolor1 = '444444', fontcolor2 = '006600', fontcolor3 = 'FFA34F', span_class1 = '', span_class2 = '', span_class3 = ''
! 		WHERE themes_id = $theme_id";
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		die("Couldn't update subSilver theme");
  	}
  
! 	$sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) 
! 		VALUES ($theme_id, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', '')";
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		echo "WARNING >> Couldn't insert subSilver name info<br />\n";
  	}
+ }
  
! $sql = "SELECT MIN(post_id) AS first_post_id, topic_id
! 	FROM " . POSTS_TABLE . "
! 	GROUP BY topic_id
! 	ORDER BY topic_id ASC";
! if ( !($result = $db->sql_query($sql)) )
! {
! 	die("Couldn't obtain first post id list");
! }
! 
! if ( $row = $db->sql_fetchrow($result) )
! {
! 	do
  	{
! 		$post_id = $row['first_post_id'];
! 		$topic_id = $row['topic_id'];
  
! 		$sql = "UPDATE " . TOPICS_TABLE . " 
! 			SET topic_first_post_id = $post_id 
! 			WHERE topic_id = $topic_id";
! 		if ( !$db->sql_query($sql) )
! 		{
! 			die("Couldn't update topic first post id in topic :: $topic_id");
  		}
  	}
! 	while ( $row = $db->sql_fetchrow($result) );
  }
+ 
+ $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value )
+ 	VALUES ('version', 'RC-3')";
+ if ( !$db->sql_query($sql) )
+ {
+ 	die("Couldn't insert new config var");
+ }
+ 
+ echo "\n<br /><br />\n<b>COMPLETE! Please delete this file before continuing!</b><br />\n";
  
  ?>

[Phpbb-checkins] CVS: phpBB2/includes prune.php,1.9,1.10

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

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

Modified Files:
	prune.php 
Log Message:
Various updates and changes

Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/prune.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** prune.php	24 Dec 2001 14:04:00 -0000	1.9
--- prune.php	12 Feb 2002 02:16:12 -0000	1.10
***************
*** 21,30 ****
   ***************************************************************************/
  
  function prune($forum_id, $prune_date)
  {
  	global $db, $lang;
  
- 	$pruned_topic_list = array();
- 
  	//
  	// Those without polls ...
--- 21,30 ----
   ***************************************************************************/
  
+ require($phpbb_root_path . 'includes/search.'.$phpEx);
+ 
  function prune($forum_id, $prune_date)
  {
  	global $db, $lang;
  
  	//
  	// Those without polls ...
***************
*** 36,222 ****
  			AND t.topic_type <> " . POST_ANNOUNCE . "
  			AND p.post_id = t.topic_last_post_id";
! 	if ($prune_date != "")
  	{
  		$sql .= " AND p.post_time < $prune_date";
  	}
! 
! 	if(!$result_topics = $db->sql_query($sql))
  	{
  		message_die(GENERAL_ERROR, "Couldn't obtain lists of topics to prune.", "", __LINE__, __FILE__, $sql);
  	}
  
! 	if( $pruned_topics = $db->sql_numrows($result_topics) )
  	{
- 		$pruned_topic_list = $db->sql_fetchrowset($result_topics);
- 	
- 		$sql_topics = "";
- 		for($i = 0; $i < $pruned_topics; $i++)
- 		{
- 			if($sql_topics != "")
- 			{
- 				$sql_topics .= ", ";
- 			}
- 			$sql_topics .= $pruned_topic_list[$i]['topic_id'];
- 		}
- 		$sql_topics = "topic_id IN (" . $sql_topics . ")";
- 
  		$sql = "SELECT post_id
  			FROM " . POSTS_TABLE . " 
  			WHERE forum_id = $forum_id 
! 				AND $sql_topics";
! 		if(!$result_posts = $db->sql_query($sql))
  		{
  			message_die(GENERAL_ERROR, "Couldn't obtain list of posts to prune.", "", __LINE__, __FILE__, $sql);
  		}
  
- 		$pruned_posts = $db->sql_numrows($result_posts);
- 		$pruned_post_list = $db->sql_fetchrowset($result_posts);
- 
  		$sql_post = "";
! 		for($i = 0; $i < $pruned_posts; $i++)
  		{
! 			$post_id = $pruned_post_list[$i]['post_id'];
  
! 			if( $sql_post != "" )
  			{
! 				$sql_post .= ", ";
  			}
- 			$sql_post .= $post_id;
- 		}
- 		$sql_post = "post_id IN (" . $sql_post . ")";
  
! 		$sql = "DELETE FROM " . TOPICS_TABLE . " 
! 			WHERE $sql_topics";
! 		if(!$result = $db->sql_query($sql))
! 		{
! 			message_die(GENERAL_ERROR, "Couldn't delete topics during prune.", "", __LINE__, __FILE__, $sql);
! 		}
  
! 		$sql = "DELETE FROM " . POSTS_TABLE . " 
! 			WHERE $sql_post";
! 		if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
! 		{
! 			$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
! 				WHERE $sql_post";
! 			if( $result = $db->sql_query($sql) )
  			{
! 				$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " 
! 					WHERE $sql_post";
! 				if( !$result = $db->sql_query($sql, END_TRANSACTION) )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't delete search matches", "", __LINE__, __FILE__, $sql);
! 				}
  			}
! 			else
  			{
  				message_die(GENERAL_ERROR, "Couldn't delete post during prune.", "", __LINE__, __FILE__, $sql);
  			}
- 		}
- 		else
- 		{
- 			message_die(GENERAL_ERROR, "Couldn't delete post_text during prune.", "", __LINE__, __FILE__, $sql);
- 		}
  
! 		//
! 		// Remove any words in search wordlist which no longer
! 		// appear in posts
! 		//
! 		switch(SQL_LAYER)
! 		{
! 			case 'postgresql':
! 				$sql = "DELETE FROM " . SEARCH_WORD_TABLE . " 
! 					WHERE word_id NOT IN ( 
! 						SELECT word_id  
! 						FROM " . SEARCH_MATCH_TABLE . "  
! 						GROUP BY word_id)"; 
! 				$result = $db->sql_query($sql);
! 				if( !$result )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
! 				}
! 				break;
! 
! 			case 'oracle':
! 				$sql = "DELETE FROM " . SEARCH_WORD_TABLE . " 
! 					WHERE word_id IN (
! 						SELECT w.word_id 
! 						FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m 
! 						WHERE w.word_id = m.word_id(+) 
! 							AND m.word_id IS NULL)";
! 				$result = $db->sql_query($sql);
! 				if( !$result )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
! 				}
! 				break;
! 
! 			case 'mssql':
! 			case 'msaccess':
! 				$sql = "DELETE FROM " . SEARCH_WORD_TABLE . " 
! 					WHERE word_id IN ( 
! 						SELECT w.word_id  
! 						FROM " . SEARCH_WORD_TABLE . " w 
! 						LEFT JOIN " . SEARCH_MATCH_TABLE . " m ON m.word_id = w.word_id 
! 						WHERE m.word_id IS NULL)"; 
! 				$result = $db->sql_query($sql);
! 				if( !$result )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
! 				}
! 				break;
! 
! 			case 'mysql':
! 			case 'mysql4':
! 				// 0.07s
! 				$sql = "SELECT w.word_id 
! 					FROM " . SEARCH_WORD_TABLE . " w 
! 					LEFT JOIN " . SEARCH_MATCH_TABLE . " m ON m.word_id = w.word_id 
! 					WHERE m.word_id IS NULL"; 
! 				if( $result = $db->sql_query($sql) )
! 				{
! 					if( $db->sql_numrows($result) )
! 					{
! 						$rowset = array();
! 						while( $row = $db->sql_fetchrow($result) )
! 						{
! 							$rowset[] = $row['word_id'];
! 						}
! 
! 						$word_id_sql = implode(", ", $rowset);
! 
! 						if( $word_id_sql )
! 						{
! 							// 0.07s (about 15-20 words)
! 							$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "  
! 								WHERE word_id IN ($word_id_sql)";
! 							$result = $db->sql_query($sql); 
! 							if( !$result )
! 							{
! 								message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
! 							}
! 						}
! 					}
! 				}
! 				break;
! 		}		
! 
! 		$sql = "UPDATE " . FORUMS_TABLE . "
! 			SET forum_topics = forum_topics - $pruned_topics, forum_posts = forum_posts - $pruned_posts
! 			WHERE forum_id = $forum_id";
! 		if(!$result = $db->sql_query($sql))
! 		{
! 			message_die(GENERAL_ERROR, "Couldn't update forum data after prune.", "", __LINE__, __FILE__, $sql);
! 		}
  
! 		return array (
! 			"topics" => $pruned_topics,
! 			"posts" => $pruned_posts);
! 	}
! 	else
! 	{
! 		return array(
! 			"topics" => 0, 
! 			"posts" => 0);
  	}
  }
  
--- 36,120 ----
  			AND t.topic_type <> " . POST_ANNOUNCE . "
  			AND p.post_id = t.topic_last_post_id";
! 	if ( $prune_date != "" )
  	{
  		$sql .= " AND p.post_time < $prune_date";
  	}
! 	if ( !($result = $db->sql_query($sql)) )
  	{
  		message_die(GENERAL_ERROR, "Couldn't obtain lists of topics to prune.", "", __LINE__, __FILE__, $sql);
  	}
  
! 	$sql_topics = "";
! 	while( $row = $db->sql_fetchrow($result) )
! 	{
! 		$sql_topics .= ( ( $sql_topics != "" ) ? ", " : "" ) . $row['topic_id'];
! 	}
! 		
! 	if( $sql_topics != "" )
  	{
  		$sql = "SELECT post_id
  			FROM " . POSTS_TABLE . " 
  			WHERE forum_id = $forum_id 
! 				AND topic_id IN ($sql_topics)";
! 		if ( !($result = $db->sql_query($sql)) )
  		{
  			message_die(GENERAL_ERROR, "Couldn't obtain list of posts to prune.", "", __LINE__, __FILE__, $sql);
  		}
  
  		$sql_post = "";
! 		while ( $row = $db->sql_fetchrow($result) )
  		{
! 			$sql_post .= ( ( $sql_post != "" ) ? ", " : "" ) . $row['post_id'];
! 		}
  
! 		if ( $sql_post != "" )
! 		{
! 			$sql = "DELETE FROM " . TOPICS_TABLE . " 
! 				WHERE topic_id IN ($sql_topics)";
! 			if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't delete topics during prune.", "", __LINE__, __FILE__, $sql);
  			}
  
! 			$pruned_topics = $db->sql_affectedrows();
  
! 			$sql = "DELETE FROM " . POSTS_TABLE . " 
! 				WHERE post_id IN ($sql_post)";
! 			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't delete post_text during prune.", "", __LINE__, __FILE__, $sql);
  			}
! 
! 			$pruned_posts = $db->sql_affectedrows();
! 
! 			$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
! 				WHERE post_id IN ($sql_post)";
! 			if ( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't delete post during prune.", "", __LINE__, __FILE__, $sql);
  			}
  
! 			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " 
! 				WHERE post_id IN ($sql_post)";
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't delete search matches", "", __LINE__, __FILE__, $sql);
! 			}
  
! 			remove_unmatched_words();
! 
! 			$sql = "UPDATE " . FORUMS_TABLE . "
! 				SET forum_topics = forum_topics - $pruned_topics, forum_posts = forum_posts - $pruned_posts
! 				WHERE forum_id = $forum_id";
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't update forum data after prune.", "", __LINE__, __FILE__, $sql);
! 			}
! 
! 			return array ("topics" => $pruned_topics, "posts" => $pruned_posts);
! 		}
  	}
+ 
+ 	return array("topics" => 0, "posts" => 0);
  }
  
***************
*** 235,248 ****
  		WHERE forum_id = $forum_id";
  
! 	if(!$result = $db->sql_query($sql))
  	{
  		message_die(GENERAL_ERROR, "Auto-Prune: Couldn't read auto_prune table.", __LINE__, __FILE__);
  	}
  
! 	if( $db->sql_numrows($result) )
  	{
! 		$row = $db->sql_fetchrow($result);
! 
! 		if( $row['prune_freq'] && $row['prune_days'] )
  		{
  			$prune_date = time() - ( $row['prune_days'] * 86400 );
--- 133,144 ----
  		WHERE forum_id = $forum_id";
  
! 	if ( !($result = $db->sql_query($sql)) )
  	{
  		message_die(GENERAL_ERROR, "Auto-Prune: Couldn't read auto_prune table.", __LINE__, __FILE__);
  	}
  
! 	if ( $row = $db->sql_fetchrow($result) )
  	{
! 		if ( $row['prune_freq'] && $row['prune_days'] )
  		{
  			$prune_date = time() - ( $row['prune_days'] * 86400 );
***************
*** 254,258 ****
  				SET prune_next = $next_prune
  				WHERE forum_id = $forum_id";
! 			if( !$db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Auto-Prune: Couldn't update forum table.", __LINE__, __FILE__);
--- 150,154 ----
  				SET prune_next = $next_prune
  				WHERE forum_id = $forum_id";
! 			if ( !$db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Auto-Prune: Couldn't update forum table.", __LINE__, __FILE__);

[Phpbb-checkins] CVS: phpBB2/language/lang_hungarian lang_bbcode.php,NONE,1.1

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

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

Added Files:
	lang_bbcode.php 
Log Message:
Initial version

--- NEW FILE ---
<?php
/***************************************************************************
 *                         lang_bbcode.php [Hungarian]
 *                            -------------------
 *   begin                : Wednesday Oct 3, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : su...@ph...
 *
 *   $Id: lang_bbcode.php,v 1.3 2001/12/18 01:53:26 psotfx Exp $
 *
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/
 
//
// Translation by Gergely EGERVARY 
// ma...@ex...
//


$faq[] = array("--","Bevezetés");
$faq[] = array("Mi az a BBCode?", "A BBCode egy speciális HTML változat. Az adminisztrátor határozza meg, használhat-e a hozzászólásaiban BBCode tag-eket. (a BBCode hozzászólásonként bárki által letiltható) Szintaktikailag hasonló a HTML kódhoz, a tag-ek szögletes zárójelben vannak: [ és ] a &lt; és &gt; helyett, és nagyobb felügyeletet biztosít a megjelenítés felett.");

$faq[] = array("--","Szöveg formázása");
$faq[] = array("Hogyan írhatok félkövér, dõlt, aláhúzott szöveget?", "A BBCode lehetõséget biztosít arra, hogy gyorsan és egyszerûen megváltoztassa a szöveg stílusát. Az alábbi lehetõségek vannak: <ul><li>Félkövér megjelenítéséhez írja a szöveget <b>[b][/b]</b> tag-ek közé, pl. <br /><br /><b>[b]</b>Helló<b>[/b]</b><br /><br />eredménye <b>Helló</b></li><li>Aláhúzáshoz írja a szöveget a<b>[u][/u]</b> tag-ek közé, pl. <br /><br /><b>[u]</b>Jó reggelt!<b>[/u]</b><br /><br />eredménye <u>Jó reggelt!</u></li><li>Dõlt megjelenítéshez írja a szöveget <b>[i][/i]</b> tag-ek közé, pl.<br /><br />Ez <b>[i]</b>nagyszerû!<b>[/i]</b><br /><br />eredménye: Ez <i>nagyszerû!</i></li></ul>");
$faq[] = array("Hogyan változtathatom meg a betû méretét és színét?", "Az alábbiakban bemutatjuk a betûszín és méret megváltoztatásához szükséges tag-eket. Tartsa szem elõtt, hogy a formázás eredménye függ a böngészõ szoftvertõl és operációs rendszertõl. <ul><li>Betûszín megváltoztatása: <b>[color=][/color]</b>. Megadhatja a színt szöveges formában, (pl. red, blue, yellow, stb.) vagy hexadecimális kóddal, pl. #FFFFFF, #000000. Például, a piros betûszín kiválasztásához az alábbit használja:<br /><br /><b>[color=red]</b>Helló!<b>[/color]</b><br /><br />vagy<br /><br /><b>[color=#FF0000]</b>Helló!<b>[/color]</b><br /><br />mindkettõ eredménye <span style=\"color:red\">Helló!</span></li><li>A szöveg mérete hasonlóképpen módosítható a <b>[size=][/size]</b> segítségével. Az ajánlott szövegméret pixelben 1-tõl (egészen apró, olvashatatlan) 29-ig (nagyon nagy). Például:<br /><br /><b>[size=9]</b>KICSI<b>[/size]</b><br /><br />eredménye <span style=\"font-size:9px\">KICSI</span><br /><br />amíg <br /><br /><b>[size=24]</b>ÓRIÁSI!<b>[/size]</b><br /><br />eredménye <span style=\"font-size:24px\">ÓRIÁSI!</span></li></ul>");
$faq[] = array("Használhatok többféle formázást egyszerre?", "Természetesen! Például figyelem felhívásra használhatja az alábbit: <br /><br /><b>[size=18][color=red][b]</b>Ide figyelj!<b>[/b][/color][/size]</b><br /><br />az eredménye <span style=\"color:red;font-size:18px\"><b>Ide figyelj!</b></span><br /><br />Mindemellett nem javasoljuk, hogy hosszú szövegeket formázzon meg ehhez hasonlóan! Ügyeljen a tag-ek helyes lezárására. Például a következõ egy hibás formázás: <br /><br /><b>[b][u]</b>Ez így helytelen<b>[/b][/u]</b>");

$faq[] = array("--","Idézetek és kódok megjelenítése");
$faq[] = array("Idézetek hozzászólásokban", "Kétféleképpen idézhet szöveget: hivatkozással vagy anélkül. <ul><li>Ha hozzászólásnál az Idézet gombra kattint, észre fogja venni, hogy az idézet szövege automatikusan megjelenik a <b>[quote=\"\"][/quote]</b> tag-ek között. Ezzel a módszerrel idézhet egy elõzõ hozzászólást. Például Bozzi Úr hozzászólását a következõképpen idézheti:<br /><br /><b>[quote=\"Bozzi Úr\"]</b>Ezt írta Bozzi Úr<b>[/quote]</b><br /><br />Az eredmény elõtt automatikusan megjelenik a Bozzi Úr írta: sor. Ügyeljen arra, hogy az idézett személy nevét idézõjelbe <b>kell</b> zárnia.</li><li>A második módszerrel tetszõleges szöveget idézhet. Használja a <b>[quote][/quote]</b> tag-eket. A hozzászólás megjelenítésénél megjelenik az Idézet: sor a szöveg elõtt.</li></ul>");
$faq[] = array("Kódok megjelenítése", "Ha programkódot, vagy hasonló, fix betûszélességet (pl. Courier betûtípust) igénylõ szöveget kíván megjeleníteni, használja a <b>[code][/code]</b> tag-eket, pl.<br /><br /><b>[code]</b>echo \"Ez itt egy programsor\";<b>[/code]</b><br /><br />Az összes formázó tag érvényét veszti, ha a <b>[code][/code]</b> tag-eken belül használja.");

$faq[] = array("--","Listák készítése");
$faq[] = array("Számozatlan lista készítése", "A BBCode kétféle lista készítését teszi lehetõvé: számozott és számozatlant. Egy számozatlan lista nem más, mint egy felsorolás, minden sor elõtt egy bekezdésjellel. Létrehozásához használja a <b>[list][/list]</b> tag-eket, és a lista elemeinek megadásához a <b>[*]</b> tag-et. Például a kedvenc színei felsorolásához az alábbit használhatja:<br /><br /><b>[list]</b><br /><b>[*]</b>Piros<br /><b>[*]</b>Kék<br /><b>[*]</b>Sárga<br /><b>[/list]</b><br /><br />Eredménye a következõ lista:<ul><li>Piros</li><li>Kék</li><li>Sárga</li></ul>");
$faq[] = array("Számozott lista készítése", "A második típus, a számozott lista lehetõséget biztosít tetszõleges szám vagy jel megadására a lista elemei elõtt. Létrehozásához használja a <b>[list=1][/list]</b> tag-eket, vagy a <b>[list=a][/list]</b> tag-eket alfabetikus listához. Akár csak a számozatlan listánál, a lista elemeit a <b>[*]</b> tag segítségével adhatja meg. Például:<br /><br /><b>[list=1]</b><br /><b>[*]</b>Elmenni a boltba<br /><b>[*]</b>Venni egy új számítógépet<br /><b>[*]</b>Belerúgni, ha nem mûködik<br /><b>[/list]</b><br /><br />eredménye a következõ:<ol type=\"1\"><li>Elmenni a boltba</li><li>Venni egy új számítógépet</li><li>Belerúgni, ha nem mûködik</li></ol>Alfabetikus listához:<br /><br /><b>[list=a]</b><br /><b>[*]</b>Az elsõ választási lehetõség<br /><b>[*]</b>A második választási lehetõség<br /><b>[*]</b>A harmadik választási lehetõség<br /><b>[/list]</b><br /><br />eredménye<ol type=\"a\"><li>Az elsõ választási lehetõség</li><li>A második választási lehetõség</li><li>A harmadik választási lehetõség</li></ol>");

$faq[] = array("--", "Hivatkozások készítése");
$faq[] = array("Hivatkozás másik oldalra", "A BBCode többféle lehetõséget biztosít URI (Uniform Resource Indicator) ismertebb nevén URL hivatkozások létrehozására.<ul><li>Az egyik lehetõség az <b>[url=][/url]</b> tag használata, amit az = jel után ír, az lesz a hivatkozás tárgya. Például a phpBB.com weboldalra így hivatkozhat:<br /><br /><b>[url=http://www.phpbb.com/]</b>Itt lakik a phpBB!<b>[/url]</b><br /><br />Eredménye a következõ hivatkozás: <a href=\"http://www.phpbb.com/\" target=\"_blank\">Itt lakik a phpBB!</a> A hivatkozások új böngészõablakban nyílnak meg, hogy az olvasó zavartalanul folytathassa a fórum böngészését. </li><li>Ha magát az URL címet szeretné megjeleníteni a hivatkozásban, egyszerûen megteheti:<br /><br /><b>[url]</b>http://www.phpbb.com/<b>[/url]</b><br /><br />Eredménye a következõ hivatkozás: <a href=\"http://www.phpbb.com/\" target=\"_blank\">http://www.phpbb.com/</a></li><li>Mindemellett a phpBB tartogat egy remek lehetõséget: bármilyen, szintaktikailag helyes URL automatikusan hivatkozássá alakul, anélkül, hogy bármilyen tag-et használna. Például a hozzászólásba írt www.phpbb.com szöveg automatikusan átalakul hivatkozássá, amikor megtekinti a hozzászólást: <a href=\"http://www.phpbb.com/\" target=\"_blank\">www.phpbb.com</a></li><li>Ugyanez érvényes az email címekre is, megadhat egy email címet, például:<br /><br /><b>[email]</b>va...@va...<b>[/email]</b><br /><br />eredménye <a href=\"mailto:va...@va...\">va...@va...</a> vagy csak egyszerûen írja be a hozzászólásba a va...@va... címet, és automatikusan hivatkozássá alakul olvasásnál.</li></ul>Tetszõlegesen egymásba ágyazhat többféle BBCode tag-et, például <b>[img][/img]</b> (lásd: következõ példa), <b>[b][/b]</b>, stb. Akár csak a formázásnál, ügyeljen a tag-ek helyes lezárására, például:<br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/url][/img]</b><br /><br />egy <u>helytelen</u> hivatkozás, amiért a moderátorok akár el is távolíthatják a hozzászólását.");

$faq[] = array("--", "Képek megjelenítése");
$faq[] = array("Kép megjelenítése a hozzászólásokban", "A BBCode lehetõséget biztosít képek beszúrására. Két dolgot tartson szem elõtt, ha használja ezt a lehetõséget: a legtöbb felhasználót zavarja a sok kép, másrészrõl a megjelenítendõ képnek már elérhetõnek kell lennie az Interneten (nem elegendõ az, ha a saját számítógépén elérhetõ, kivétel ha webszervert futtat a saját gépén!). Jelenleg nincs lehetõség arra, hogy közvetlenül képeket töltsön fel a fórumra. (Ezt a szoftver késõbbi verzióiban tervezzük megvalósítani.) Kép beszúrásához adja meg a kép URL címét az <b>[img][/img]</b> tag-ek között. Például:<br /><br /><b>[img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img]</b><br /><br />Amint azt a hivatkozások témakörben említettük, lehetõség van a tag-ek egymásba ágyazására, például: <br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img][/url]</b><br /><br />eredménye:<br /><br /><a href=\"http://www.phpbb.com/\" target=\"_blank\"><img src=\"http://www.phpbb.com/images/phplogo.gif\" border=\"0\" alt=\"\" /></a><br />");

$faq[] = array("--", "Egyéb");
$faq[] = array("Készíthetek saját BBCode tag-eket?", "Nem, sajnos erre nincs lehetõség a phpBB 2.0 verziójában. Késõbbiekben tervezzük egyéni, testreszabható BBCode tag-ek bevezetését.");

//
// This ends the BBCode guide entries
//

?>

[Phpbb-checkins] CVS: phpBB2 upgrade.php,1.20,1.21

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

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

Modified Files:
	upgrade.php 
Log Message:
Various updates to style and generated output, updated IP section to batch convert

Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** upgrade.php	11 Feb 2002 13:05:08 -0000	1.20
--- upgrade.php	12 Feb 2002 00:52:59 -0000	1.21
***************
*** 22,25 ****
--- 22,28 ----
  if ( !defined('INSTALLING') )
  {
+ 	error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
+ 	set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+ 
  	//
  	// If we are being called from the install script then we don't need these
***************
*** 72,81 ****
[...2357 lines suppressed...]
  				query($sql, "Couldn't drop table :: " . $drop_tables[$i]);
  
! 				print "<span class=\"ok\"><b>OK</b></span><br />\n";
  			}
  
! 			echo "\n<br /><br />\n\n<font size=\"+3\"><b>UPGRADE COMPLETED</b></font><br />\n";
  	}
  }
***************
*** 1831,1833 ****
  print "<br />If the upgrade completed without error you may click <a href=\"index.$phpEx\">Here</a> to proceed to the index<br />";
  
! ?>
--- 1858,1862 ----
  print "<br />If the upgrade completed without error you may click <a href=\"index.$phpEx\">Here</a> to proceed to the index<br />";
  
! common_footer();
! 
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/includes search.php,1.7,1.8

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

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

Modified Files:
	search.php 
Log Message:
Fix error in common word update

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/search.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** search.php	11 Feb 2002 18:22:35 -0000	1.7
--- search.php	12 Feb 2002 00:04:55 -0000	1.8
***************
*** 244,248 ****
  	}
  
! 	remove_common('single', 0.4, $word);
  
  	return;
--- 244,251 ----
  	}
  
! 	if ( $mode == 'single' )
! 	{
! 		remove_common('single', 0.4, $word);
! 	}
  
  	return;
***************
*** 299,303 ****
  		while( $row = $db->sql_fetchrow($result) )
  		{
! 			$common_word_id = ( $common_word_id != "" ) ? ", " . $row['word_id'] : $row['word_id'];
  		}
  
--- 302,306 ----
  		while( $row = $db->sql_fetchrow($result) )
  		{
! 			$common_word_id .= ( $common_word_id != "" ) ? ", " . $row['word_id'] : $row['word_id'];
  		}
  

[Phpbb-checkins] CVS: phpBB2/includes search.php,1.6,1.7

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

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

Modified Files:
	search.php 
Log Message:
Further updates to decrease queries/increase speed ... under MySQL and MSSQL ... haven't checked compatibility with other DB's yet ...

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/search.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search.php	11 Feb 2002 00:28:17 -0000	1.6
--- search.php	11 Feb 2002 18:22:35 -0000	1.7
***************
*** 20,42 ****
   ***************************************************************************/
  
- //
- // This charset data is borrowed from mnoGoSearch 1.x (http://www.mnogosearch.com/ )
- //
- $charset_all = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
- 
- $charset = array();
- $charset['usacii'] = array();
- $charset['iso88591'] = array(0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xDF, 0); /* Western European */
- $charset['iso88592'] = array(193, 195, 194, 196, 161, 198, 200, 199, 207, 201, 204, 203, 202, 208, 205, 206, 197, 165, 163, 209, 210, 211, 212, 214, 213, 192, 216, 166, 169, 170, 171, 222, 218, 220, 219, 217, 221, 175, 172, 174, 223, 225, 227, 226, 228, 177, 230, 232, 231, 239, 233, 236, 235, 234, 240, 237, 238, 229, 181, 179, 241, 242, 243, 244, 246, 245, 224, 248, 182, 185, 186, 187, 254, 250, 252, 251, 249, 253, 191, 188, 190, 223, 0); /* Central European */
- $charset['iso88594'] = array(); /* Baltic */
- $charset['iso88595'] = array(0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xA1, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xF1, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0); /* Cyrillic */
- $charset['iso88596'] = array(); /* Arabic */
- $charset['iso88597'] = array(0xc1, 0xb6, 0xdc, 0xc2, 0xc3, 0xc4, 0xc5, 0xb8, 0xdd, 0xc6, 0xc7, 0xb9, 0xde, 0xc8, 0xc9, 0xba, 0xda, 0xdf, 0xc0, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xbc, 0xfc, 0xd0, 0xd1, 0xd3, 0xf2, 0xd4, 0xd5, 0xbe, 0xdb, 0xfd, 0xfb, 0xe0, 0xd6, 0xd7, 0xd8, 0xd9, 0xbf, 0xfe, 0xe1, 0xe1, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe5, 0xe5, 0xe6, 0xe7, 0xe7, 0xe7, 0xe8, 0xe9, 0xe9, 0xe9, 0xe9, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xef, 0xef, 0xf0, 0xf1, 0xf3, 0xf3, 0xf4, 0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xf9, 0xf9, 0); /* Greek */
- $charset['iso88598'] = array(0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0x00); /* Hebrew */
- $charset['iso88599'] = array(); /* Turkish */
- $charset['iso885913'] = array(); /* Baltic 2 */
- $charset['cp1256'] = array(0x8d, 0x8e, 0x90, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xde, 0xdf, 0xe1, 0xe3, 0xe4, 0xe5, 0xe6, 0xec, 0xed, 0); 
- $charset[''] = array();
- 
  function clean_words($mode, &$entry, &$synonym_list)
  {
--- 20,23 ----
***************
*** 134,252 ****
  	$search_raw_words['title'] = split_words(clean_words("post", $post_title, $synonym_array));
  
  	while( list($word_in, $search_matches) = @each($search_raw_words) )
  	{
- 		$title_match = ( $word_in == 'title' ) ? 1 : 0;
- 		$value_sql = "";
- 
  		if( !empty($search_matches) )
  		{
! 			sort($search_matches);
! 
! 			$word = array();
! 			$prev_word = "";
! 			$word_text_sql = "";
! 
  			for ($i = 0; $i < count($search_matches); $i++)
  			{ 
  				$search_matches[$i] = trim($search_matches[$i]);
  
! 				if( $search_matches[$i] != "" && $search_matches[$i] != $prev_word ) 
  				{
  					$word[] = $search_matches[$i]; 
! 					$word_text_sql .= ( ( $word_text_sql != "" ) ? ", " : "" ) . "'" . $search_matches[$i] . "'";
  				} 
- 
- 				$prev_word = $search_matches[$i];
  			}
  
! 			$sql = "SELECT word_id, word_text, word_common    
! 				FROM " . SEARCH_WORD_TABLE . " 
! 				WHERE word_text IN ($word_text_sql)";
! 			if( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
! 			}
  
! 			$check_words = array();
! 			$word_id_list = array();
! 			while( $row = $db->sql_fetchrow($result) )
  			{
! 				$check_words[$row['word_text']] = $row['word_common'];
! 				$word_id_list[] = $row['word_id'];
  			}
  
! 			$match_word = array();
! 			for ($i = 0; $i < count($word); $i++)
! 			{ 
! 				$new_match = true;
! 				$word_common = false;
! 
! 				if( isset($check_words[$word[$i]]) )
! 				{
! 					$new_match = false;
! 				}
! 				else if( empty($check_words[$word[$i]]) )
  				{
! 					$match_word[] = "'" . $word[$i] . "'";
  				}
  
! 				if( $new_match )
  				{
! 					switch( SQL_LAYER )
! 					{
! 						case 'mysql':
! 						case 'mysql4':
! 							$value_sql .= ( ( $value_sql != "" ) ? ", " : "" ) . "('" . $word[$i] . "', 0)";
! 							break;
! 						case 'mssql':
! 						case 'mssql-odbc':
! 							$value_sql .= ( ( $value_sql != "" ) ? " UNION ALL " : "" ) . "SELECT '" . $word[$i] . "', 0";
! 							break;
! 						default:
! 							$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
! 								VALUES ('" . $word[$i] . "', 0)"; 
! 							if( !($result = $db->sql_query($sql)) )
! 							{
! 								message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
! 							}
! 							break;
! 					}
  				}
  			}
  
! 			if ( $value_sql != "" )
  			{
! 				switch ( SQL_LAYER )
  				{
  					case 'mysql':
  					case 'mysql4':
! 						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
! 							VALUES $value_sql"; 
  						break;
  					case 'mssql':
  					case 'mssql-odbc':
! 						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
! 							$value_sql"; 
  						break;
  				}
  
! 				if( !($result = $db->sql_query($sql)) )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
! 				}
  			}
  
- 			$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)"; 
  			if( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
  			}
  		}
  	}
  
! 	remove_common("single", 0.4, $word_id_list);
  
  	return;
--- 115,248 ----
  	$search_raw_words['title'] = split_words(clean_words("post", $post_title, $synonym_array));
  
+ 	$word = array();
+ 	$word_text_sql = array();
  	while( list($word_in, $search_matches) = @each($search_raw_words) )
  	{
  		if( !empty($search_matches) )
  		{
! 			$word_text_sql[$word_in] = "";
  			for ($i = 0; $i < count($search_matches); $i++)
  			{ 
  				$search_matches[$i] = trim($search_matches[$i]);
  
! 				if( $search_matches[$i] != "" ) 
  				{
  					$word[] = $search_matches[$i]; 
! 					$word_text_sql[$word_in] .= ( ( $word_text_sql[$word_in] != "" ) ? ", " : "" ) . "'" . $search_matches[$i] . "'";
  				} 
  			}
+ 		}
+ 	}
  
! 	if( count($word) )
! 	{
! 		sort($word);
  
! 		$prev_word = "";
! 		$temp_word = array();
! 		for($i = 0; $i < count($word); $i++)
! 		{
! 			if ( $word[$i] != $prev_word )
  			{
! 				$temp_word[] = $word[$i];
  			}
+ 			$prev_word = $word[$i];
+ 		}
+ 		$word = $temp_word;
  
! 		$check_words = array();
! 		switch( SQL_LAYER )
! 		{
! 			case 'postgresql':
! 			case 'msaccess':
! 			case 'oracle':
! 			case 'db2':
! 				$sql = "SELECT word_id, word_text, word_common    
! 					FROM " . SEARCH_WORD_TABLE . " 
! 					WHERE word_text IN ($word_text_sql)";
! 				if( !($result = $db->sql_query($sql)) )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
  				}
  
! 				while( $row = $db->sql_fetchrow($result) )
  				{
! 					$check_words[$row['word_text']] = $row['word_common'];
  				}
+ 				break;
+ 		}
+ 
+ 		$value_sql = "";
+ 		$match_word = array();
+ 		for ($i = 0; $i < count($word); $i++)
+ 		{ 
+ 			$new_match = true;
+ 			if( isset($check_words[$word[$i]]) )
+ 			{
+ 				$new_match = false;
  			}
  
! 			if( $new_match )
  			{
! 				switch( SQL_LAYER )
  				{
  					case 'mysql':
  					case 'mysql4':
! 						$value_sql .= ( ( $value_sql != "" ) ? ", " : "" ) . "('" . $word[$i] . "')";
  						break;
  					case 'mssql':
  					case 'mssql-odbc':
! 						$value_sql .= ( ( $value_sql != "" ) ? " UNION ALL " : "" ) . "SELECT '" . $word[$i] . "'";
! 						break;
! 					default:
! 						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text) 
! 							VALUES ('" . $word[$i] . "', 0)"; 
! 						if( !($result = $db->sql_query($sql)) )
! 						{
! 							message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
! 						}
  						break;
  				}
+ 			}
+ 		}
  
! 		if ( $value_sql != "" )
! 		{
! 			switch ( SQL_LAYER )
! 			{
! 				case 'mysql':
! 				case 'mysql4':
! 					$sql = "INSERT IGNORE INTO " . SEARCH_WORD_TABLE . " (word_text) 
! 						VALUES $value_sql"; 
! 					break;
! 				case 'mssql':
! 				case 'mssql-odbc':
! 					$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text) 
! 						$value_sql"; 
! 					break;
  			}
  
  			if( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
  			}
  		}
  	}
  
! 	while( list($word_in, $match_sql) = @each($word_text_sql) )
! 	{
! 		$title_match = ( $word_in == 'title' ) ? 1 : 0;
! 
! 		$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 ($match_sql)"; 
! 		if( !($result = $db->sql_query($sql)) )
! 		{
! 			message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
! 		}
! 	}
! 
! 	remove_common('single', 0.4, $word);
  
  	return;
***************
*** 272,286 ****
  		$common_threshold = floor($row['total_posts'] * $fraction);
  
- 		$word_id_sql = "";
  		if( $mode == "single" && count($word_id_list) )
  		{
! 			$word_id_sql = "WHERE word_id IN (" . implode(", ", $word_id_list) . ") ";
  		}
  
- 		$sql = "SELECT word_id 
- 			FROM " . SEARCH_MATCH_TABLE . " 
- 			$word_id_sql 
- 			GROUP BY word_id 
- 			HAVING COUNT(word_id) > $common_threshold";
  		if( !($result = $db->sql_query($sql)) )
  		{
--- 268,294 ----
  		$common_threshold = floor($row['total_posts'] * $fraction);
  
  		if( $mode == "single" && count($word_id_list) )
  		{
! 			$word_id_sql = "";
! 			for($i = 0; $i < count($word_id_list); $i++)
! 			{
! 				$word_id_sql .= ( ( $word_id_sql != "" ) ? ", " : "" ) . "'" . $word_id_list[$i] . "'";
! 			}
! 
! 			$sql = "SELECT m.word_id 
! 				FROM " . SEARCH_MATCH_TABLE . " m, " . SEARCH_WORD_TABLE . " w 
! 				WHERE w.word_text IN ($word_id_sql)  
! 					AND m.word_id = w.word_id 
! 				GROUP BY m.word_id 
! 				HAVING COUNT(m.word_id) > $common_threshold";
! 		}
! 		else 
! 		{
! 			$sql = "SELECT word_id 
! 				FROM " . SEARCH_MATCH_TABLE . " 
! 				GROUP BY word_id 
! 				HAVING COUNT(word_id) > $common_threshold";
  		}
  
  		if( !($result = $db->sql_query($sql)) )
  		{

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.21,1.22

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

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

Modified Files:
	mssql_schema.sql 
Log Message:
Altered wordlist table to ignore duplicates on the word_text index

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** mssql_schema.sql	11 Feb 2002 13:11:36 -0000	1.21
--- mssql_schema.sql	11 Feb 2002 17:21:30 -0000	1.22
***************
*** 623,627 ****
  GO
  
!  CREATE  UNIQUE  INDEX [IX_phpbb_search_wordlist] ON [phpbb_search_wordlist]([word_text]) ON [PRIMARY]
  GO
  
--- 623,630 ----
  GO
  
!  CREATE  UNIQUE  INDEX [IX_phpbb_search_wordlist] ON [phpbb_search_wordlist]([word_text]) WITH  IGNORE_DUP_KEY  ON [PRIMARY]
! GO
! 
!  CREATE  INDEX [IX_phpbb_search_wordlist_1] ON [phpbb_search_wordlist]([word_common]) ON [PRIMARY]
  GO