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

[Phpbb-checkins] CVS: phpBB2 posting.php,1.110,1.111

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

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

Modified Files:
	posting.php 
Log Message:
Convert accents on chars into 'equivalent' plain letters

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -r1.110 -r1.111
*** posting.php	2001/11/25 23:31:03	1.110
--- posting.php	2001/11/26 01:37:25	1.111
***************
*** 38,43 ****
--- 38,52 ----
  	static $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
  
+ 	static $sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
+ 	static $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "i", "i", "i", "i", "i", "i", "u", "u", "u", "u", "y", "t", "y");
+ 
+ 	static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
+ 	static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "i", "i", "i", "i", "i", "i", "u", "u", "u", "u", "y", "t", "y");
+ 
  	$entry = " " . stripslashes(strip_tags(strtolower($entry))) . " ";
  
+ 	$entry = str_replace($sgml_match, $sgml_match, $entry);
+ 	$entry = str_replace($accent_match, $accent_replace, $entry);
+ 
  	$entry = preg_replace("/[\n\r]/is", " ", $entry); 
  	$entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry); 
***************
*** 80,83 ****
--- 89,93 ----
  function split_words(&$entry)
  {
+ 	$split_entries = array();
  	preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
  
***************
*** 1030,1037 ****
  if( $submit && $mode != "vote" )
  {
! 	if( !empty($HTTP_POST_VARS['username']) )
  	{
- 		$post_username = trim(strip_tags($HTTP_POST_VARS['username']));
- 
  		if( !validate_username(stripslashes($post_username)) )
  		{
--- 1040,1046 ----
  if( $submit && $mode != "vote" )
  {
! 	$post_username = trim(strip_tags($HTTP_POST_VARS['username']));
! 	if( !empty($post_username) )
  	{
  		if( !validate_username(stripslashes($post_username)) )
  		{
***************
*** 1049,1053 ****
  	}
  
! 	$post_subject = trim(strip_tags($HTTP_POST_VARS['subject']));
  	if( $mode == 'newtopic' && empty($post_subject) )
  	{
--- 1058,1062 ----
  	}
  
! 	$post_subject = trim(strip_tags(str_replace(" ", " ", $HTTP_POST_VARS['subject'])));
  	if( $mode == 'newtopic' && empty($post_subject) )
  	{
***************
*** 1060,1064 ****
  	}
  
! 	if( !empty($HTTP_POST_VARS['message']) )
  	{
  		if( !$error )
--- 1069,1074 ----
  	}
  
! 	$post_message = trim(str_replace(" ", " ", $HTTP_POST_VARS['message']));
! 	if( !empty($post_message) )
  	{
  		if( !$error )
***************
*** 1068,1074 ****
  				$bbcode_uid = make_bbcode_uid();
  			}
- 
- 			$post_message = prepare_message($HTTP_POST_VARS['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
  
  		}
  	}
--- 1078,1083 ----
  				$bbcode_uid = make_bbcode_uid();
  			}
  
+ 			$post_message = prepare_message($post_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
  		}
  	}

[Phpbb-checkins] CVS: phpBB2 profile.php,1.141,1.142

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

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

Modified Files:
	profile.php 
Log Message:
stripslash email messages + remove  's from usernames, email addresses

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -r1.141 -r1.142
*** profile.php	2001/11/25 23:31:04	1.141
--- profile.php	2001/11/26 01:27:00	1.142
***************
*** 471,478 ****
  			{
  				$user_id = intval($HTTP_POST_VARS['user_id']);
! 				$current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email'])));
  			}
! 			$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
! 			$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";
  
  			$password_current = (!empty($HTTP_POST_VARS['cur_password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['cur_password']))) : "";
--- 471,479 ----
  			{
  				$user_id = intval($HTTP_POST_VARS['user_id']);
! 				$current_email = trim(strip_tags(htmlspecialchars(str_replace(" ", " ",$HTTP_POST_VARS['current_email']))));
  			}
! 
! 			$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags(str_replace(" ", " ", $HTTP_POST_VARS['username']))) : "";
! 			$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars(str_replace(" ", " ",$HTTP_POST_VARS['email'])))) : "";
  
  			$password_current = (!empty($HTTP_POST_VARS['cur_password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['cur_password']))) : "";
***************
*** 775,780 ****
  								else
  								{
  									$error = true;
! 									$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
  								}
  							}
--- 776,783 ----
  								else
  								{
+ 									$l_avatar_size = sprintf($lang['Avatar_imagesize'], $board_config['avatar_max_width'], $board_config['avatar_max_height']);
+ 
  									$error = true;
! 									$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $l_avatar_size : $l_avatar_size;
  								}
  							}
***************
*** 782,788 ****
  						else
  						{
  							$error = true;
! 							$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! 							$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
  						}
  					}
--- 785,792 ----
  						else
  						{
+ 							$l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024));
+ 
  							$error = true;
! 							$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $l_avatar_size : $l_avatar_size;
  						}
  					}
***************
*** 1113,1117 ****
  								$emailer->use_template($email_template);
  								$emailer->email_address($email);
! 								$emailer->set_subject($lang['Welcome_subject']);
  								$emailer->extra_headers($email_headers);
  
--- 1117,1121 ----
  								$emailer->use_template($email_template);
  								$emailer->email_address($email);
! 								$emailer->set_subject(sprintf($lang['Welcome_subject'], $board_config['sitename']));
  								$emailer->extra_headers($email_headers);
  
***************
*** 1119,1123 ****
  								{
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => $lang['Welcome_subject'],
  										"USERNAME" => $username,
  										"PASSWORD" => $password_confirm,
--- 1123,1127 ----
  								{
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => sprintf($lang['Welcome_subject'], $board_config['sitename']),
  										"USERNAME" => $username,
  										"PASSWORD" => $password_confirm,
***************
*** 1141,1145 ****
  								{
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => $lang['Welcome_subject'],
  										"USERNAME" => $username,
  										"PASSWORD" => $password_confirm,
--- 1145,1149 ----
  								{
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => sprintf($lang['Welcome_subject'], $board_config['sitename']),
  										"USERNAME" => $username,
  										"PASSWORD" => $password_confirm,
***************
*** 1161,1165 ****
  
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => $lang['Welcome_subject'],
  										"USERNAME" => $username,
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
--- 1165,1169 ----
  
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => sprintf($lang['Welcome_subject'], $board_config['sitename']),
  										"USERNAME" => $username,
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
***************
*** 1862,1866 ****
  					if( !empty($HTTP_POST_VARS['subject']) )
  					{
! 						$subject = trim(strip_tags($HTTP_POST_VARS['subject']));
  					}
  					else
--- 1866,1870 ----
  					if( !empty($HTTP_POST_VARS['subject']) )
  					{
! 						$subject = trim(strip_tags(stripslashes($HTTP_POST_VARS['subject'])));
  					}
  					else
***************
*** 1872,1876 ****
  					if( !empty($HTTP_POST_VARS['message']) )
  					{
! 						$message = trim(strip_tags($HTTP_POST_VARS['message']));
  					}
  					else
--- 1876,1880 ----
  					if( !empty($HTTP_POST_VARS['message']) )
  					{
! 						$message = trim(strip_tags(stripslashes($HTTP_POST_VARS['message'])));
  					}
  					else

[Phpbb-checkins] CVS: phpBB2/includes emailer.php,1.8,1.9 smtp.php,1.4,1.5

[Nathan C. <na...@us...>]

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

Modified Files:
	emailer.php smtp.php 
Log Message:
Fixed bug 481943. Regexp that normalized linebreaks to \r\n was fucked, so it was changing (char)\n to \r\n and dropping (char). Hence we lost the char before every single linebreak in every email sent thru SMTP. yay. ALso fixed so it gets the FROM address from the right place.

Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** emailer.php	2001/11/13 16:07:42	1.8
--- emailer.php	2001/11/26 00:50:03	1.9
***************
*** 172,178 ****
  	function send()
  	{
! 		global $phpEx;
  
! 		$phpbb_root_path = "./";
  
  		if ($this->address == NULL)
--- 172,186 ----
  	function send()
  	{
! 		global $phpEx, $phpbb_root_dir;
  
! 		if (isset($phpbb_root_dir))
! 		{
! 			// we must be in the admin section.
! 			$phpbb_root_path = $phpbb_root_dir;
! 		}
! 		else
! 		{
! 			$phpbb_root_path = "./";
! 		}
  
  		if ($this->address == NULL)

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** smtp.php	2001/08/30 22:20:23	1.4
--- smtp.php	2001/11/26 00:50:03	1.5
***************
*** 42,46 ****
  	if(!(substr($server_response, 0, 3) == $response))
  	{
! 		message_die(GENERAL_ERROR, "Ran into problems sending Mail", "", __LINE__, __FILE__);
  	}
  }
--- 42,46 ----
  	if(!(substr($server_response, 0, 3) == $response))
  	{
! 		message_die(GENERAL_ERROR, "Ran into problems sending Mail. Response: $server_response", "", __LINE__, __FILE__);
  	}
  }
***************
*** 64,68 ****
  	// Fix any bare linefeeds in the message to make it RFC821 Compliant.
  	//
! 	$message = ereg_replace("[^\r]\n", "\r\n", $message);
  
  	if ($headers != "")
--- 64,68 ----
  	// Fix any bare linefeeds in the message to make it RFC821 Compliant.
  	//
! 	$message = preg_replace("/(?<!\r)\n/si", "\r\n", $message);
  
  	if ($headers != "")
***************
*** 82,86 ****
  
  		// Make sure there are no bare linefeeds in the headers
! 		$headers = ereg_replace("[^\r]\n", "\r\n", $headers);
  	}
  	if(trim($mail_to) == "")
--- 82,86 ----
  
  		// Make sure there are no bare linefeeds in the headers
! 		$headers = preg_replace("/(?<!\r)\n/si", "\r\n", $headers);
  	}
  	if(trim($mail_to) == "")
***************
*** 115,119 ****
  
  	// Specify who the mail is from....
! 	fputs($socket, "MAIL FROM: $email_from\r\n");
  	server_parse($socket, "250");
  
--- 115,119 ----
  
  	// Specify who the mail is from....
! 	fputs($socket, "MAIL FROM: " . $board_config['board_email'] . "\r\n");
  	server_parse($socket, "250");
  

[Phpbb-checkins] CVS: phpBB2/admin admin_forums.php,1.26,1.27

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

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

Modified Files:
	admin_forums.php 
Log Message:
Fixed bug #481283 and #484466 (can't delete forums/cats)

Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** admin_forums.php	2001/11/19 21:57:50	1.26
--- admin_forums.php	2001/11/26 00:01:38	1.27
***************
*** 554,557 ****
--- 554,558 ----
  				"L_FORUM_NAME" => $lang['Forum_name'], 
  
+ 				"S_HIDDEN_FIELDS" => $s_hidden_fields,
  				'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), 
  				'S_SELECT_TO' => $select_to,
***************
*** 886,888 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 887,889 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.51,1.52

[Nathan C. <na...@us...>]

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

Modified Files:
	lang_main.php 
Log Message:
Fixed bug 478218 -- [ and ] in usernames qith quote= bbcode. Usernames can no longer contain the double-quote character. Also removed a dupe from lang_main file.

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** lang_main.php	2001/11/24 15:57:31	1.51
--- lang_main.php	2001/11/25 23:31:04	1.52
***************
*** 456,460 ****
  $lang['No_user_id_specified'] = "Sorry but that user does not exist";
  $lang['Wrong_Profile'] = "You cannot modify a profile that is not your own.";
- $lang['Bad_username'] = "The username you choose has been taken or is disallowed by the administrator.";
  $lang['Sorry_banned_or_taken_email'] = "Sorry but the email address you gave has either been banned, is already registered to another user or is invalid. Please try an alternative address, if that is also banned you should contact the board administrator for advice";
  $lang['Only_one_avatar'] = "Only one type of avatar can be specified";
--- 456,459 ----
***************
*** 515,519 ****
  $lang['Password_mismatch'] = "The passwords you entered did not match";
  $lang['Current_password_mismatch'] = "The current password you supplied does not match that stored in the database";
! $lang['Invalid_username'] = "The username you requested has been taken or disallowed";
  $lang['Signature_too_long'] = "Your signature is too long";
  $lang['Fields_empty'] = "You must fill in the required fields";
--- 514,518 ----
  $lang['Password_mismatch'] = "The passwords you entered did not match";
  $lang['Current_password_mismatch'] = "The current password you supplied does not match that stored in the database";
! $lang['Invalid_username'] = "The username you requested has been taken or disallowed, or contains invalid characters like the \" character";
  $lang['Signature_too_long'] = "Your signature is too long";
  $lang['Fields_empty'] = "You must fill in the required fields";

[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.14,1.15 functions.php,1.83,1.84

[Nathan C. <na...@us...>]

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

Modified Files:
	bbcode.php functions.php 
Log Message:
Fixed bug 478218 -- [ and ] in usernames qith quote= bbcode. Usernames can no longer contain the double-quote character. Also removed a dupe from lang_main file.

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** bbcode.php	2001/10/24 22:52:16	1.14
--- bbcode.php	2001/11/25 23:31:04	1.15
***************
*** 168,172 ****
  	$text = str_replace("[/quote:$uid]", $bbcode_tpl['quote_close'], $text);
  	
! 	$text = preg_replace("/\[quote:$uid=(.*?)\]/si", $bbcode_tpl['quote_username_open'], $text);
  
  	// [b] and [/b] for bolding text.
--- 168,172 ----
  	$text = str_replace("[/quote:$uid]", $bbcode_tpl['quote_close'], $text);
  	
! 	$text = preg_replace("/\[quote:$uid=\"?(.*?)\"?\]/si", $bbcode_tpl['quote_username_open'], $text);
  
  	// [b] and [/b] for bolding text.
***************
*** 241,245 ****
  	$text = bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, '');
  	
! 	$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(.*?)\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
  
  	// [list] and [list=x] for (un)ordered lists.
--- 241,245 ----
  	$text = bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, '');
  	
! 	$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\".*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
  
  	// [list] and [list=x] for (un)ordered lists.
***************
*** 277,282 ****
  	$text = substr($text, 1);
  
- 	// Add the uid tag to the start of the string..
- 	//$text = '[uid=' . $uid . ']' . $text;
  
  	return $text;
--- 277,280 ----

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** functions.php	2001/11/21 16:27:43	1.83
--- functions.php	2001/11/25 23:31:04	1.84
***************
*** 477,480 ****
--- 477,481 ----
  //
  // Check to see if the username has been taken, or if it is disallowed.
+ // Also checks if it includes the " character, which we don't allow in usernames.
  // Used for registering, changing names, and posting anonymously with a username
  //
***************
*** 549,552 ****
--- 550,559 ----
  			}
  		}
+ 	}
+ 
+ 	// Don't allow " in username.
+ 	if ( strstr($username, '"') )
+ 	{
+ 		return FALSE;
  	}
  

[Phpbb-checkins] CVS: phpBB2 posting.php,1.109,1.110 privmsg.php,1.54,1.55 profile.php,1.140,1.141

[Nathan C. <na...@us...>]

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

Modified Files:
	posting.php privmsg.php profile.php 
Log Message:
Fixed bug 478218 -- [ and ] in usernames qith quote= bbcode. Usernames can no longer contain the double-quote character. Also removed a dupe from lang_main file.

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -r1.109 -r1.110
*** posting.php	2001/11/24 17:17:06	1.109
--- posting.php	2001/11/25 23:31:03	1.110
***************
*** 1041,1045 ****
  				$error_msg .= "<br />";
  			}
! 			$error_msg .= $lang['Bad_username'];
  		}
  	}
--- 1041,1045 ----
  				$error_msg .= "<br />";
  			}
! 			$error_msg .= $lang['Invalid_username'];
  		}
  	}
***************
*** 2359,2363 ****
  				$msg_date =  create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['board_timezone']);
  
! 				$post_message = "[quote=" . $post_username . "]\n" . $post_message . "\n[/quote]";
  
  				$mode = "reply";
--- 2359,2363 ----
  				$msg_date =  create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['board_timezone']);
  
! 				$post_message = "[quote=\"" . $post_username . "\"]\n" . $post_message . "\n[/quote]";
  
  				$mode = "reply";

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** privmsg.php	2001/11/24 18:25:52	1.54
--- privmsg.php	2001/11/25 23:31:03	1.55
***************
*** 1264,1268 ****
  			$to_userid = $privmsg['user_id'];
  
! 			$privmsg_message = preg_replace("/(|\:1)\:$post_bbcode_uid(|\:[a-z])/si", "", $privmsg_message);
  			$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
  			$privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message);
--- 1264,1268 ----
  			$to_userid = $privmsg['user_id'];
  
! 			$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $privmsg_message);
  			$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
  			$privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message);
***************
*** 1275,1279 ****
  				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]";
  
! 				$privmsg_message = "[quote=" . $to_username . "]\n" . $privmsg_message . "\n[/quote]";
  
  				$mode = "reply";
--- 1275,1279 ----
  				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]";
  
! 				$privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]";
  
  				$mode = "reply";

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -r1.140 -r1.141
*** profile.php	2001/11/23 19:01:51	1.140
--- profile.php	2001/11/25 23:31:04	1.141
***************
*** 547,550 ****
--- 547,551 ----
  					$error_msg = $lang['Fields_empty'];
  				}
+ 				
  			}
  

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.47,1.48

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

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

Modified Files:
	modcp.php 
Log Message:
oops, missing page_header ...

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** modcp.php	2001/11/25 00:21:07	1.47
--- modcp.php	2001/11/25 03:11:50	1.48
***************
*** 189,192 ****
--- 189,195 ----
  {
  	case 'delete':
+ 		$page_title = $lang['Mod_CP'];
+ 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ 
  		if($confirm)
  		{
***************
*** 480,483 ****
--- 483,489 ----
  
  	case 'move':
+ 		$page_title = $lang['Mod_CP'];
+ 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ 
  		if( $confirm )
  		{
***************
*** 695,698 ****
--- 701,707 ----
  
  	case 'split':
+ 		$page_title = $lang['Mod_CP'];
+ 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ 
  		if( $HTTP_POST_VARS['split_type_all'] || $HTTP_POST_VARS['split_type_beyond'] )
  		{
***************
*** 892,895 ****
--- 901,907 ----
  
  	case 'ip':
+ 		$page_title = $lang['Mod_CP'];
+ 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ 
  		$rdns_ip_num = ( isset($HTTP_GET_VARS['rdns']) ) ? $HTTP_GET_VARS['rdns'] : "";
  

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.46,1.47

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

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

Modified Files:
	modcp.php 
Log Message:
Handle deletion of search matches and words upon deletion of topic + removal of confirmation on lock/unlock

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** modcp.php	2001/11/22 00:56:55	1.46
--- modcp.php	2001/11/25 00:21:07	1.47
***************
*** 184,199 ****
  
  //
- // Load page header
- //
- $page_title = $lang['Mod_CP'];
- include($phpbb_root_path . 'includes/page_header.'.$phpEx);
- 
- $template->assign_vars(array(
- 	"FORUM_NAME" => $forum_name,
- 
- 	"U_VIEW_FORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
- );
- 
- //
  // Do major work ...
  //
--- 184,187 ----
***************
*** 265,269 ****
  			}
  
! 			if( $post_id_sql != '' )
  			{
  				$sql = "DELETE 
--- 253,257 ----
  			}
  
! 			if( $post_id_sql != "" )
  			{
  				$sql = "DELETE 
***************
*** 282,288 ****
  					message_die(GENERAL_ERROR, "Could not delete posts text", "", __LINE__, __FILE__, $sql);
  				}
  			}
  
! 			if( $vote_id_sql != '' )
  			{
  				$sql = "DELETE 
--- 270,383 ----
  					message_die(GENERAL_ERROR, "Could not delete posts text", "", __LINE__, __FILE__, $sql);
  				}
+ 
+ 				$sql = "DELETE 
+ 					FROM " . SEARCH_MATCH_TABLE . " 
+ 					WHERE post_id IN ($post_id_sql)";
+ 				if( !$result = $db->sql_query($sql) )
+ 				{
+ 					message_die(GENERAL_ERROR, "Could not delete posts text", "", __LINE__, __FILE__, $sql);
+ 				}
+ 				
+ 				//
+ 				// Delete unmatched words
+ 				//
+ 				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);
+ 						}
+ 
+ 						$unmatched_count = $db->sql_affectedrows();
+ 
+ 						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);
+ 						}
+ 
+ 						$unmatched_count = $db->sql_affectedrows();
+ 
+ 						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);
+ 						}
+ 
+ 						$unmatched_count = $db->sql_affectedrows();
+ 
+ 						break;
+ 
+ 					case 'mysql':
+ 					case 'mysql4':
+ 						$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( $unmatched_count = $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 )
+ 								{
+ 									$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);
+ 									}
+ 								}
+ 								else
+ 								{
+ 									return 0;
+ 								}
+ 							}
+ 							else
+ 							{
+ 								return 0;
+ 							}
+ 						}
+ 
+ 						break;
+ 				}
+ 
  			}
  
! 			if( $vote_id_sql != "" )
  			{
  				$sql = "DELETE 
***************
*** 520,694 ****
  
  	case 'lock':
! 		if($confirm)
! 		{
! 			$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ?  $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
  
! 			$topic_id_sql = "";
! 			for($i = 0; $i < count($topics); $i++)
! 			{
! 				if( $topic_id_sql != "")
! 				{
! 					$topic_id_sql .= ", ";
! 				}
! 				$topic_id_sql .= $topics[$i];
! 			}
! 
! 			$sql = "UPDATE " . TOPICS_TABLE . " 
! 				SET topic_status = " . TOPIC_LOCKED . " 
! 				WHERE topic_id IN ($topic_id_sql)";
! 			if( !$result = $db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, "Coule not update topics table!", "Error", __LINE__, __FILE__, $sql);
! 			}
! 
! 			if( !empty($topic_id) )
! 			{
! 				$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>");
  			}
  
! 			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
! 			);
  
! 			message_die(GENERAL_MESSAGE, $lang['Topics_Locked'] . "<br /><br />" . $message);
  		}
  		else
  		{
! 			if( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
! 			{
! 				message_die(GENERAL_MESSAGE, $lang['None_selected'], $lang['Error']);
! 			}
! 
! 			$hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '"><input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">';
! 
! 			if( isset($HTTP_POST_VARS['topic_id_list']) )
! 			{
! 				$topics = $HTTP_POST_VARS['topic_id_list'];
! 				for($i = 0; $i < count($topics); $i++)
! 				{
! 					$hidden_fields .= '<input type="hidden" name="topic_id_list[]" value="' . $topics[$i] . '">';
! 				}
! 			}
! 			else
! 			{
! 				$hidden_fields .= '<input type="hidden" name="' . POST_TOPIC_URL . '" value="' . $topic_id . '">';
! 			}
! 
! 			//
! 			// Set template files
! 			//
! 			$template->set_filenames(array(
! 				"confirm" => "confirm_body.tpl")
! 			);
! 
! 			$template->assign_vars(array(
! 				"MESSAGE_TITLE" => $lang['Confirm'],
! 				"MESSAGE_TEXT" => $lang['Confirm_lock_topic'],
! 
! 				"L_YES" => $lang['Yes'],
! 				"L_NO" => $lang['No'],
  
! 				"S_CONFIRM_ACTION" => append_sid("modcp.$phpEx"),
! 				"S_HIDDEN_FIELDS" => $hidden_fields)
! 			);
  
! 			$template->pparse("confirm");
  
- 			include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
- 		}
  		break;
  
  	case 'unlock':
! 		if($confirm)
! 		{
! 			$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ?  $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
! 
! 			$topic_id_sql = "";
! 			for($i = 0; $i < count($topics); $i++)
! 			{
! 				if( $topic_id_sql != "")
! 				{
! 					$topic_id_sql .= ", ";
! 				}
! 				$topic_id_sql .= $topics[$i];
! 			}
! 
! 			$sql = "UPDATE " . TOPICS_TABLE . " 
! 				SET topic_status = " . TOPIC_UNLOCKED . " 
! 				WHERE topic_id IN ($topic_id_sql)";
! 			if( !$result = $db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, "Could not update topics table!", "Error", __LINE__, __FILE__, $sql);
! 			}
  
! 			if( !empty($topic_id) )
! 			{
! 				$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>");
  			}
! 
! 			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
! 			);
  
! 			message_die(GENERAL_MESSAGE, $lang['Topics_Unlocked'] . "<br /><br />" . $message);
  
  		}
  		else
  		{
! 			if( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
! 			{
! 				message_die(GENERAL_MESSAGE, $lang['None_selected'], $lang['Error']);
! 			}
! 
! 			$hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '"><input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">';
! 
! 			if( isset($HTTP_POST_VARS['topic_id_list']) )
! 			{
! 				$topics = $HTTP_POST_VARS['topic_id_list'];
! 				for($i = 0; $i < count($topics); $i++)
! 				{
! 					$hidden_fields .= '<input type="hidden" name="topic_id_list[]" value="' . $topics[$i] . '">';
! 				}
! 			}
! 			else
! 			{
! 				$hidden_fields .= '<input type="hidden" name="' . POST_TOPIC_URL . '" value="' . $topic_id . '">';
! 			}
! 
! 			//
! 			// Set template files
! 			//
! 			$template->set_filenames(array(
! 				"confirm" => "confirm_body.tpl")
! 			);
! 
! 			$template->assign_vars(array(
! 				"MESSAGE_TITLE" => $lang['Confirm'],
! 				"MESSAGE_TEXT" => $lang['Confirm_unlock_topic'],
  
! 				"L_YES" => $lang['Yes'],
! 				"L_NO" => $lang['No'],
  
! 				"S_CONFIRM_ACTION" => append_sid("modcp.$phpEx"),
! 				"S_HIDDEN_FIELDS" => $hidden_fields)
! 			);
! 			$template->pparse("confirm");
  
! 			include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! 		}
! 
! 	break;
  
  	case 'split':
--- 615,696 ----
  
  	case 'lock':
! 		$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ?  $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
  
! 		$topic_id_sql = "";
! 		for($i = 0; $i < count($topics); $i++)
! 		{
! 			if( $topic_id_sql != "")
  			{
! 				$topic_id_sql .= ", ";
  			}
+ 			$topic_id_sql .= $topics[$i];
+ 		}
  
! 		$sql = "UPDATE " . TOPICS_TABLE . " 
! 			SET topic_status = " . TOPIC_LOCKED . " 
! 			WHERE topic_id IN ($topic_id_sql)";
! 		if( !$result = $db->sql_query($sql) )
! 		{
! 			message_die(GENERAL_ERROR, "Coule not update topics table!", "Error", __LINE__, __FILE__, $sql);
! 		}
  
! 		if( !empty($topic_id) )
! 		{
! 			$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>");
! 		}
  
! 		$template->assign_vars(array(
! 			"META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
! 		);
  
! 		message_die(GENERAL_MESSAGE, $lang['Topics_Locked'] . "<br /><br />" . $message);
  
  		break;
  
  	case 'unlock':
! 		$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ?  $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
  
! 		$topic_id_sql = "";
! 		for($i = 0; $i < count($topics); $i++)
! 		{
! 			if( $topic_id_sql != "")
  			{
! 				$topic_id_sql .= ", ";
  			}
! 			$topic_id_sql .= $topics[$i];
! 		}
  
! 		$sql = "UPDATE " . TOPICS_TABLE . " 
! 			SET topic_status = " . TOPIC_UNLOCKED . " 
! 			WHERE topic_id IN ($topic_id_sql)";
! 		if( !$result = $db->sql_query($sql) )
! 		{
! 			message_die(GENERAL_ERROR, "Could not update topics table!", "Error", __LINE__, __FILE__, $sql);
! 		}
  
+ 		if( !empty($topic_id) )
+ 		{
+ 			$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>");
! 		}
  
! 		$template->assign_vars(array(
! 			"META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
! 		);
  
! 		message_die(GENERAL_MESSAGE, $lang['Topics_Unlocked'] . "<br /><br />" . $message);
  
! 		break;
  
  	case 'split':
***************
*** 932,936 ****
  			"IP" => $ip_this_post, 
  				
! 			"U_LOOKUP_IP" => append_sid("modcp.$phpEx?mode=ip&" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=" . $ip_this_post))
  		);
  
--- 934,938 ----
  			"IP" => $ip_this_post, 
  				
! 			"U_LOOKUP_IP" => append_sid("modcp.$phpEx?mode=ip&amp;" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=" . $ip_this_post))
  		);
  
***************
*** 962,966 ****
  				"IP" => $ip, 
  
! 				"U_LOOKUP_IP" => append_sid("modcp.$phpEx?mode=ip&" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=" . $ip))
  			);
  		}
--- 964,968 ----
  				"IP" => $ip, 
  
! 				"U_LOOKUP_IP" => append_sid("modcp.$phpEx?mode=ip&amp;" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=" . $ip))
  			);
  		}
***************
*** 988,996 ****
  
  			$template->assign_block_vars("userrow", array(
- 				"USERNAME" => $username,
  				"ROW_COLOR" => "#" . $row_color, 
  				"ROW_CLASS" => $row_class, 
  
! 				"U_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"),
  				"U_SEARCHPOSTS" => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&amp;showresults=topics"))
  			);
--- 990,998 ----
  
  			$template->assign_block_vars("userrow", array(
  				"ROW_COLOR" => "#" . $row_color, 
  				"ROW_CLASS" => $row_class, 
+ 				"USERNAME" => $username,
  
! 				"U_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$id"),
  				"U_SEARCHPOSTS" => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&amp;showresults=topics"))
  			);
***************
*** 1002,1008 ****
--- 1004,1022 ----
  
  	case 'auth':
+ 		//
+ 		// For future use ...
+ 		//
  		break;
  
  	default:
+ 		$page_title = $lang['Mod_CP'];
+ 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ 
+ 		$template->assign_vars(array(
+ 			"FORUM_NAME" => $forum_name,
+ 
+ 			"U_VIEW_FORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
+ 		);
+ 
  		$template->assign_vars(array(
  			"L_MOD_CP" => $lang['Mod_CP'],

[Phpbb-checkins] CVS: phpBB2 upgrade.php,1.3,1.4 install.php,1.15,1.16

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

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

Modified Files:
	upgrade.php install.php 
Log Message:
Upgrade script; updating keys, using table_prefix properly

Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** upgrade.php	2001/11/09 15:02:46	1.3
--- upgrade.php	2001/11/24 21:04:51	1.4
***************
*** 29,36 ****
  	include('includes/constants.'.$phpEx);
  }
  include('includes/db.'.$phpEx);
  include('includes/bbcode.'.$phpEx);
  
! set_time_limit(20*60);  // Increase maximum execution time to 20 minutes.
  
  $months = array(
--- 29,38 ----
  	include('includes/constants.'.$phpEx);
  }
+ // Force the DB type to be MySQL
+ $dbms = 'mysql';
  include('includes/db.'.$phpEx);
  include('includes/bbcode.'.$phpEx);
  
! set_time_limit(0); // Unlimited execution time
  
  $months = array(
***************
*** 95,101 ****
  function get_schema()
  {
! 	$schemafile = file('db/mysql_schema.sql');
  	$tabledata = 0;
- 	$pattern = "/^\s*(\w+)\s+(\w+)\((\d+)\)(.*)$/";
  	for($i=0; $i < count($schemafile); $i++)
  	{
--- 97,103 ----
  function get_schema()
  {
! 	global $table_prefix;
! 	$schemafile = file('db/schemas/mysql_schema.sql');
  	$tabledata = 0;
  	for($i=0; $i < count($schemafile); $i++)
  	{
***************
*** 103,113 ****
  		if(preg_match("/^CREATE TABLE (\w+)/i", $line, $matches))
  		{
  			$tabledata = 1;
! 			$table = $matches[1];
! 			$table_def[$table] = $line;
  			continue;
  		}
  		if(preg_match("/^\);/", $line))
  		{
  			$tabledata = 0;
  			$table_def[$table] .= ")"; // We don't need the closing semicolon
--- 105,119 ----
  		if(preg_match("/^CREATE TABLE (\w+)/i", $line, $matches))
  		{
+ 			// Start of a new table definition, set some variables and go to the next line.
  			$tabledata = 1;
! 			// Replace the 'phpbb_' prefix by the user defined prefix.
! 			$table = str_replace("phpbb_", $table_prefix, $matches[1]);
! 			$table_def[$table] = "CREATE TABLE $table (\n";
  			continue;
  		}
  		if(preg_match("/^\);/", $line))
  		{
+ 			// End of the table definition
+ 			// After this we will skip everything until the next 'CREATE' line
  			$tabledata = 0;
  			$table_def[$table] .= ")"; // We don't need the closing semicolon
***************
*** 115,153 ****
  		if($tabledata == 1)
  		{
  			$table_def[$table] .= $line;
! 			preg_match($pattern, $line, $matches);
! 			$i%2 == 1 ? $color = "#FF0000" : $color = "#0000FF"; 
! 			$field = $matches[1];
! 			$type = $matches[2];
! 			$size = $matches[3];
! 			preg_match("/DEFAULT (NULL|\'.*?\')[,\s](.*)$/i", $matches[4], $match);
! 			$default = $match[1];
! 			preg_match("/NOT NULL/i", $matches[4]) ? $notnull = 1 : $notnull =0;
! 			preg_match("/auto_increment/i", $matches[4]) ? $auto_increment = 1 : $auto_increment =0;
! 			/*
! 			print "<font color = $color>\n";
! 			print "$line<br>\n";
! 			print "$field $type($size)";
! 			if (isset($default)){
! 				print " DEFAULT $default";
! 			}
! 			if ($notnull == 1)
! 			{
! 				print " NOT NULL";
! 			}
! 			if ($auto_increment == 1)
! 			{
! 				print " auto_increment";
! 			}
! 			print "<br>\n";
! 			print "<font>\n";
! 			*/
! 			$field_def[$table][$field] = array(
! 				'type' => $type,
! 				'size' => $size,
! 				'default' => $default,
! 				'notnull' => $notnull,
! 				'auto_increment' => $auto_increment
  				);
  		}
  	}
--- 121,185 ----
  		if($tabledata == 1)
  		{
+ 			// We are inside a table definition, parse this line.
+ 			// Add the current line to the complete table definition:
  			$table_def[$table] .= $line;
! 			if(preg_match("/^\s*(\w+)\s+(\w+)\((\d+)\)(.*)$/", $line, $matches))
! 			{
! 				// This is a column definition
! 				$field = $matches[1];
! 				$type = $matches[2];
! 				$size = $matches[3];
! 				preg_match("/DEFAULT (NULL|\'.*?\')[,\s](.*)$/i", $matches[4], $match);
! 				$default = $match[1];
! 				preg_match("/NOT NULL/i", $matches[4]) ? $notnull = 1 : $notnull =0;
! 				preg_match("/auto_increment/i", $matches[4]) ? $auto_increment = 1 : $auto_increment = 0;
! 				/*
! 				$i%2 == 1 ? $color = "#FF0000" : $color = "#0000FF"; 
! 				print "<font color = $color>\n";
! 				print "$line<br>\n";
! 				print "$field $type($size)";
! 				if (isset($default)){
! 					print " DEFAULT $default";
! 				}
! 				if ($notnull == 1)
! 				{
! 					print " NOT NULL";
! 				}
! 				if ($auto_increment == 1)
! 				{
! 					print " auto_increment";
! 				}
! 				print "<br>\n";
! 				print "<font>\n";
! 				*/
! 				$field_def[$table][$field] = array(
! 					'type' => $type,
! 					'size' => $size,
! 					'default' => $default,
! 					'notnull' => $notnull,
! 					'auto_increment' => $auto_increment
  				);
+ 			}
+ 			
+ 			if(preg_match("/\s*PRIMARY\s+KEY\s*\((.*)\).*/", $line, $matches))
+ 			{
+ 				// Primary key
+ 				$key_def[$table]['PRIMARY'] = $matches[1];
+ 			}
+ 			else if(preg_match("/\s*KEY\s+(\w+)\s*\((.*)\)/", $line, $matches))
+ 			{
+ 				// Normal key
+ 				$key_def[$table][$matches[1]] = $matches[2];
+ 			}
+ 			else if(preg_match("/^\s*(\w+)\s*(.*?),?\s*$/", $line, $matches))
+ 			{
+ 				// Column definition
+ 				$create_def[$table][$matches[1]] = $matches[2];
+ 			}
+ 			else
+ 			{
+ 				print "$line<br>";
+ 				// It's a bird! It's a plane! It's something we didn't expect ;(
+ 			}
  		}
  	}
***************
*** 159,162 ****
--- 191,196 ----
  	$schema['field_def'] = $field_def;
  	$schema['table_def'] = $table_def;
+ 	$schema['create_def'] = $create_def;
+ 	$schema['key_def'] = $key_def;
  	return $schema;
  }
***************
*** 164,171 ****
  function get_inserts()
  {
! 	$insertfile = file("db/mysql_basic.sql");
  	for($i=0; $i < count($insertfile); $i++)
  	{
! 		if (preg_match("/^(.*INSERT INTO (.*?)\s.*);$/i", $insertfile[$i], $matches))
  		{
  			$returnvalue[$matches[2]][] = $matches[1];
--- 198,206 ----
  function get_inserts()
  {
! 	global $table_prefix;
! 	$insertfile = file("db/schemas/mysql_basic.sql");
  	for($i=0; $i < count($insertfile); $i++)
  	{
! 		if (preg_match("/^(.*INSERT INTO (.*?)\s.*);$/i", str_replace("phpbb_", $table_prefix, $insertfile[$i]), $matches))
  		{
  			$returnvalue[$matches[2]][] = $matches[1];
***************
*** 297,300 ****
--- 332,350 ----
  $debug=1;
  
+ // Parse the MySQL schema file into some arrays.
+ $schema = get_schema();
+ $table_def = $schema['table_def'];
+ $field_def = $schema['field_def'];
+ $key_def = $schema['key_def'];
+ $create_def = $schema['create_def'];
+ 
+ /*
+ print "tables:<br>";
+ print_r($table_def);
+ print "create:<br>";
+ print_r($create_def);
+ die;
+ */
+ 
  if(isset($next))
  {
***************
*** 306,320 ****
  		$sql = "DROP TABLE sessions";
  		query($sql, "Couldn't drop table 'sessions'");
! 		end_step('rename_tables');
  
! 	case 'rename_tables':
  		common_header();
  		echo "<H2>Step 2: Rename tables</H2>\n";
  
! 		$newnames = array(
  			"banlist" => "banlist",
  			"catagories" => "categories",
! 			// Don't rename config yet, we'll create a new one and merge those later.
! 			//"config" => "config",
  			"forums" => "forums",
  			"disallow" => "disallow",
--- 356,371 ----
  		$sql = "DROP TABLE sessions";
  		query($sql, "Couldn't drop table 'sessions'");
! 		$sql = "DROP TABLE themes";
! 		query($sql, "Couldn't drop table 'themes'");
! 		end_step('mod_old_tables');
  
! 	case 'mod_old_tables':
  		common_header();
  		echo "<H2>Step 2: Rename tables</H2>\n";
  
! 		$modtables = array(
  			"banlist" => "banlist",
  			"catagories" => "categories",
! 			"config" => "old_config",
  			"forums" => "forums",
  			"disallow" => "disallow",
***************
*** 323,346 ****
  			"priv_msgs" => "privmsgs",
  			"ranks" => "ranks",
- 			"sessions" => "sessions",
  			"smiles" => "smilies",
  			"topics" => "topics",
  			"users" => "users",
  			"words" => "words"
! 			);
! 		while(list($old, $new) = each($newnames))
  		{
! 			$new = $table_prefix . $new;
! 			$sql = "ALTER TABLE $old RENAME $new";
! 			if(!$result = $db->sql_query($sql))
! 			{
! 				echo "Couldn't rename '$old' to '$new'<br>\n";
! 				$sql_error = $db->sql_error();
! 				print $sql_error['code'] .": ". $sql_error['message']. "<br>\n";
! 			}
! 			else
  			{
! 				print "Renamed '$old' to '$new'<br>\n";
  			}
  		}
  		common_footer();
--- 374,401 ----
  			"priv_msgs" => "privmsgs",
  			"ranks" => "ranks",
  			"smiles" => "smilies",
  			"topics" => "topics",
  			"users" => "users",
  			"words" => "words"
! 		);
! 		while(list($old, $new) = each($modtables))
  		{
! 			$sql = "SHOW INDEX FROM $old";
! 			$result = query($sql, "Couldn't get list of indices for table $old");
! 			while($row = mysql_fetch_array($result))
  			{
! 				$index = $row['Key_name'];
! 				if($index != 'PRIMARY')
! 				{
! 					query("ALTER TABLE $old DROP INDEX $index", "Couldn't DROP INDEX $old.$index");
! 				}
  			}
+ 
+ 			// Rename table
+ 			$new = $table_prefix . $new;
+ 			$sql = "ALTER TABLE $old RENAME $new";
+ 			print "Renaming '$old' to '$new'<br>\n";
+ 			query($sql, "Failed to rename $old to $new");
+ 			
  		}
  		common_footer();
***************
*** 351,366 ****
  		echo "<H2>Step 2: Create new phpBB2 tables</H2>\n";
  		
- 		$schema = get_schema();
- 		$table_def = $schema['table_def'];
- 		$field_def = $schema['field_def'];
- 		
  		// Create array with tables in 'old' database
  		$sql = 'SHOW TABLES';
! 		if(!$result = $db->sql_query($sql))
! 		{
! 			echo "Couldn't get list of current tables<br>\n";
! 			$sql_error = $db->sql_error();
! 			print $sql_error['code'] .": ". $sql_error['message']. "<br>\n";
! 		}
  		while ($table = $db->sql_fetchrow($result))
  		{
--- 406,412 ----
  		echo "<H2>Step 2: Create new phpBB2 tables</H2>\n";
  		
  		// Create array with tables in 'old' database
  		$sql = 'SHOW TABLES';
! 		$result = query($sql, "Couldn't get list of current tables");
  		while ($table = $db->sql_fetchrow($result))
  		{
***************
*** 371,382 ****
  		while (list($table, $definition) = each ($table_def))
  		{
  			if (!inarray($table, $currenttables))
  			{
  				print "Creating $table: ";
! 				if(!$result = $db->sql_query($definition))
  				{
! 					echo "Couldn't create table<br>\n";
! 					$sql_error = $db->sql_error();
! 					print $sql_error['code'] .": ". $sql_error['message']. "<br>\n";
  					print $definition . "<br>\n";
  				}
--- 417,428 ----
  		while (list($table, $definition) = each ($table_def))
  		{
+ 		print "<font color='green'>Table: $table</font><br>";
  			if (!inarray($table, $currenttables))
  			{
  				print "Creating $table: ";
! 				$result = query($definition, "Couldn't create table $table");
! 				if($db->sql_affectedrows($result) < 1)
  				{
! 					echo "Couldn't create table (no affected rows)<br>\n";
  					print $definition . "<br>\n";
  				}
***************
*** 407,410 ****
--- 453,457 ----
  			}
  		}
+ 		print "New config table has been created with default values.<p>\n";
  		//end_step('convert_config');
  		
***************
*** 412,416 ****
  		common_header();
  		print "Starting!<br>";
! 		$sql = "SELECT * FROM config";
  		$result = query($sql, "Couldn't get info from old config table");
  		$oldconfig = $db->sql_fetchrow($result);
--- 459,463 ----
  		common_header();
  		print "Starting!<br>";
! 		$sql = "SELECT * FROM $table_prefix"."old_config";
  		$result = query($sql, "Couldn't get info from old config table");
  		$oldconfig = $db->sql_fetchrow($result);
***************
*** 521,524 ****
--- 568,573 ----
  			$sql = "SELECT * from ". USERS_TABLE. " WHERE user_id BETWEEN $batchstart AND $batchend";
  			$result = query($sql, "Couldn't get ". USERS_TABLE .".user_id $batchstart to $batchend");
+ 
+ 			// Array with user fields that we want to check for invalid data (to few characters)
  			$checklength = array(
  				'user_occ',
***************
*** 913,926 ****
  					// If the current is not a key of $current_def and it is not a field that is 
  					// to be renamed then the field doesn't currently exist.
! 					$changes[] = "\nADD $field $type($size) $default $notnull $auto_increment ";
  				}
  				else
  				{
! 					$changes[] = "\nCHANGE $oldfield $field $type($size) $default $notnull $auto_increment";
  				}
  			}
  			$alter_sql .= join(',', $changes);
  			unset($changes);
  			unset($current_fields);
  			print "$alter_sql<br>\n";
  			query($alter_sql, "Couldn't alter table $table");
--- 962,994 ----
  					// If the current is not a key of $current_def and it is not a field that is 
  					// to be renamed then the field doesn't currently exist.
! 				//$changes[] = "\nADD $field $type($size) $default $notnull $auto_increment ";
! 					$changes[] = "\nADD $field ". $create_def[$table][$field];
  				}
  				else
  				{
! 				//$changes[] = "\nCHANGE $oldfield $field $type($size) $default $notnull $auto_increment";
! 					$changes[] = "\nCHANGE $oldfield $field ". $create_def[$table][$field];
  				}
  			}
+ 			
  			$alter_sql .= join(',', $changes);
  			unset($changes);
  			unset($current_fields);
+ 			
+ 			$sql = "SHOW INDEX FROM $table";
+ 			$result = query($sql, "Couldn't get list of indices for table $table");
+ 			unset($indices);
+ 			while($row = mysql_fetch_array($result))
+ 			{
+ 				$indices[] = $row['Key_name'];
+ 			}
+ 			
+ 			while (list($key_name, $key_field) = each($key_def[$table]) )
+ 			{
+ 				if(!inarray($key_name, $indices))
+ 				{
+ 					$alter_sql .= ($key_name == 'PRIMARY') ? ",\nADD PRIMARY KEY ($key_field)" : ",\nADD INDEX $key_name ($key_field)";
+ 				}
+ 			}
  			print "$alter_sql<br>\n";
  			query($alter_sql, "Couldn't alter table $table");

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** install.php	2001/11/20 22:31:58	1.15
--- install.php	2001/11/24 21:04:51	1.16
***************
*** 433,436 ****
--- 433,437 ----
  	// for the odbc DBMS.
  	//
+ 	print "dbms = - $dbms -<br>";
  	if( isset($dbms) ) 
  	{

[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.53,1.54

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

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

Modified Files:
	privmsg.php 
Log Message:
What did I say about that catchphrase ...

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** privmsg.php	2001/11/21 15:56:12	1.53
--- privmsg.php	2001/11/24 18:25:52	1.54
***************
*** 1545,1550 ****
  		"L_SPELLCHECK" => $lang['Spellcheck'],
  		"L_PREVIEW" => $lang['Preview'],
! 		"L_SUBMIT" => $lang['Submit_post'],
! 		"L_CANCEL" => $lang['Cancel_post'],
  		"L_POST_A" => $post_a,
  		"L_FIND_USERNAME" => $lang['Find_username'],
--- 1545,1550 ----
  		"L_SPELLCHECK" => $lang['Spellcheck'],
  		"L_PREVIEW" => $lang['Preview'],
! 		"L_SUBMIT" => $lang['Submit'],
! 		"L_CANCEL" => $lang['Cancel'],
  		"L_POST_A" => $post_a,
  		"L_FIND_USERNAME" => $lang['Find_username'],

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.1,1.2 mysql_schema.sql,1.3,1.4 oracle_schema.sql,1.1,1.2 postgres_schema.sql,1.2,1.3

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

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

Modified Files:
	mssql_schema.sql mysql_schema.sql oracle_schema.sql 
	postgres_schema.sql 
Log Message:
Finally moved the bbcode_uid from posts to posts_text, DON'T FORGET TO RUN THE CONVERT SCRIPT IN /develop/ !!

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mssql_schema.sql	2001/11/20 22:28:41	1.1
--- mssql_schema.sql	2001/11/24 17:17:32	1.2
***************
*** 236,240 ****
  	[enable_smilies] [smallint] NULL ,
  	[enable_sig] [smallint] NULL ,
- 	[bbcode_uid] [char] (10) NULL ,
  	[post_edit_time] [int] NULL ,
  	[post_edit_count] [smallint] NULL 
--- 236,239 ----
***************
*** 244,247 ****
--- 243,247 ----
  CREATE TABLE [phpbb_posts_text] (
  	[post_id] [int] NOT NULL ,
+ 	[bbcode_uid] [char] (10) NULL ,
  	[post_subject] [varchar] (100) NULL ,
  	[post_text] [text] NULL 

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mysql_schema.sql	2001/11/23 18:52:46	1.3
--- mysql_schema.sql	2001/11/24 17:17:32	1.4
***************
*** 177,181 ****
     enable_smilies tinyint(1) DEFAULT '1' NOT NULL,
     enable_sig tinyint(1) DEFAULT '1' NOT NULL, 
-    bbcode_uid char(10) NOT NULL,
     post_edit_time int(11),
     post_edit_count smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
--- 177,180 ----
***************
*** 195,198 ****
--- 194,198 ----
  CREATE TABLE phpbb_posts_text (
     post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+    bbcode_uid char(10) NOT NULL,
     post_subject varchar(255),
     post_text text,

Index: oracle_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/oracle_schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** oracle_schema.sql	2001/11/20 22:28:41	1.1
--- oracle_schema.sql	2001/11/24 17:17:32	1.2
***************
*** 199,203 ****
     enable_smilies number(4) DEFAULT '1' NOT NULL,
     enable_sig number(4) DEFAULT '1' NOT NULL,
-    bbcode_uid varchar(10) DEFAULT '',
     post_edit_time number(11),
     post_edit_count number(4) DEFAULT '0' NOT NULL,
--- 199,202 ----
***************
*** 215,218 ****
--- 214,218 ----
  CREATE TABLE phpbb_posts_text (
     post_id number(4) DEFAULT '0' NOT NULL,
+    bbcode_uid varchar(10) DEFAULT '',
     post_subject varchar(255),
     post_text varchar(2000),

Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** postgres_schema.sql	2001/11/23 00:36:08	1.2
--- postgres_schema.sql	2001/11/24 17:17:32	1.3
***************
*** 168,172 ****
     enable_smilies int2 DEFAULT '1' NOT NULL,
     enable_sig int2 DEFAULT '1' NOT NULL,
-    bbcode_uid varchar(10) DEFAULT '' NOT NULL,
     post_edit_time int4,
     post_edit_count int2 DEFAULT '0' NOT NULL,
--- 168,171 ----
***************
*** 184,187 ****
--- 183,187 ----
  CREATE TABLE phpbb_posts_text (
     post_id int4 DEFAULT '0' NOT NULL,
+    bbcode_uid varchar(10) DEFAULT '' NOT NULL,
     post_subject varchar(255),
     post_text text,

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

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

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

Added Files:
	convert_bbcodeuid.php 
Log Message:
Finally moved the bbcode_uid from posts to posts_text, DON'T FORGET TO RUN THE CONVERT SCRIPT IN /develop/ !!

--- NEW FILE ---
<?php

$phpbb_root_path = "../";

include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'config.'.$phpEx);
include($phpbb_root_path . 'includes/constants.'.$phpEx);
include($phpbb_root_path . 'includes/db.'.$phpEx);

function query($sql, $errormsg)
{
	global $db;
	if(!$result = $db->sql_query($sql))
	{
		print "<br><font color=\"red\">\n";
		print "$errormsg<br>";
		$sql_error = $db->sql_error();
		print $sql_error['code'] .": ". $sql_error['message']. "<br>\n";
		print "<pre>$sql</pre>";
		print "</font>\n";
		return FALSE;
	}
	else
	{
		return $result;
	}
}

if($HTTP_GET_VARS['delete'] == 'true')
{
	$sql = "ALTER TABLE ".POSTS_TABLE."
		DROP bbcode_uid";
	query($sql, "Didn't manage to drop the bbcode_uid table in ".POSTS_TABLE);
	print "All done now. Deleted the bbcode_uid column from the posts table.<p>";
	exit;
}


$sql = "ALTER TABLE ".POSTS_TEXT_TABLE." 
	ADD bbcode_uid char(10) NOT NULL";
print "Adding bbcode_uid field to ".POSTS_TEXT_TABLE.".<br>\n";
$result = query($sql, "Couldn't get add bbcode_uid field to ".POSTS_TEXT_TABLE.".");

$sql = "
	SELECT 
		count(*) as total,
		max(post_id) as maxid 
	FROM ". POSTS_TABLE;
$result = query($sql, "Couldn't get max post_id.");
$maxid = $db->sql_fetchrow($result);
$totalposts = $maxid['total'];
$maxid = $maxid['maxid'];

$batchsize = 200;
print "Going to convert BBcode in posts with $batchsize messages at a time and $totalposts in total.<br>\n";
for($i = 0; $i <= $maxid; $i += $batchsize)
{
	$batchstart = $i + 1;
	$batchend = $i + $batchsize;
	
	print "Moving BBcode UID in post number $batchstart to $batchend<br>\n";
	flush();
	$sql = "
		SELECT 
			post_id,
			bbcode_uid
		FROM "
			.POSTS_TABLE."
		WHERE
			post_id BETWEEN $batchstart AND $batchend";
	$result = query($sql, "Couldn't get ". POSTS_TABLE .".post_id $batchstart to $batchend");
	while($row = mysql_fetch_array($result))
	{
		query("UPDATE ".POSTS_TEXT_TABLE." set bbcode_uid = '". $row['bbcode_uid']. "' WHERE post_id = ".$row['post_id'], "Was unable to update the posts text table with the BBcode_uid");
	}
}

echo "Click <a href=\"$PHP_SELF?delete=true\">HERE</a> to remove the bbcode_uid table from the POSTS table (if you didn't get any serious error messages).<p>";

$db->sql_close();

?>

[Phpbb-checkins] CVS: phpBB2 search.php,1.38,1.39 viewtopic.php,1.141,1.142 posting.php,1.108,1.109

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

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

Modified Files:
	search.php viewtopic.php posting.php 
Log Message:
Finally moved the bbcode_uid from posts to posts_text, DON'T FORGET TO RUN THE CONVERT SCRIPT IN /develop/ !!

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** search.php	2001/11/23 01:04:31	1.38
--- search.php	2001/11/24 17:17:04	1.39
***************
*** 650,654 ****
  			if( $show_results == "posts" )
  			{
! 				$sql = "SELECT pt.post_text, pt.post_subject, p.*, f.forum_name, t.*, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid  
  					FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt 
  					WHERE p.post_id IN ($search_results)
--- 650,654 ----
  			if( $show_results == "posts" )
  			{
! 				$sql = "SELECT pt.post_text, pt.bbcode_uid, pt.post_subject, p.*, f.forum_name, t.*, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid  
  					FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt 
  					WHERE p.post_id IN ($search_results)
***************
*** 1192,1194 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 1192,1194 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -r1.141 -r1.142
*** viewtopic.php	2001/11/24 15:57:31	1.141
--- viewtopic.php	2001/11/24 17:17:06	1.142
***************
*** 384,388 ****
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, p.*,  pt.post_text, pt.post_subject
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
--- 384,388 ----
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, p.*,  pt.post_text, pt.post_subject, pt.bbcode_uid
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
***************
*** 1084,1086 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 1084,1086 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** posting.php	2001/11/24 15:57:31	1.108
--- posting.php	2001/11/24 17:17:06	1.109
***************
*** 428,432 ****
  	// Go ahead and pull all data for this topic
  	//
! 	$sql = "SELECT u.username, u.user_id, p.*,  pt.post_text, pt.post_subject
  		FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  		WHERE p.topic_id = $topic_id
--- 428,432 ----
  	// Go ahead and pull all data for this topic
  	//
! 	$sql = "SELECT u.username, u.user_id, p.*,  pt.post_text, pt.post_subject, pt.bbcode_uid
  		FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  		WHERE p.topic_id = $topic_id
***************
*** 1251,1256 ****
  		}
  
! 		$sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, bbcode_uid, enable_bbcode, enable_html, enable_smilies, enable_sig)
! 			VALUES ($new_topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', '$bbcode_uid', $bbcode_on, $html_on, $smilies_on, $attach_sig)";
  		$result = ($mode == "reply") ? $db->sql_query($sql, BEGIN_TRANSACTION) : $db->sql_query($sql);
  
--- 1251,1256 ----
  		}
  
! 		$sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig)
! 			VALUES ($new_topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)";
  		$result = ($mode == "reply") ? $db->sql_query($sql, BEGIN_TRANSACTION) : $db->sql_query($sql);
  
***************
*** 1259,1264 ****
  			$new_post_id = $db->sql_nextid();
  
! 			$sql = "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, post_text)
! 				VALUES ($new_post_id, '$post_subject', '$post_message')";
  
  			if( $db->sql_query($sql) )
--- 1259,1264 ----
  			$new_post_id = $db->sql_nextid();
  
! 			$sql = "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text)
! 				VALUES ($new_post_id, '$post_subject', '$bbcode_uid', '$post_message')";
  
  			if( $db->sql_query($sql) )
***************
*** 1866,1875 ****
  
  			$sql = "UPDATE " . POSTS_TABLE . "
! 				SET bbcode_uid = '$bbcode_uid', enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . "
  				WHERE post_id = $post_id";
  			if($db->sql_query($sql))
  			{
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
! 					SET post_text = '$post_message', post_subject = '$post_subject'
  					WHERE post_id = $post_id"; 
  
--- 1866,1875 ----
  
  			$sql = "UPDATE " . POSTS_TABLE . "
! 				SET enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . "
  				WHERE post_id = $post_id";
  			if($db->sql_query($sql))
  			{
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
! 					SET post_text = '$post_message',  bbcode_uid = '$bbcode_uid', post_subject = '$post_subject'
  					WHERE post_id = $post_id"; 
  
***************
*** 2309,2313 ****
  	{
  
! 		$sql = "SELECT p.*, pt.post_text, pt.post_subject, u.username, u.user_id, u.user_sig, t.topic_title, t.topic_type, t.topic_vote
  			FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . TOPICS_TABLE . " t, " . POSTS_TEXT_TABLE . " pt
  			WHERE p.post_id = $post_id
--- 2309,2313 ----
  	{
  
! 		$sql = "SELECT p.*, pt.post_text, pt.post_subject, pt.bbcode_uid, u.username, u.user_id, u.user_sig, t.topic_title, t.topic_type, t.topic_vote
  			FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . TOPICS_TABLE . " t, " . POSTS_TEXT_TABLE . " pt
  			WHERE p.post_id = $post_id
***************
*** 2796,2798 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 2796,2798 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.50,1.51

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

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

Modified Files:
	lang_main.php 
Log Message:
Reminder to self, checking files at 2am bad, checking files at 2pm good

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** lang_main.php	2001/11/24 09:58:10	1.50
--- lang_main.php	2001/11/24 15:57:31	1.51
***************
*** 32,36 ****
  //
  
! //setlocale(LC_ALL, "en");
  $lang['ENCODING'] = "utf-8";
  $lang['DIRECTION'] = "LTR";
--- 32,36 ----
  //
  
! setlocale(LC_ALL, "en");
  $lang['ENCODING'] = "utf-8";
  $lang['DIRECTION'] = "LTR";
***************
*** 75,78 ****
--- 75,80 ----
  $lang['Reset'] = "Reset";
  $lang['Cancel'] = "Cancel";
+ $lang['Preview'] = "Preview";
+ $lang['Confirm'] = "Confirm";
  $lang['Spellcheck'] = "Spellcheck";
  $lang['Yes'] = "Yes";
***************
*** 281,285 ****
  
  $lang['Post_a_new_topic'] = "Post a new topic";
- $lang['Post_new_topic_in'] = "Post new topic in:"; // Followed by forum name
  $lang['Post_a_reply'] = "Post a reply";
  $lang['Post_topic_as'] = "Post topic as";
--- 283,286 ----
***************
*** 291,301 ****
  $lang['Post_Normal'] = "Normal";
  
- $lang['Confirm'] = "Confirm";
  $lang['Confirm_delete'] = "Are you sure you want to delete this post?";
  $lang['Confirm_delete_poll'] = "Are you sure you want to delete this poll?";
- $lang['Submit_post'] = "Submit Post";
- $lang['Preview'] = "Preview";
- $lang['Spellcheck'] = "Spellcheck";
- $lang['Cancel_post'] = "Cancel post";
  
  $lang['Flood_Error'] = "You cannot make another post so soon after your last, please try again in a short while";
--- 292,297 ----
***************
*** 426,429 ****
--- 422,426 ----
  $lang['Click_view_privmsg'] = "Click %sHere%s to visit your Inbox";
  
+ 
  //
  // Profiles/Registration
***************
*** 522,530 ****
  $lang['Fields_empty'] = "You must fill in the required fields";
  $lang['Avatar_filetype'] = "The avatar filetype must be .jpg, .gif or .png";
! $lang['Avatar_filesize'] = "The avatar image file size must be more than 0 kB and less than"; // followed by xx kB, xx being the size
! $lang['kB'] = "kB";
! $lang['Avatar_imagesize'] = "The avatar must be less than " . $board_config['avatar_max_width'] . " pixels wide and " . $board_config['avatar_max_height'] . " pixels high"; 
  
! $lang['Welcome_subject'] = "Welcome to " . $board_config['sitename'] . " Forums";
  $lang['New_account_subject'] = "New user account";
  $lang['Account_activated_subject'] = "Account Activated";
--- 519,526 ----
  $lang['Fields_empty'] = "You must fill in the required fields";
  $lang['Avatar_filetype'] = "The avatar filetype must be .jpg, .gif or .png";
! $lang['Avatar_filesize'] = "The avatar image file size must be less than %d kB"; // The avatar image file size must be less than 6 kB
! $lang['Avatar_imagesize'] = "The avatar must be less than %d pixels wide and %d pixels high"; 
  
! $lang['Welcome_subject'] = "Welcome to %s Forums"; // Welcome to my.com forums
  $lang['New_account_subject'] = "New user account";
  $lang['Account_activated_subject'] = "Account Activated";
***************
*** 650,654 ****
  
  $lang['Search_keywords'] = "Search for Keywords";
! $lang['Search_keywords_explain'] = "You can use <u>AND</u> to define words which must be in the results, <u>OR</u> to define words which may be in the result and <u>NOT</u> to define words which should not be in the result. Use * as a wildcard for partial matches. To define a phrase enclose it within &quot;&quot;";
  $lang['Search_author'] = "Search for Author";
  $lang['Search_author_explain'] = "Use * as a wildcard for partial matches";
--- 646,650 ----
  
  $lang['Search_keywords'] = "Search for Keywords";
! $lang['Search_keywords_explain'] = "You can use <u>AND</u> to define words which must be in the results, <u>OR</u> to define words which may be in the result and <u>NOT</u> to define words which should not be in the result. Use * as a wildcard for partial matches";
  $lang['Search_author'] = "Search for Author";
  $lang['Search_author_explain'] = "Use * as a wildcard for partial matches";
***************
*** 684,704 ****
  // Auth related entries
  //
! $lang['Sorry_auth'] = "Sorry but only "; // This is followed by the auth type, eg. Registered and then one or more of the following entries
! 
! $lang['Anonymous_Users'] = "Anonymous Users";
! $lang['Registered_Users'] = "Registered Users";
! $lang['Users_granted_access'] = "Users granted special access";
! $lang['Moderators'] = "Moderators";
! $lang['Administrators'] = "Administrators";
! 
! $lang['can_read'] = " can read";
! $lang['can_post_announcements'] = " can post announcements in";
! $lang['can_post_sticky_topics'] = " can post sticky topics in";
! $lang['can_post_new_topics'] = " can post new topics in";
! $lang['can_reply_to_topics'] = " can reply to topics in";
! $lang['can_edit_topics'] = " can edit topics in";
! $lang['can_delete_topics'] = " can delete topics in";
! 
! $lang['this_forum'] = " this forum";
  
  
--- 680,699 ----
  // Auth related entries
  //
! // Note the %s will be replaced with one of the following 'user' arrays
! $lang['Sorry_auth_announce'] = "Sorry but only %s can post announcements in this forum";
! $lang['Sorry_auth_sticky'] = "Sorry but only %s can post sticky messages in this forum"; 
! $lang['Sorry_auth_read'] = "Sorry but only %s can read topics in this forum"; 
! $lang['Sorry_auth_post'] = "Sorry but only %s can post topics in this forum"; 
! $lang['Sorry_auth_reply'] = "Sorry but only %s can reply to posts in this forum"; 
! $lang['Sorry_auth_edit'] = "Sorry but only %s can edit posts in this forum"; 
! $lang['Sorry_auth_delete'] = "Sorry but only %s can delete posts in this forum"; 
! $lang['Sorry_auth_vote'] = "Sorry but only %s can vote in polls in this forum"; 
! 
! // These replace the %s in the above strings
! $lang['Anonymous_Users'] = "<b>anonymous users</b>";
! $lang['Registered_Users'] = "<b>registered users</b>";
! $lang['Users_granted_access'] = "<b>users granted special access</b>";
! $lang['Moderators'] = "<b>moderators</b>";
! $lang['Administrators'] = "<b>administrators</b>";
  
  

[Phpbb-checkins] CVS: phpBB2 posting.php,1.107,1.108 viewforum.php,1.104,1.105 viewtopic.php,1.140,1.141

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

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

Modified Files:
	posting.php viewforum.php viewtopic.php 
Log Message:
Reminder to self, checking files at 2am bad, checking files at 2pm good

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -r1.107 -r1.108
*** posting.php	2001/11/23 21:09:37	1.107
--- posting.php	2001/11/24 15:57:31	1.108
***************
*** 981,985 ****
  	else
  	{
! 		$message = $lang['Sorry_auth'] . $is_auth[$is_auth_type . "_type"] . $auth_string . $lang['this_forum'];
  	}
  
--- 981,985 ----
  	else
  	{
! 		$message = sprintf($lang['Sorry_' . $is_auth_type], $is_auth[$is_auth_type . "_type"]);
  	}
  
***************
*** 2709,2714 ****
  	"L_PREVIEW" => $lang['Preview'],
  	"L_SPELLCHECK" => $lang['Spellcheck'],
! 	"L_SUBMIT" => $lang['Submit_post'],
! 	"L_CANCEL" => $lang['Cancel_post'],
  	"L_CONFIRM_DELETE" => $lang['Confirm_delete'],
  	"L_DISABLE_HTML" => $lang['Disable_HTML_post'], 
--- 2709,2714 ----
  	"L_PREVIEW" => $lang['Preview'],
  	"L_SPELLCHECK" => $lang['Spellcheck'],
! 	"L_SUBMIT" => $lang['Submit'],
! 	"L_CANCEL" => $lang['Cancel'],
  	"L_CONFIRM_DELETE" => $lang['Confirm_delete'],
  	"L_DISABLE_HTML" => $lang['Disable_HTML_post'], 

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** viewforum.php	2001/11/23 09:31:59	1.104
--- viewforum.php	2001/11/24 15:57:31	1.105
***************
*** 100,106 ****
  	// The user is not authed to read this forum ...
  	//
! 	$msg = $lang['Sorry_auth'] . $is_auth['auth_read_type'] . $lang['can_read'] . $lang['this_forum'];
  
! 	message_die(GENERAL_MESSAGE, $msg);
  }
  //
--- 100,106 ----
  	// The user is not authed to read this forum ...
  	//
! 	$message = sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']);
  
! 	message_die(GENERAL_MESSAGE, $message);
  }
  //

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -r1.140 -r1.141
*** viewtopic.php	2001/11/20 02:24:41	1.140
--- viewtopic.php	2001/11/24 15:57:31	1.141
***************
*** 193,199 ****
  	// The user is not authed to read this forum ...
  	//
! 	$msg = $lang['Sorry_auth'] . $is_auth['auth_read_type'] . $lang['can_read'] . $lang['this_forum'];
  
! 	message_die(GENERAL_MESSAGE, $msg);
  }
  //
--- 193,199 ----
  	// The user is not authed to read this forum ...
  	//
! 	$message = sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']);
  
! 	message_die(GENERAL_MESSAGE, $message);
  }
  //

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.49,1.50

[James A. <th...@us...>]

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

Modified Files:
	lang_main.php 
Log Message:
Just a coouple updates               


Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** lang_main.php	2001/11/21 15:56:12	1.49
--- lang_main.php	2001/11/24 09:58:10	1.50
***************
*** 430,434 ****
  //
  $lang['Viewing_user_profile'] = "Viewing profile :: %s"; // %s is username 
! $lang['About_user'] = "All about %s";
  
  $lang['Preferences'] = "Preferences";
--- 430,434 ----
  //
  $lang['Viewing_user_profile'] = "Viewing profile :: %s"; // %s is username 
! $lang['About_user'] = "All about %s"; // %s is username
  
  $lang['Preferences'] = "Preferences";
***************
*** 707,714 ****
  //
  $lang['Who_is_online'] = "Who is online";
! $lang['Reg_users_online'] = "There are %d Registered and ";
! $lang['Hidden_users_online'] = "%d Hidden users online";
! $lang['Guest_users_online'] = "There are %d Guest users online";
! $lang['Guest_user_online'] = "There is %d Guest user online";
  $lang['No_users_browsing'] = "There are no users currently browsing this forum";
  
--- 707,714 ----
  //
  $lang['Who_is_online'] = "Who is online";
! $lang['Reg_users_online'] = "There are %d Registered and "; // There ae 5 Registered and
! $lang['Hidden_users_online'] = "%d Hidden users online"; // 6 Hidden users online
! $lang['Guest_users_online'] = "There are %d Guest users online"; // There are 10 Guest users online
! $lang['Guest_user_online'] = "There is %d Guest user online"; // There is 1 Guest user online
  $lang['No_users_browsing'] = "There are no users currently browsing this forum";
  
***************
*** 733,737 ****
  //
  $lang['Mod_CP'] = "Moderator Control Panel";
! $lang['Mod_CP_explain'] = "Using the form below you can perform mass moderation operations on this forum. You can lock, unlock, move or delete any number of topics. If this forum is defined as private in some way you can also modify which users can and cannot access it.";
  
  $lang['Select'] = "Select";
--- 733,737 ----
  //
  $lang['Mod_CP'] = "Moderator Control Panel";
! $lang['Mod_CP_explain'] = "Using the form below you can perform mass moderation operations on this forum. You can lock, unlock, move or delete any number of topics.";
  
  $lang['Select'] = "Select";

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

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

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

Modified Files:
	posting_body.tpl 
Log Message:
OOppss missed this one ... this should be my catchphrase ...

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** posting_body.tpl	2001/11/21 23:08:10	1.10
--- posting_body.tpl	2001/11/24 02:23:36	1.11
***************
*** 213,217 ****
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a> 
  		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
  	</tr>
--- 213,217 ----
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> 
  		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
  	</tr>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin disallow_body.tpl,1.1,1.2

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

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

Modified Files:
	disallow_body.tpl 
Log Message:
Various updates

Index: disallow_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/disallow_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** disallow_body.tpl	2001/10/15 20:15:46	1.1
--- disallow_body.tpl	2001/11/24 01:51:36	1.2
***************
*** 1,33 ****
  
  <h1>{L_DISALLOW_TITLE}</h1>
- <p>{L_EXPLAIN}</p>
  
  <form method="post" action="{S_FORM_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr> 
! 	  <th class="thHead" colspan="2">{L_DEL_DISALLOW}</th>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_USERNAME}: <br />
! 		<span class="gensmall">{L_DEL_EXPLAIN}</span></td>
! 	  <td class="row2">{S_DISALLOW_SELECT}&nbsp;<input type="submit" name="mode" value="{L_DELETE}" class="liteoption" /></td>
  	</tr>
  	<tr> 
! 	  <th class="thHead" colspan="2">{L_ADD_DISALLOW}</th>
  	</tr>
  	<tr> 
! 	  <td class="row1">{L_USERNAME}: <br />
! 		<span class="gensmall">{L_ADD_EXPLAIN}></td>
! 	  <td class="row2">
! 		<input type="text" name="disallowed_user" size="35" />
! 	  </td>
  	</tr>
  	<tr> 
! 	  <td class="catBottom" colspan="2" align="center">
! 		<input type="submit" name="mode" value="{L_ADD}" class="mainoption" />
! 		&nbsp;&nbsp;
! 		<input type="reset" value="{L_RESET}" class="liteoption" />
! 	  </td>
  	</tr>
  </table></form>
- 
- <p>{L_INFO}</p>
--- 1,24 ----
  
  <h1>{L_DISALLOW_TITLE}</h1>
  
+ <p>{L_DISALLOW_EXPLAIN}</p>
+ 
  <form method="post" action="{S_FORM_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
  	<tr> 
! 		<th class="thHead" colspan="2">{L_ADD_DISALLOW}</th>
  	</tr>
  	<tr> 
! 		<td class="row1">{L_USERNAME}<br /><span class="gensmall">{L_ADD_EXPLAIN}</span></td>
! 		<td class="row2"><input type="text" name="disallowed_user" size="30" />&nbsp;<input type="submit" name="add_name" value="{L_ADD}" class="mainoption" /></td>
  	</tr>
  	<tr> 
! 		<th class="thHead" colspan="2">{L_DELETE_DISALLOW}</th>
  	</tr>
  	<tr> 
! 		<td class="row1">{L_USERNAME}<br /><span class="gensmall">{L_DELETE_EXPLAIN}</span></td>
! 		<td class="row2">{S_DISALLOW_SELECT}&nbsp;<input type="submit" name="delete_name" value="{L_DELETE}" class="liteoption" /></td>
  	</tr>
  	<tr> 
! 		<td class="catBottom" colspan="2" align="center">&nbsp;</td>
  	</tr>
  </table></form>

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_admin.php,1.9,1.10

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

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

Modified Files:
	lang_admin.php 
Log Message:
Various updates

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** lang_admin.php	2001/11/23 01:01:01	1.9
--- lang_admin.php	2001/11/24 01:51:36	1.10
***************
*** 38,42 ****
  $lang['Permissions'] = "Permissions";
  $lang['Manage'] = "Manage";
! $lang['Disallow'] = "Disallowed words";
  $lang['Prune'] = "Pruning";
  $lang['Mass_Email'] = "Send Bulk Email";
--- 38,42 ----
  $lang['Permissions'] = "Permissions";
  $lang['Manage'] = "Manage";
! $lang['Disallow'] = "Disallow usernames";
  $lang['Prune'] = "Pruning";
  $lang['Mass_Email'] = "Send Bulk Email";
***************
*** 335,338 ****
--- 335,342 ----
  $lang['Forum_pruning'] = "Auto-pruning";
  
+ $lang['prune_freq'] = 'Check for topic age every';
+ $lang['prune_days'] = "Remove topics that have not been posted to in";
+ $lang['Set_prune_data'] = "You have turned on auto-prune for this forum but did not set a frequency or number of days to prune. Please go back and do so";
+ 
  $lang['Move_and_Delete'] = "Move and Delete";
  
***************
*** 411,415 ****
  // Group Management
  //
- 
  $lang['Group_administration'] = "Group Administration";
  $lang['Group_admin_explain'] = "From this panel you can administer all your usergroups, you can; delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description";
--- 415,418 ----
***************
*** 448,455 ****
  $lang['Do_Prune'] = "Do Prune";
  $lang['All_Forums'] = "All Forums";
! $lang['prune_days'] = "Remove topics that have not been posted to in";
! $lang['Prune_topics_not_posted'] = "Prune topics that haven't been posted to in the last";
! $lang['prune_freq'] = 'Check for topic age every';
! $lang['Set_prune_data'] = "You have turned on auto-prune for this forum but did not set a frequency or number of days to prune. Please go back and do so";
  $lang['Topics_pruned'] = "Topics pruned";
  $lang['Posts_pruned'] = "Posts pruned";
--- 451,455 ----
  $lang['Do_Prune'] = "Do Prune";
  $lang['All_Forums'] = "All Forums";
! $lang['Prune_topics_not_posted'] = "Prune topics with no replies in this many days";
  $lang['Topics_pruned'] = "Topics pruned";
  $lang['Posts_pruned'] = "Posts pruned";
***************
*** 460,481 ****
  // Word censor
  //
! $lang['Word_censor'] = "Word Censor";
  $lang['Word'] = "Word";
  $lang['Replacement'] = "Replacement";
  $lang['Add_new_word'] = "Add new word";
  $lang['Update_word'] = "Update word censor";
! $lang['Words_title'] = "Word Censors";
! $lang['Words_explain'] = "From this control panel you can add, edit, and remove words that will be automatically censored on your forums. Wildcards (*) are accepted in the word field! (i.e.: *test*, test*, *test, and test are all valid)";
! $lang['Must_enter_word'] = "You must enter a word and it's replacement!";
  $lang['No_word_selected'] = "No word selected for editing";
  $lang['Word_updated'] = "The selected word censor has been successfully updated";
  $lang['Word_added'] = "The word censor has been successfully added";
  $lang['Word_removed'] = "The selected word censor has been successfully removed";
  
  
  //
  // Mass Email
  //
! $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients.  If you are emailing a large group of people, please be patient after submiting and <b>DO NOT</b> stop the page halfway through.  It is normal for amass emailing to take a long time.";
  $lang['Compose'] = "Compose"; 
  
--- 460,485 ----
  // Word censor
  //
! $lang['Words_title'] = "Word Censoring";
! $lang['Words_explain'] = "From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, eg. *test* will match detestable, test* would match testing, *test would match detest.";
  $lang['Word'] = "Word";
+ $lang['Edit_word_censor'] = "Edit word censor";
  $lang['Replacement'] = "Replacement";
  $lang['Add_new_word'] = "Add new word";
  $lang['Update_word'] = "Update word censor";
! 
! $lang['Must_enter_word'] = "You must enter a word and its replacement";
  $lang['No_word_selected'] = "No word selected for editing";
+ 
  $lang['Word_updated'] = "The selected word censor has been successfully updated";
  $lang['Word_added'] = "The word censor has been successfully added";
  $lang['Word_removed'] = "The selected word censor has been successfully removed";
  
+ $lang['Click_return_wordadmin'] = "Click %sHere%s to return to Word Censor Administration";
+ 
  
  //
  // Mass Email
  //
! $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients. If you are emailing a large group of people please be patient after submiting and do not stop the page halfway through. It is normal for amass emailing to take a long time, you will be notified when the script has completed";
  $lang['Compose'] = "Compose"; 
  
***************
*** 483,487 ****
--- 487,494 ----
  $lang['All_users'] = "All Users";
  
+ $lang['Email_successfull'] = "Your message has been sent";
+ $lang['Click_return_massemail'] = "Click %sHere%s to return to the Mass Email form";
  
+ 
  //
  // Install Process
***************
*** 506,526 ****
  $lang['Finish_Install'] = "Finish Installation";
  $lang['Install_db_error'] = "An error occured trying to update the database";
! $lang['ODBC_Instructs'] = "Someone please write some odbc instructions in the \$lang['ODBC_Instructs'] variable!";
  $lang['Table_Prefix'] = "Prefix for tables in database";
  $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
  $lang['ftp_choose'] = "Choose Download Method";
! $lang['Attempt_ftp'] = "Attempt to ftp config file into place:";
! $lang['Send_file'] = "Just send the file to me and I'll ftp it manually:";
! $lang['ftp_option'] = "<br />Since the ftp extensions are loaded in php you may will also be given the option of first trying to automatically ftp the config file into place.";
! $lang['ftp_instructs'] = "You have chosen to attempt to ftp the file to your phpBB installation automagically.  Please enter the information below to facilitate this process. Note that the FTP Path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it.";
! $lang['ftp_path'] = "FTP Path to phpBB2:";
! $lang['ftp_username'] = "Your FTP Username:";
! $lang['ftp_password'] = "Your FTP Password:";
  $lang['Transfer_config'] = "Start Transfer";
  $lang['ftp_info'] = "Enter Your FTP Information";
  $lang['Install'] = "Install";
  $lang['Upgrade'] = "Upgrade";
! $lang['Install_Method'] = 'Choose your installation method';
  
  
--- 513,533 ----
  $lang['Finish_Install'] = "Finish Installation";
  $lang['Install_db_error'] = "An error occured trying to update the database";
! $lang['ODBC_Instructs'] = "To complete your installation of this database you need to create a System Data Source Name, or System DSN pointing towards the relevant data source. You should refer to the ODBC section of your database server installation manual for assistance. If you are hosting this board on a host to which you do not have control you should request your provider to install or run the necessary files and create an appropriate DSN.";
  $lang['Table_Prefix'] = "Prefix for tables in database";
  $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
  $lang['ftp_choose'] = "Choose Download Method";
! $lang['Attempt_ftp'] = "Attempt to ftp config file into place";
! $lang['Send_file'] = "Just send the file to me and I'll ftp it manually";
! $lang['ftp_option'] = "<br />Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically ftp the config file into place.";
! $lang['ftp_instructs'] = "You have chosen to ftp the file to the account containing phpBB 2 automatically.  Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it using any normal client.";
! $lang['ftp_path'] = "FTP path to phpBB2";
! $lang['ftp_username'] = "Your FTP Username";
! $lang['ftp_password'] = "Your FTP Password";
  $lang['Transfer_config'] = "Start Transfer";
  $lang['ftp_info'] = "Enter Your FTP Information";
  $lang['Install'] = "Install";
  $lang['Upgrade'] = "Upgrade";
! $lang['Install_Method'] = "Choose your installation method";
  
  
***************
*** 528,562 ****
  // Ranks admin
  //
- $lang['Must_select_rank'] = "Sorry, you didn't select a rank.  Please go back and try again.";
- $lang['No_assigned_rank'] = "No special rank assigned";
  $lang['Ranks_title'] = "Rank Administration";
! $lang['Ranks_explain'] = "Here you can add, edit, view, and delete ranks. This is also a place to create custom ranks";
  $lang['Rank_title'] = "Rank Title";
! $lang['Rank_special'] = "Is special rank";
  $lang['Rank_minimum'] = "Minimum Posts";
  $lang['Rank_maximum'] = "Maximum Posts";
  $lang['Rank_updated'] = "The rank was successfully updated";
  $lang['Rank_added'] = "The rank was successfully added";
  $lang['Rank_removed'] = "The rank was successfully deleted";
- $lang['Add_new_rank'] = "Add new rank";
- $lang['Rank_image'] = "Rank Image";
- $lang['Rank_image_explain'] = "This is the place to set a custom image for everyone in the rank. You can specify either a relative or absolute path to the image";
- $lang['return_rank_admin'] = "Click %sHere%s to return to rank admin";
  
  
  //
  // Disallow Username Admin
  //
- $lang['Add'] = "Add";
- $lang['disallowed_deleted'] = "The disallowed username has successfully been removed";
- $lang['disallowed_already'] = "The username you are trying to disallow has already been disallowed, or a user currently exists that this would disallow";
- $lang['disallow_successful'] = "The disallowed username has successfully been added";
  $lang['Disallow_control'] = "Username Disallow Control";
! $lang['disallow_instructs'] = "Here you can control usernames which will not be allowed to be used.  Disallowed usernames are allowed to contain a wildcard character of '*'.  Please note that you will not be allowed to specify a username to disallow if that username has already been registered.  You must first delete that username, and then disallow it.";
! $lang['del_disallow'] = "Remove a Disallowed Username";
! $lang['del_disallow_explain'] = "You can remove a disallowed username by selecting the username from this list and clicking submit";
! $lang['add_disallow'] = "Add a disallowed username";
! $lang['add_disallow_explain'] = "You can disallow a username using the wildcard character '*' to match any character";
! $lang['no_disallowed'] = "No Disallowed Usernames";
  
  
--- 535,581 ----
  // Ranks admin
  //
  $lang['Ranks_title'] = "Rank Administration";
! $lang['Ranks_explain'] = "Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility";
! 
! $lang['Add_new_rank'] = "Add new rank";
! 
  $lang['Rank_title'] = "Rank Title";
! $lang['Rank_special'] = "Set as Special Rank";
  $lang['Rank_minimum'] = "Minimum Posts";
  $lang['Rank_maximum'] = "Maximum Posts";
+ $lang['Rank_image'] = "Rank Image";
+ $lang['Rank_image_explain'] = "Use this to define a small image associated with the rank";
+ 
+ $lang['Must_select_rank'] = "You must select a rank";
+ $lang['No_assigned_rank'] = "No special rank assigned";
+ 
  $lang['Rank_updated'] = "The rank was successfully updated";
  $lang['Rank_added'] = "The rank was successfully added";
  $lang['Rank_removed'] = "The rank was successfully deleted";
  
+ $lang['Click_return_rankadmin'] = "Click %sHere%s to return to Rank Administration";
  
+ 
  //
  // Disallow Username Admin
  //
  $lang['Disallow_control'] = "Username Disallow Control";
! $lang['Disallow_explain'] = "Here you can control usernames which will not be allowed to be used.  Disallowed usernames are allowed to contain a wildcard character of *.  Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it";
! 
! $lang['Delete_disallow'] = "Delete";
! $lang['Delete_disallow_title'] = "Remove a Disallowed Username";
! $lang['Delete_disallow_explain'] = "You can remove a disallowed username by selecting the username from this list and clicking submit";
! 
! $lang['Add_disallow'] = "Add";
! $lang['Add_disallow_title'] = "Add a disallowed username";
! $lang['Add_disallow_explain'] = "You can disallow a username using the wildcard character * to match any character";
! 
! $lang['No_disallowed'] = "No Disallowed Usernames";
! 
! $lang['Disallowed_deleted'] = "The disallowed username has been successfully removed";
! $lang['Disallow_successful'] = "The disallowed username has ben successfully added";
! $lang['Disallowed_already'] = "The name you entered could not be disallowed. It either already exists in the list or a matching username is present";
! 
! $lang['Click_return_disallowadmin'] = "Click %sHere%s to return to Disallow Username Administration";
  
  
***************
*** 565,592 ****
  //
  $lang['Styles_admin'] = "Styles Administration";
! $lang['Styles_explain'] = "Using this facility you can add, remove and manage styles (templates and themes) available to your users.";
! $lang['Styles_addnew_explain'] = "The following list contains all the themes that are available for the templates you currently have. The items on this list HAVE NOT yet been installed into the phpBB database. To install a theme simply click the 'install' link beside a selected entry";
  $lang['Style'] = "Style";
  $lang['Template'] = "Template";
  $lang['Install'] = "Install";
- $lang['Confirm_delete_style'] = "Are you sure you want to delete this style?";
- $lang['Style_removed'] = "The selected style has been removed from the database. To fully remove this style from your system you must delete the appropriate directory from your templates directory.";
- $lang['Theme_installed'] = "The selected theme has been installed successfully";
- $lang['Export_themes'] = "Export Themes";
- $lang['Download_theme_cfg'] = "The exporter could not write the theme information file. Click the button below to download this file with your browser. Once you have downloaded it you can transer it to your templates dir and package your template for distribution if you choose.";
- $lang['No_themes'] = "The template you selected has no themes attached to it. Click on the 'Create New' link to the left to create one.";
  $lang['Download'] = "Download";
! $lang['No_template_dir'] = "Could not open template dir, it may be unreadable by the webserver or may not exist";
! $lang['Export_explain'] = "In this panel you will be able to export the theme data for a selected template. Select the template from the list below and the script will create the theme configuration file and attempt to save it to the selected template directory. If it cannot save the file itself it will give you the option to download it. In order for the script to save the file you must give write access to the webserver for the selected template dir. For more information on this see the phpBB users guide.";
! $lang['Select_template'] = "Select a Template";
! $lang['Theme_info_saved'] = "The theme information for the selected template has been saved. You should now return the permissions on the theme_info.cfg and/or selected template directory to READ ONLY.";
  $lang['Edit_theme'] = "Edit Theme";
! $lang['Edit_theme_explain'] = "In the form below you can edit the settings for the selected theme.";
  $lang['Create_theme'] = "Create Theme";
! $lang['Create_theme_explain'] = "Use the form below to create a new theme for a selected template. When referancing color HEX codes DO NOT include the pound sign (#), ie: CCCCCC is valid, #CCCCCC is NOT.";
  $lang['Theme_settings'] = "Theme Settings";
  $lang['Theme_element'] = "Theme Element";
  $lang['Simple_name'] = "Simple Name";
  $lang['Value'] = "Value";
  $lang['Stylesheet'] = "CSS Stylesheet";
  $lang['Background_image'] = "Background Image";
--- 584,626 ----
  //
  $lang['Styles_admin'] = "Styles Administration";
! $lang['Styles_explain'] = "Using this facility you can add, remove and manage styles (templates and themes) available to your users";
! $lang['Styles_addnew_explain'] = "The following list contains all the themes that are available for the templates you currently have. The items on this list have not yet been installed into the phpBB database. To install a theme simply click the install link beside an entry";
! 
! $lang['Select_template'] = "Select a Template";
! 
  $lang['Style'] = "Style";
  $lang['Template'] = "Template";
  $lang['Install'] = "Install";
  $lang['Download'] = "Download";
! 
  $lang['Edit_theme'] = "Edit Theme";
! $lang['Edit_theme_explain'] = "In the form below you can edit the settings for the selected theme";
! 
  $lang['Create_theme'] = "Create Theme";
! $lang['Create_theme_explain'] = "Use the form below to create a new theme for a selected template. When entering colours (for which you should use hexadecimal notation) you must not include the initial #, ie. CCCCCC is valid, #CCCCCC is not";
! 
! $lang['Export_themes'] = "Export Themes";
! $lang['Export_explain'] = "In this panel you will be able to export the theme data for a selected template. Select the template from the list below and the script will create the theme configuration file and attempt to save it to the selected template directory. If it cannot save the file itself it will give you the option to download it. In order for the script to save the file you must give write access to the webserver for the selected template dir. For more information on this see the phpBB 2 users guide.";
! 
! $lang['Theme_installed'] = "The selected theme has been installed successfully";
! $lang['Style_removed'] = "The selected style has been removed from the database. To fully remove this style from your system you must delete the appropriate style from your templates directory.";
! $lang['Theme_info_saved'] = "The theme information for the selected template has been saved. You should now return the permissions on the theme_info.cfg (and if applicable the selected template directory) to read-only";
! $lang['Theme_updated'] = "The selected theme has been updated. You should now export the new theme settings";
! $lang['Theme_created'] = "Theme created. You should now export the theme to the theme configuration file for safe keeping or use elsewhere";
! 
! $lang['Confirm_delete_style'] = "Are you sure you want to delete this style";
! 
! $lang['Download_theme_cfg'] = "The exporter could not write the theme information file. Click the button below to download this file with your browser. Once you have downloaded it you can transfer it to the directory containing the template files. You can then package the files for distribution or use elsewhere if you desire";
! $lang['No_themes'] = "The template you selected has no themes attached to it. To create a new theme click the Create New link on the left hand panel";
! $lang['No_template_dir'] = "Could not open the template directory. It may be unreadable by the webserver or may not exist";
! $lang['Cannot_remove_style'] = "You cannot remove the style selected since it is currently the forum default. Please change the default style and try again.";
! 
! $lang['Click_return_styleadmin'] = "Click %sHere%s to return to Style Administration";
! 
  $lang['Theme_settings'] = "Theme Settings";
  $lang['Theme_element'] = "Theme Element";
  $lang['Simple_name'] = "Simple Name";
  $lang['Value'] = "Value";
+ 
  $lang['Stylesheet'] = "CSS Stylesheet";
  $lang['Background_image'] = "Background Image";
***************
*** 596,600 ****
  $lang['VLink_color'] = "Visited Link Color";
  $lang['ALink_color'] = "Active Link Color";
! $lang['HLink_color'] = "Hilighted Link Color";
  $lang['Tr_color1'] = "Table Row Color 1";
  $lang['Tr_color2'] = "Table Row Color 2";
--- 630,634 ----
  $lang['VLink_color'] = "Visited Link Color";
  $lang['ALink_color'] = "Active Link Color";
! $lang['HLink_color'] = "Hover Link Color";
  $lang['Tr_color1'] = "Table Row Color 1";
  $lang['Tr_color2'] = "Table Row Color 2";
***************
*** 627,633 ****
  $lang['span_class2'] = "Span Class 2";
  $lang['span_class3'] = "Span Class 3";
! $lang['Theme_updated'] = "The selected theme has been updated. Don't forget to export the new theme settings to the theme configuration file!";
! $lang['Theme_created'] = "Theme created! Don't forget to export the new theme settings to the theme configuration file!";
! $lang['Cannot_remove_style'] = "The style you have selected is the current forum wide default style. Therefor, you cannot remove it. Please change the default style and try again.";
  
  //
--- 661,666 ----
  $lang['span_class2'] = "Span Class 2";
  $lang['span_class3'] = "Span Class 3";
! $lang['img_poll_size'] = "Polling Image Size [px]";
! $lang['img_pm_size'] = "Private Message Status size [px]";
  
  //

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.7,1.8 admin_disallow.php,1.2,1.3 admin_ranks.php,1.4,1.5 admin_words.php,1.5,1.6

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

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

Modified Files:
	admin_styles.php admin_disallow.php admin_ranks.php 
	admin_words.php 
Log Message:
Various updates

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** admin_styles.php	2001/11/12 11:57:25	1.7
--- admin_styles.php	2001/11/24 01:51:35	1.8
***************
*** 44,48 ****
  if($cancel)
  {
! 	header("Location: $PHP_SELF");
  }
  
--- 44,48 ----
  if($cancel)
  {
! 	header("Location: admin_styles.$phpEx");
  }
[...1553 lines suppressed...]
  				"ROW_COLOR" => $row_color,
  				"STYLE_NAME" => $style_rowset[$i]['style_name'],
  				"TEMPLATE_NAME" => $style_rowset[$i]['template_name'],
! 
! 				"U_STYLES_EDIT" => append_sid("admin_styles.$phpEx?mode=edit&style_id=" . $style_rowset[$i]['themes_id']),
! 				"U_STYLES_DELETE" => append_sid("admin_styles.$phpEx?mode=delete&style_id=" . $style_rowset[$i]['themes_id']))
! 			);
  		}
  		
  		$template->pparse("body");	
! 		break;
  }
  
! if( !$HTTP_POST_VARS['send_file'] )
  {
  	include('page_footer_admin.'.$phpEx);
  }
  
! ?>
\ No newline at end of file

Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_disallow.php	2001/10/15 20:41:42	1.2
--- admin_disallow.php	2001/11/24 01:51:35	1.3
***************
*** 35,91 ****
  require('pagestart.inc');
  
! //
! // Check to see what mode we shold operate in.
! //
! if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
  {
! 	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
! }
! else
! {
! 	$mode = "";
! }
! $output_info = '';
! switch( $mode )
! {
! 	case $lang['Delete']:
! 		$disallowed_id = ( isset($HTTP_POST_VARS['disallowed_id']) ) ? intval( $HTTP_POST_VARS['disallowed_id'] ) : intval( $HTTP_GET_VARS['disallowed_id'] );
! 		
! 		$sql = 'DELETE FROM '.DISALLOW_TABLE.' WHERE disallow_id = '.$disallowed_id;
! 		$result = $db->sql_query($sql);
! 		if( !$result )
! 		{
! 			message_die(GENERAL_ERROR, "Couldn't removed disallowed user.", "",__LINE__, __FILE__, $sql);
! 		}
! 		$output_info = $lang['disallowed_deleted'];
! 		break;
! 	case $lang['Add']:
! 		$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
! 		$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );
! 		if( !validate_username( $disallowed_user ) )
! 		{
! 			$output_info = $lang['disallowed_already'];
! 		}
! 		else
  		{
! 			$sql = 'INSERT INTO '.DISALLOW_TABLE."(disallow_username) VALUES('".$disallowed_user."')";
! 			$result = $db->sql_query( $sql );
! 			if ( !$result )
! 			{
! 				message_die(GENERAL_ERROR, "Could not add disallowed user.", "",__LINE__, __FILE__, $sql);
! 			}
! 			$output_info = $lang['disallow_successful'];
  		}
! 		break;
  }
  //
  // Grab the current list of disallowed usernames...
  //
! $sql = 'SELECT * FROM '.DISALLOW_TABLE;
  $result = $db->sql_query($sql);
  if( !$result )
  {
! 	message_die( GENERAL_ERROR, "Couldn't get disallowed users.", "", __LINE__, __FILE__, $sql );
  }
  $disallowed = $db->sql_fetchrowset($result);
  
--- 35,92 ----
  require('pagestart.inc');
  
! if( isset($HTTP_POST_VARS['add_name']) )
  {
! 	$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
! 	$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );
! 
! 	if( !validate_username($disallowed_user) )
! 	{
! 		$message = $lang['Disallowed_already'];
! 	}
! 	else
! 	{
! 		$sql = "INSERT INTO " . DISALLOW_TABLE . " (disallow_username) 
! 			VALUES('" . $disallowed_user . "')";
! 		$result = $db->sql_query( $sql );
! 		if ( !$result )
  		{
! 			message_die(GENERAL_ERROR, "Could not add disallowed user.", "",__LINE__, __FILE__, $sql);
  		}
! 		$message = $lang['Disallow_successful'];
! 	}
! 
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_disallowadmin'], "<a href=\"" . append_sid("admin_disallow.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! 
! 	message_die(GENERAL_MESSAGE, $message);
! }
! else if( isset($HTTP_POST_VARS['delete_name']) )
! {
! 	$disallowed_id = ( isset($HTTP_POST_VARS['disallowed_id']) ) ? intval( $HTTP_POST_VARS['disallowed_id'] ) : intval( $HTTP_GET_VARS['disallowed_id'] );
! 	
! 	$sql = "DELETE FROM " . DISALLOW_TABLE . " 
! 		WHERE disallow_id = $disallowed_id";
! 	$result = $db->sql_query($sql);
! 	if( !$result )
! 	{
! 		message_die(GENERAL_ERROR, "Couldn't removed disallowed user.", "",__LINE__, __FILE__, $sql);
! 	}
! 
! 	$message .= $lang['Disallowed_deleted'] . "<br /><br />" . sprintf($lang['Click_return_disallowadmin'], "<a href=\"" . append_sid("admin_disallow.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! 
! 	message_die(GENERAL_MESSAGE, $message);
! 
  }
+ 
  //
  // Grab the current list of disallowed usernames...
  //
! $sql = "SELECT * 
! 	FROM " . DISALLOW_TABLE;
  $result = $db->sql_query($sql);
  if( !$result )
  {
! 	message_die(GENERAL_ERROR, "Couldn't get disallowed users.", "", __LINE__, __FILE__, $sql );
  }
+ 
  $disallowed = $db->sql_fetchrowset($result);
  
***************
*** 94,131 ****
  // what mode we are in.
  //
! $disallow_select = "<SELECT NAME=\"disallowed_id\">";
! if ( trim($disallowed) == '' )
  {
! 	$disallow_select .= '<option value="">'.$lang['no_disallowed'].'</option>';
  }
  else 
  {
- 	$disallow_select .= "<OPTION value=\"\">".$lang['Select'].' '.$lang['Username']."</OPTION>";
  	$user = array();
  	for( $i = 0; $i < count($disallowed); $i++ )
  	{
! 		$disallowed[$i]['disallow_username'] = preg_replace( '/%/', '*', $disallowed[$i]['disallow_username']);
! 		$disallow_select .= '<option value="'.$disallowed[$i]['disallow_id'].'">'.$disallowed[$i]['disallow_username'].'</option>';
  	}
  }
! $disallow_select .= '</SELECT>';
  $template->set_filenames(array(
  	"body" => "admin/disallow_body.tpl")
  );
  $template->assign_vars(array(
  	"S_DISALLOW_SELECT" => $disallow_select,
  	"L_INFO" => $output_info,
  	"L_DISALLOW_TITLE" => $lang['Disallow_control'],
! 	"L_DELETE" => $lang['Delete'],
! 	"L_ADD" => $lang['Add'],
! 	"L_RESET" => $lang['Reset'],
! 	"S_FORM_ACTION" => append_sid('admin_disallow.php'),
! 	"L_EXPLAIN" => $lang['disallow_instructs'],
! 	"L_DEL_DISALLOW" => $lang['del_disallow'],
! 	"L_DEL_EXPLAIN" => $lang['del_disallow_explain'],
! 	"L_ADD_DISALLOW" => $lang['add_disallow'],
! 	"L_ADD_EXPLAIN" => $lang['add_disallow_explain'],
  	"L_USERNAME" => $lang['Username'])
  );
  $template->pparse("body");
! ?>
--- 95,138 ----
  // what mode we are in.
  //
! $disallow_select = '<select name="disallowed_id">';
! 
! if( trim($disallowed) == "" )
  {
! 	$disallow_select .= '<option value="">' . $lang['no_disallowed'] . '</option>';
  }
  else 
  {
  	$user = array();
  	for( $i = 0; $i < count($disallowed); $i++ )
  	{
! 		$disallowed[$i]['disallow_username'] = preg_replace('/%/', '*', $disallowed[$i]['disallow_username']);
! 
! 		$disallow_select .= '<option value="' . $disallowed[$i]['disallow_id'] . '">' . $disallowed[$i]['disallow_username'] . '</option>';
  	}
  }
! 
! $disallow_select .= '</select>';
! 
  $template->set_filenames(array(
  	"body" => "admin/disallow_body.tpl")
  );
+ 
  $template->assign_vars(array(
  	"S_DISALLOW_SELECT" => $disallow_select,
+ 	"S_FORM_ACTION" => append_sid('admin_disallow.php'),
+ 
  	"L_INFO" => $output_info,
  	"L_DISALLOW_TITLE" => $lang['Disallow_control'],
! 	"L_DISALLOW_EXPLAIN" => $lang['Disallow_explain'],
! 	"L_DELETE" => $lang['Delete_disallow'],
! 	"L_DELETE_DISALLOW" => $lang['Delete_disallow_title'],
! 	"L_DELETE_EXPLAIN" => $lang['Delete_disallow_explain'],
! 	"L_ADD" => $lang['Add_disallow'],
! 	"L_ADD_DISALLOW" => $lang['Add_disallow_title'],
! 	"L_ADD_EXPLAIN" => $lang['Add_disallow_explain'],
  	"L_USERNAME" => $lang['Username'])
  );
+ 
  $template->pparse("body");
! 
! ?>
\ No newline at end of file

Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** admin_ranks.php	2001/11/21 03:10:10	1.4
--- admin_ranks.php	2001/11/24 01:51:35	1.5
***************
*** 32,36 ****
  //
  $phpbb_root_dir = "./../";
! $no_page_header = TRUE;
  require('pagestart.inc');
  
--- 32,36 ----
  //
  $phpbb_root_dir = "./../";
! 
  require('pagestart.inc');
  
***************
*** 67,72 ****
  		// They want to add a new rank, show the form.
  		//
- 		include('page_header_admin.' . $phpEx);
- 		
  		$rank_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0;
  		
--- 67,70 ----
***************
*** 143,147 ****
  		$max_posts = ( isset($HTTP_POST_VARS['max_posts']) ) ? intval($HTTP_POST_VARS['max_posts']) : -1;
  		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1;
! 		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) || $HTTP_POST_VARS['rank_image'] != "http://" ) ? $HTTP_POST_VARS['rank_image'] : "";
  
  		if( $rank_title == "" )
--- 141,145 ----
  		$max_posts = ( isset($HTTP_POST_VARS['max_posts']) ) ? intval($HTTP_POST_VARS['max_posts']) : -1;
  		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1;
! 		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) ) ? $HTTP_POST_VARS['rank_image'] : "";
  
  		if( $rank_title == "" )
***************
*** 177,180 ****
--- 175,179 ----
  					rank_image = '$rank_image'
  				WHERE rank_id = $rank_id";
+ 
  			$message = $lang['Rank_updated'];
  		}
***************
*** 185,188 ****
--- 184,188 ----
  				VALUES
  					('$rank_title', '$special_rank', '$max_posts', '$min_posts', '$rank_image')";
+ 
  			$message = $lang['Rank_added'];
  		}
***************
*** 193,200 ****
  		}
  
! 		$template->assign_vars(array(
! 			"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
! 		);
! 		$message .= "<br />" . sprintf($lang['return_rank_admin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>");
  		message_die(GENERAL_MESSAGE, $message);
  
--- 193,198 ----
  		}
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! 
  		message_die(GENERAL_MESSAGE, $message);
  
***************
*** 225,233 ****
  			}
  
! 			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
! 			);
! 			$message = $lang['Rank_removed'];
! 			$message .= "<br />" . sprintf($lang['return_rank_admin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>");
  			message_die(GENERAL_MESSAGE, $message);
  
--- 223,228 ----
  			}
  
! 			$message .= "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! 
  			message_die(GENERAL_MESSAGE, $message);
  
***************
*** 235,241 ****
  		else
  		{
- 			$template->assign_vars(array(
- 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
- 			);
  			message_die(GENERAL_MESSAGE, $lang['Must_select_rank']);
  		}
--- 230,233 ----
***************
*** 246,251 ****
  		// They didn't feel like giving us any information. Oh, too bad, we'll just display the
  		// list then...
! 		include('page_header_admin.' . $phpEx);		
! 	
  		$template->set_filenames(array(
  			"body" => "admin/ranks_list_body.tpl")
--- 238,242 ----
  		// They didn't feel like giving us any information. Oh, too bad, we'll just display the
  		// list then...
! 		//
  		$template->set_filenames(array(
  			"body" => "admin/ranks_list_body.tpl")
***************
*** 289,293 ****
  				$rank_min = $rank_max = "-";
  			}
- 
  			
  			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
--- 280,283 ----
***************
*** 314,319 ****
  	// Show the default page
  	//
- 	include('page_header_admin.' . $phpEx);
- 		
  	$template->set_filenames(array(
  		"body" => "admin/ranks_list_body.tpl")
--- 304,307 ----
***************
*** 360,364 ****
  		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! 		$rank_is_special = ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'];
  		
  		$template->assign_block_vars("ranks", array(
--- 348,353 ----
  		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! 
! 		$rank_is_special = ( $special_rank ) ? $lang['Yes'] : $lang['No'];
  		
  		$template->assign_block_vars("ranks", array(
***************
*** 380,382 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
--- 369,371 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file

Index: admin_words.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_words.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** admin_words.php	2001/10/14 15:46:53	1.5
--- admin_words.php	2001/11/24 01:51:35	1.6
***************
*** 24,28 ****
  {
  	$file = basename(__FILE__);
! 	$module['General']['Word Censor'] = "$file";
  	return;
  }
--- 24,28 ----
  {
  	$file = basename(__FILE__);
! 	$module['General']['Word_Censor'] = "$file";
  	return;
  }
***************
*** 96,100 ****
  			"L_WORDS_TITLE" => $lang['Words_title'],
  			"L_WORDS_TEXT" => $lang['Words_explain'],
! 			"L_WORD_CENSOR" => $lang['Word_censor'],
  			"L_WORD" => $lang['Word'],
  			"L_REPLACEMENT" => $lang['Replacement'],
--- 96,100 ----
  			"L_WORDS_TITLE" => $lang['Words_title'],
  			"L_WORDS_TEXT" => $lang['Words_explain'],
! 			"L_WORD_CENSOR" => $lang['Edit_word_censor'],
  			"L_WORD" => $lang['Word'],
  			"L_REPLACEMENT" => $lang['Replacement'],
***************
*** 125,129 ****
  				SET word = '$word', replacement = '$replacement' 
  				WHERE word_id = $word_id";
! 			$message_success = $lang['Word_updated'];
  		}
  		else
--- 125,129 ----
  				SET word = '$word', replacement = '$replacement' 
  				WHERE word_id = $word_id";
! 			$message = $lang['Word_updated'];
  		}
  		else
***************
*** 131,135 ****
  			$sql = "INSERT INTO " . WORDS_TABLE . " (word, replacement) 
  				VALUES ('$word', '$replacement')";
! 			$message_success = $lang['Word_added'];
  		}
  
--- 131,135 ----
  			$sql = "INSERT INTO " . WORDS_TABLE . " (word, replacement) 
  				VALUES ('$word', '$replacement')";
! 			$message = $lang['Word_added'];
  		}
  
***************
*** 138,145 ****
  			message_die(GENERAL_ERROR, "Could not insert data into words table", $lang['Error'], __LINE__, __FILE__, $sql);
  		}
! 		else
! 		{
! 			message_die(GENERAL_MESSAGE, $message_success);
! 		}
  	}
  	else if( $mode == "delete" )
--- 138,145 ----
  			message_die(GENERAL_ERROR, "Could not insert data into words table", $lang['Error'], __LINE__, __FILE__, $sql);
  		}
! 
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_wordadmin'], "<a href=\"" . append_sid("admin_words.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! 
! 		message_die(GENERAL_MESSAGE, $message);
  	}
  	else if( $mode == "delete" )
***************
*** 163,170 ****
  				message_die(GENERAL_ERROR, "Could not remove data from words table", $lang['Error'], __LINE__, __FILE__, $sql);
  			}
! 			else
! 			{
! 				message_die(GENERAL_MESSAGE, $lang['Word_removed']);
! 			}
  		}
  		else
--- 163,170 ----
  				message_die(GENERAL_ERROR, "Could not remove data from words table", $lang['Error'], __LINE__, __FILE__, $sql);
  			}
! 
! 			$message = $lang['Word_removed'] . "<br /><br />" . sprintf($lang['Click_return_wordadmin'], "<a href=\"" . append_sid("admin_words.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! 
! 			message_die(GENERAL_MESSAGE, $message);
  		}
  		else
***************
*** 219,224 ****
  			"WORD" => $word,
  			"REPLACEMENT" => $replacement,
! 			"U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&id=$word_id"),
! 			"U_WORD_DELETE" => append_sid("admin_words.$phpEx?mode=delete&id=$word_id"))
  		);
  	}
--- 219,225 ----
  			"WORD" => $word,
  			"REPLACEMENT" => $replacement,
! 
! 			"U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&amp;id=$word_id"),
! 			"U_WORD_DELETE" => append_sid("admin_words.$phpEx?mode=delete&amp;id=$word_id"))
  		);
  	}

[Phpbb-checkins] CVS: phpBB2/admin index.php,1.27,1.28

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

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

Modified Files:
	index.php 
Log Message:
Cope with modules which don't have appropriate names set in the lang_admin file, output names to left pane like old way

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** index.php	2001/11/23 01:01:01	1.27
--- index.php	2001/11/24 00:33:58	1.28
***************
*** 68,72 ****
  	while( list($cat, $action_array) = each($module) )
  	{
! 		$cat = $lang[$cat];
  
  		$template->assign_block_vars("catrow", array(
--- 68,72 ----
  	while( list($cat, $action_array) = each($module) )
  	{
! 		$cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat);
  
  		$template->assign_block_vars("catrow", array(
***************
*** 82,86 ****
  			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 			$action = $lang[$action];
  
  			$template->assign_block_vars("catrow.modulerow", array(
--- 82,86 ----
  			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);
  
  			$template->assign_block_vars("catrow.modulerow", array(

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

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

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

Modified Files:
	mysql_basic.sql postgres_basic.sql 
Log Message:
Fixes install problem

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mysql_basic.sql	2001/11/23 00:36:07	1.2
--- mysql_basic.sql	2001/11/23 22:55:23	1.3
***************
*** 46,50 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_lang','english');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
--- 46,49 ----

Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** postgres_basic.sql	2001/11/23 00:36:08	1.2
--- postgres_basic.sql	2001/11/23 22:55:23	1.3
***************
*** 47,51 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_lang','english');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
--- 47,50 ----

[Phpbb-checkins] CVS: phpBB2 posting.php,1.106,1.107

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

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

Modified Files:
	posting.php 
Log Message:
Small error in SQL for Postgres searchmatch clean

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -r1.106 -r1.107
*** posting.php	2001/11/23 19:01:51	1.106
--- posting.php	2001/11/23 21:09:37	1.107
***************
*** 170,175 ****
  				WHERE word_id NOT IN ( 
  					SELECT word_id  
! 					FROM " . SEARCH_MATCH_TABLE . ") 
! 					GROUP BY word_id"; 
  			$result = $db->sql_query($sql);
  			if( !$result )
--- 170,175 ----
  				WHERE word_id NOT IN ( 
  					SELECT word_id  
! 					FROM " . SEARCH_MATCH_TABLE . "  
! 					GROUP BY word_id)"; 
  			$result = $db->sql_query($sql);
  			if( !$result )

[Phpbb-checkins] CVS: phpBB2 posting.php,1.105,1.106 profile.php,1.139,1.140

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

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

Modified Files:
	posting.php profile.php 
Log Message:
More search updates + user posts

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -r1.105 -r1.106
*** posting.php	2001/11/23 01:04:31	1.105
--- posting.php	2001/11/23 19:01:51	1.106
***************
*** 89,106 ****
  	global $db;
  
! 	$word_id_sql = "";
! 	if( count($word_id_list) )
! 	{
! 		for($i = 0; $i < count($word_id_list); $i++ )
! 		{
! 			if( $word_id_sql != "" )
! 			{
! 				$word_id_sql .= ", ";
! 			}
! 			$word_id_sql .= $word_id_list[$i]['word_id'];
! 		}
! 		$word_id_sql = "WHERE word_id IN ($word_id_sql) ";
! 	}
! 
  	$sql = "SELECT SUM(forum_posts) AS total_posts 
  		FROM " . FORUMS_TABLE ;
--- 89,93 ----
  	global $db;
  
! 	// 0.01-0.06s
  	$sql = "SELECT SUM(forum_posts) AS total_posts 
  		FROM " . FORUMS_TABLE ;
***************
*** 117,120 ****
--- 104,114 ----
  		$common_threshold = floor($row['total_posts'] * $percent);
  
+ 		$word_id_sql = "";
+ 		if( count($word_id_list) )
+ 		{
+ 			$word_id_sql = "WHERE word_id IN (" . implode(", ", $word_id_list) . ") ";
+ 		}
+ 
+ 		// 0.020-0.024s
  		$sql = "SELECT word_id 
  			FROM " . SEARCH_MATCH_TABLE . " 
***************
*** 128,131 ****
--- 122,126 ----
  		}
  
+ 		// No matches
  		if( $word_count = $db->sql_numrows($result) )
  		{
***************
*** 159,176 ****
  				}
  			}
- 			else
- 			{
- 				return 0;
- 			}
  		}
- 		else
- 		{
- 			return 0;
- 		}
  	}
- 	else
- 	{
- 		return 0;
- 	}
  
  	return $word_count;
--- 154,159 ----
***************
*** 236,239 ****
--- 219,223 ----
  		case 'mysql':
  		case 'mysql4':
+ 			// 0.07s
  			$sql = "SELECT w.word_id 
  				FROM " . SEARCH_WORD_TABLE . " w 
***************
*** 254,257 ****
--- 238,242 ----
  					if( $word_id_sql )
  					{
+ 						// 0.07s (about 15-20 words)
  						$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "  
  							WHERE word_id IN ($word_id_sql)";
***************
*** 286,292 ****
  	$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
  
  	$search_text = clean_words($post_text, $stopword_array, $synonym_array);
- //	$search_title = clean_words($post_title, $stopword_array, $synonym_array);
- 
  	$search_matches = split_words($search_text);
  
--- 271,276 ----
  	$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
  
+ 	// 0.3s
  	$search_text = clean_words($post_text, $stopword_array, $synonym_array);
  	$search_matches = split_words($search_text);
  
***************
*** 294,330 ****
  	{
  		$word = array();
  
! 		for ($j = 0; $j < count($search_matches); $j++)
  		{ 
! 			$this_word = strtolower(trim($search_matches[$j]));
  
! 			$new_word = true;
! 			for($k = 0; $k < count($word); $k++)
  			{
! 				if( $this_word == $word[$k] || $this_word == "" )
  				{
! 					$new_word = false;
  				}
- 			}
- 
- 			if( $new_word )
- 			{
- 				$word[] = $this_word;
- 			}
- 		}
  
! 		$word_sql_in = "";
! 		for ($j = 0; $j < count($word); $j++)
! 		{ 
! 			if( $word_sql_in != "" )
! 			{
! 				$word_sql_in .= ", ";
! 			}
! 			$word_sql_in .= "'" . $word[$j] . "'";
  		}
  
  		$sql = "SELECT word_id, word_text, word_common    
  			FROM " . SEARCH_WORD_TABLE . " 
! 			WHERE word_text IN ($word_sql_in)";
  		$result = $db->sql_query($sql);
  		if( !$result )
--- 278,304 ----
  	{
  		$word = array();
+ 		sort($search_matches);
  
! 		$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] != $search_matches[$i-1] ) 
  			{
! 				$word[] = $search_matches[$i]; 
! 
! 				if( $word_text_sql != "" )
  				{
! 					$word_text_sql .= ", ";
  				}
  
! 				$word_text_sql .= "'" . $search_matches[$i] . "'";
! 			} 
  		}
  
  		$sql = "SELECT word_id, word_text, word_common    
  			FROM " . SEARCH_WORD_TABLE . " 
! 			WHERE word_text IN ($word_text_sql)";
  		$result = $db->sql_query($sql);
  		if( !$result )
***************
*** 333,380 ****
  		}
  
  		if( $word_check_count = $db->sql_numrows($result) )
  		{
! 			$check_words = $db->sql_fetchrowset($result);
  		}
  
  		$match_word = array();
! 		for ($j = 0; $j < count($word); $j++)
  		{ 
! 			if( $word[$j] )
! 			{
! 				$new_match = true;
! 				$word_common = false;
  
! 				if( $word_check_count )
  				{
! 					for($k = 0; $k < $word_check_count; $k++)
! 					{
! 						if( $word[$j] == $check_words[$k]['word_text'] )
! 						{
! 							if( $check_words[$k]['word_common'] )
! 							{
! 								$word_common = true;
! 							}
! 
! 							$new_match = false;
! 						}
! 
! 					}
  				}
  
! 				if( !$word_common )
! 				{
! 					$match_word[] = "'" . $word[$j] . "'";
! 				}
  
! 				if( $new_match )
  				{
! 					$sql = "INSERT INTO " . SEARCH_WORD_TABLE . "  (word_text) 
! 						VALUES ('". addslashes($word[$j]) . "')"; 
! 					$result = $db->sql_query($sql); 
! 					if( !$result )
! 					{
! 						message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
! 					}
  				}
  			}
--- 307,348 ----
  		}
  
+ 		$check_words = array();
+ 		$word_id_list = array();
  		if( $word_check_count = $db->sql_numrows($result) )
  		{
! 			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( $word_check_count )
! 			{
! 				if( isset($check_words[$word[$i]]) )
  				{
! 					$new_match = false;
  				}
+ 			}
  
! 			if( !$check_words[$word[$i]] )
! 			{
! 				$match_word[] = "'" . $word[$i] . "'";
! 			}
  
! 			if( $new_match )
! 			{
! 				$sql = "INSERT INTO " . SEARCH_WORD_TABLE . "  (word_text, word_common) 
! 					VALUES ('". $word[$i] . "', 0)"; 
! 				$result = $db->sql_query($sql); 
! 				if( !$result )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
  				}
  			}
***************
*** 392,400 ****
  			message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
  		}
- 
  	}
  
! 	remove_common(0.15, $check_words);
  
  	return;
  }
--- 360,377 ----
  			message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
  		}
  	}
+ 
+ /*
+ 	$mtime = explode(" ",microtime());
+ 	$starttime = $mtime[1] + $mtime[0];
+ 
+ 	$mtime = explode(" ", microtime());
+ 	$endtime = $mtime[1] + $mtime[0];
+ 	echo "<BR><BR> TIMING1 >>>>>>>>> " .  ($endtime - $starttime) . "<BR><BR>\n";
  
! */
  
+ 	remove_common(0.15, $word_id_list);
+ 
  	return;
  }
***************
*** 1488,1493 ****
  		{
  			$row = $db->sql_fetchrow($result);
  
! 			if( $userdata['user_id'] != $row['poster_id'] && !$is_auth['auth_mod'])
  			{
  				$message = ( $delete || $mode == "delete" ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts'];
--- 1465,1472 ----
  		{
  			$row = $db->sql_fetchrow($result);
+ 
+ 			$poster_id = $row['poster_id'];
  
! 			if( $userdata['user_id'] != $poster_id && !$is_auth['auth_mod'])
  			{
  				$message = ( $delete || $mode == "delete" ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts'];
***************
*** 1632,1638 ****
  				if( $delete || $mode == "delete" )
  				{
  					$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
  						WHERE post_id = $post_id";
! 					$result = $db->sql_query($sql, BEGIN_TRANSACTION); 
  					if( !$result )
  					{
--- 1611,1625 ----
  				if( $delete || $mode == "delete" )
  				{
+ 					$sql = "UPDATE " . USERS_TABLE . " 
+ 						SET user_posts = user_posts - 1 
+ 						WHERE user_id = " . $poster_id;
+ 					if( !$db->sql_query($sql, BEGIN_TRANSACTION) )
+ 					{
+ 						message_die(GENERAL_MESSAGE, "Couldn't update users post count", "", __LINE__, __FILE__, $sql);
+ 					}
+ 					
  					$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
  						WHERE post_id = $post_id";
! 					$result = $db->sql_query($sql); 
  					if( !$result )
  					{
***************
*** 1640,1643 ****
--- 1627,1633 ----
  					}
  
+ 					//
+ 					// Removes redundant words from wordlist table
+ 					//
  					remove_unmatched_words();
  
***************
*** 1864,1867 ****
--- 1854,1860 ----
  			}
  
+ 			//
+ 			// Clear out the old matches
+ 			//
  			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
  				WHERE post_id = $post_id";
***************
*** 1879,1883 ****
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
  					SET post_text = '$post_message', post_subject = '$post_subject'
! 					WHERE post_id = $post_id";
  
  				if( $is_first_post_topic )
--- 1872,1876 ----
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
  					SET post_text = '$post_message', post_subject = '$post_subject'
! 					WHERE post_id = $post_id"; 
  
  				if( $is_first_post_topic )

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -r1.139 -r1.140
*** profile.php	2001/11/22 01:13:49	1.139
--- profile.php	2001/11/23 19:01:51	1.140
***************
*** 249,253 ****
  
  		// Get the users percentage of total posts
! 		if($profiledata['user_posts'] != 0)
  		{
  			$total_posts = get_db_stat("postcount");
--- 249,253 ----
  
  		// Get the users percentage of total posts
! 		if( $profiledata['user_posts'] != 0 && $total_posts != 0 )
  		{
  			$total_posts = get_db_stat("postcount");