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

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

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

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

Modified Files:
	modcp.php 
Log Message:
Fixed bug #487801

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** modcp.php	2001/11/25 03:11:50	1.48
--- modcp.php	2001/12/03 00:23:04	1.49
***************
*** 789,793 ****
  			);
  
! 			$sql = "SELECT u.username, p.*, pt.post_text, pt.post_subject, p.post_username
  				FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  				WHERE p.topic_id = $topic_id
--- 789,793 ----
  			);
  
! 			$sql = "SELECT u.username, p.*, pt.post_text, pt.bbcode_uid, pt.post_subject, p.post_username
  				FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  				WHERE p.topic_id = $topic_id
***************
*** 850,860 ****
  					}
  
! 					if( $board_config['allow_bbcode'] && $bbcode_uid != "" )
  					{
! 						$message = bbencode_second_pass($message, $bbcode_uid);
! 					}
! 					else if( !$board_config['allow_bbcode'] && $bbcode != "" )
! 					{
! 						$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
  					}
  
--- 850,856 ----
  					}
  
! 					if( $bbcode_uid != "" )
  					{
! 						$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
  					}
  

[Phpbb-checkins] CVS: phpBB2/admin admin_mass_email.php,1.8,1.9

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

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

Modified Files:
	admin_mass_email.php 
Log Message:
Fix bug #487951 but mass email needs some other additions, notes are in file ...

Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_mass_email.php	2001/11/19 19:06:01	1.8
--- admin_mass_email.php	2001/12/03 00:11:17	1.9
***************
*** 20,34 ****
   ***************************************************************************/
  
- /***************************************************************************
- 	Mass Mailings can be used by admin to mail either the entire board or
- 	all members of a specific group.
- ***************************************************************************/
- 
  if($setmodules == 1)
  {
!         $filename = basename(__FILE__);
!         $module['General']['Mass_Email'] = $filename;
! 
!         return;
  }
  
--- 20,29 ----
   ***************************************************************************/
  
  if($setmodules == 1)
  {
! 	$filename = basename(__FILE__);
! 	$module['General']['Mass_Email'] = $filename;
! 	
! 	return;
  }
  
***************
*** 46,55 ****
  @set_time_limit(1200);
  
  //
! // Set form names
  //
- $f_title = 'e_title';
- $f_msg = 'e_msg';
- 
  if( isset($HTTP_POST_VARS['submit']) )
  {
--- 41,50 ----
  @set_time_limit(1200);
  
+ $message = "";
+ $subject = "";
+ 
  //
! // Do the job ...
  //
  if( isset($HTTP_POST_VARS['submit']) )
  {
***************
*** 59,65 ****
  	{
  		$sql = "SELECT u.user_email 
! 			FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " g
! 			WHERE u.user_id = g.user_id 
! 				AND g.group_id = $group_id";
  	}
  	else
--- 54,61 ----
  	{
  		$sql = "SELECT u.user_email 
! 			FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug
! 			WHERE ug.group_id = $group_id 
! 				AND ug.user_pending <> " . TRUE . "  
! 				AND u.user_id = ug.user_id";
  	}
  	else
***************
*** 73,124 ****
  		message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
  	}
  	$email_list = $db->sql_fetchrowset($g_result);
  	
! 	$subject = stripslashes($HTTP_POST_VARS["$f_title"]);
! 	$message = stripslashes($HTTP_POST_VARS["$f_msg"]);
  	
! 	include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! 	$emailer = new emailer($board_config['smtp_delivery']);
  
! 	$email_headers = "From: " . $board_config['board_email'] . "\n";
! 
! 	$bcc_list = "";
! 	for($i = 0; $i < count($email_list); $i++)
  	{
! 		if( $bcc_list != "" )
  		{
! 			$bcc_list .= ", ";
  		}
! 		$bcc_list .= $email_list[$i]['user_email'];
! 	}
! 	$email_headers .= "Bcc: $bcc_list\n";
! 	
! 	$email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
! 	$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
! 	$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
! 	$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
! 	$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
! 
! 	$emailer->use_template("admin_send_email");
! 	$emailer->email_address($board_config['board_email']);
! 	$emailer->set_subject($subject);
! 	$emailer->extra_headers($email_headers);
! 
! 	$emailer->assign_vars(array(
! 		"SITENAME" => $board_config['sitename'], 
! 		"BOARD_EMAIL" => $board_config['board_email'], 
! 		"MESSAGE" => $message)
! 	);
! 	$emailer->send();
! 	$emailer->reset();
! 
! 	$template->assign_vars(array(
! 		"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
! 	);
! 
! 	$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'],  "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
  
! 	message_die(GENERAL_MESSAGE, $message);
  
  }	
  
--- 69,137 ----
  		message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
  	}
+ 
+ 	if( !$db->sql_numrows($result) )
+ 	{
+ 		//
+ 		// Output a relevant GENERAL_MESSAGE about users/group
+ 		// not existing
+ 		//
+ 	}
+ 
  	$email_list = $db->sql_fetchrowset($g_result);
  	
! 	$subject = stripslashes($HTTP_POST_VARS["subject"]);
! 	$message = stripslashes($HTTP_POST_VARS["message"]);
  	
! 	//
! 	// Error checking needs to go here ... if no subject and/or
! 	// no message then skip over the send and return to the form
! 	//
! 	$error = FALSE;
  
! 	if( !$error )
  	{
! 		include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! 		$emailer = new emailer($board_config['smtp_delivery']);
! 
! 		$email_headers = "From: " . $board_config['board_email'] . "\n";
! 
! 		$bcc_list = "";
! 		for($i = 0; $i < count($email_list); $i++)
  		{
! 			if( $bcc_list != "" )
! 			{
! 				$bcc_list .= ", ";
! 			}
! 			$bcc_list .= $email_list[$i]['user_email'];
  		}
! 		$email_headers .= "Bcc: $bcc_list\n";
! 		
! 		$email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
! 		$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
! 		$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
! 		$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
! 		$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
! 
! 		$emailer->use_template("admin_send_email");
! 		$emailer->email_address($board_config['board_email']);
! 		$emailer->set_subject($subject);
! 		$emailer->extra_headers($email_headers);
! 
! 		$emailer->assign_vars(array(
! 			"SITENAME" => $board_config['sitename'], 
! 			"BOARD_EMAIL" => $board_config['board_email'], 
! 			"MESSAGE" => $message)
! 		);
! 		$emailer->send();
! 		$emailer->reset();
! 
! 		$template->assign_vars(array(
! 			"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
! 		);
  
! 		$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'],  "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
  
+ 		message_die(GENERAL_MESSAGE, $message);
+ 	}
  }	
  
***************
*** 153,156 ****
--- 166,172 ----
  
  $template->assign_vars(array(
+ 	"MESSAGE" => $message,
+ 	"SUBJECT" => $subject, 
+ 
  	"L_EMAIL_TITLE" => $lang['Email'],
  	"L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
***************
*** 163,169 ****
  
  	"S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx),
! 	"S_GROUP_SELECT" => $select_list,
! 	"S_EMAIL_SUBJECT" => $f_title,
! 	"S_EMAIL_MSG" => $f_msg)
  );
  
--- 179,183 ----
  
  	"S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx),
! 	"S_GROUP_SELECT" => $select_list)
  );
  

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

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

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

Modified Files:
	user_email_body.tpl 
Log Message:
Fix bug #487951 but mass email needs some other additions, notes are in file ...

Index: user_email_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_email_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_email_body.tpl	2001/11/21 03:10:10	1.2
--- user_email_body.tpl	2001/12/03 00:11:18	1.3
***************
*** 14,22 ****
  	<tr> 
  	  <td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
! 	  <td class="row2"><span class="gen"><input type="text" name="{S_EMAIL_SUBJECT}" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" /></span></td>
  	</tr>
  	<tr> 
  	  <td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span> 
! 	  <td class="row2"><span class="gen"> <textarea name="{S_EMAIL_MSG}" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post"></textarea></span> 
  	</tr>
  	<tr> 
--- 14,22 ----
  	<tr> 
  	  <td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
! 	  <td class="row2"><span class="gen"><input type="text" name="subject" size="45" maxlength="100" tabindex="2" class="post" value="{SUBJECT}" /></span></td>
  	</tr>
  	<tr> 
  	  <td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span> 
! 	  <td class="row2"><span class="gen"> <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post">{MESSAGE}</textarea></span> 
  	</tr>
  	<tr> 

[Phpbb-checkins] CVS: phpBB2 posting.php,1.116,1.117 install.php,1.17,1.18

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

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

Modified Files:
	posting.php install.php 
Log Message:
Removed 'Redirect' header

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -r1.116 -r1.117
*** posting.php	2001/11/29 12:46:16	1.116
--- posting.php	2001/12/02 23:54:25	1.117
***************
*** 662,666 ****
  		$post_append = "";
  	}
- 	header("HTTP/1.0 302 Redirect");
  	header("Location:" . append_sid($redirect) . $post_append, true);
  }
--- 662,665 ----
***************
*** 987,991 ****
  		}
  
- 		header("HTTP/1.0 302 Redirect");
  		header("Location: " . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
  
--- 986,989 ----
***************
*** 1825,1829 ****
  			else
  			{
- 				header("HTTP/1.0 302 Redirect");
  				header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
  			}
--- 1823,1826 ----

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** install.php	2001/11/30 23:15:53	1.17
--- install.php	2001/12/02 23:54:25	1.18
***************
*** 326,330 ****
  	else
  	{
- 		header("HTTP/1.0 302 Redirect");
  		header("Location: " . append_sid("index.$phpEx", true));
  	}
--- 326,329 ----

[Phpbb-checkins] CVS: phpBB2 login.php,1.34,1.35

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

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

Modified Files:
	login.php 
Log Message:
Removed test redirect headers

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** login.php	2001/11/30 18:51:08	1.34
--- login.php	2001/12/02 01:04:25	1.35
***************
*** 53,57 ****
  		if(!$result)
  		{
! 			message_die(GENERAL_ERROR, "Error in obtaining userdata : login", __LINE__, __FILE__, $sql);
  		}
  
--- 53,57 ----
  		if(!$result)
  		{
! 			message_die(GENERAL_ERROR, "Error in obtaining userdata : login", "", __LINE__, __FILE__, $sql);
  		}
  
***************
*** 62,66 ****
  			if( $rowresult['user_level'] != ADMIN && $board_config['board_disable'] )
  			{
- 				header("HTTP/1.0 302 Redirect");
  				header("Location: " . append_sid("index.$phpEx", true));
  			}
--- 62,65 ----
***************
*** 77,86 ****
  						if( !empty($HTTP_POST_VARS['redirect']) )
  						{
- 							header("HTTP/1.0 302 Redirect");
  							header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  						}
  						else
  						{
- 							header("HTTP/1.0 302 Redirect");
  							header("Location: " . append_sid("index.$phpEx", true));
  						}
--- 76,83 ----
***************
*** 88,92 ****
  					else
  					{
! 						message_die(CRITICAL_ERROR, "Couldn't start session : login", __LINE__, __FILE__);
  					}
  				}
--- 85,89 ----
  					else
  					{
! 						message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__);
  					}
  				}
***************
*** 127,136 ****
  		if( !empty($HTTP_POST_VARS['redirect']) )
  		{
- 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  		}
  		else
  		{
- 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid("index.$phpEx", true));
  		}
--- 124,131 ----
***************
*** 140,149 ****
  		if( !empty($HTTP_POST_VARS['redirect']) )
  		{
- 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  		}
  		else
  		{
- 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid("index.$phpEx", true));
  		}
--- 135,142 ----
***************
*** 156,160 ****
  	// user not already logged in
  	//
! 	if(!$userdata['session_logged_in'])
  	{
  		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
--- 149,153 ----
  	// user not already logged in
  	//
! 	if( !$userdata['session_logged_in'] )
  	{
  		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
***************
*** 203,207 ****
  		}
  
! 		$username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : "";
  
  		$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
--- 196,200 ----
  		}
  
! 		$username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : "";
  
  		$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
***************
*** 224,229 ****
  	else
  	{
! 		header("HTTP/1.0 302 Redirect");
! 		header("Location: index.$phpEx");
  	}
  
--- 217,221 ----
  	else
  	{
! 		header("Location: " . append_sid("index.$phpEx", true));
  	}
  

[Phpbb-checkins] CVS: phpBB2 upgrade.php,1.4,1.5

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

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

Modified Files:
	upgrade.php 
Log Message:
Fixed some userlevel problems

Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** upgrade.php	2001/11/24 21:04:51	1.4
--- upgrade.php	2001/12/01 12:43:43	1.5
***************
*** 179,183 ****
  			else
  			{
- 				print "$line<br>";
  				// It's a bird! It's a plane! It's something we didn't expect ;(
  			}
--- 179,182 ----
***************
*** 202,206 ****
  	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];
--- 201,205 ----
  	for($i=0; $i < count($insertfile); $i++)
  	{
! 		if (preg_match("/^.*(INSERT INTO (\w+)\s.*);$/i", str_replace("phpbb_", $table_prefix, $insertfile[$i]), $matches))
  		{
  			$returnvalue[$matches[2]][] = $matches[1];
***************
*** 417,434 ****
  		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";
! 				}
! 				else
! 				{
! 					print "OK<br>\n";
! 				}
  			}
  		}
--- 416,424 ----
  		while (list($table, $definition) = each ($table_def))
  		{
  			if (!inarray($table, $currenttables))
  			{
  				print "Creating $table: ";
! 				query($definition, "Couldn't create table $table");
! 				print "OK<br>\n";
  			}
  		}
***************
*** 649,652 ****
--- 639,643 ----
  					case '4':
  						$row['user_level'] = ADMIN;
+ 						print $row['username'] . " is an admin. Giving level: ". ADMIN . "<br>\n";
  						break;
  					case '-1':
***************
*** 670,674 ****
  						user_yim = '".$row['user_yim']."',
  						user_msnm = '".$row['user_msnm']."',
! 						user_level = '".$row['user_userlevel']."'
  					WHERE user_id = ".$row['user_id'];
  				query($sql, "Couldn't update ".USERS_TABLE." table with new BBcode and regdate for user_id ".$row['user_id']);
--- 661,665 ----
  						user_yim = '".$row['user_yim']."',
  						user_msnm = '".$row['user_msnm']."',
! 						user_level = '".$row['user_level']."'
  					WHERE user_id = ".$row['user_id'];
  				query($sql, "Couldn't update ".USERS_TABLE." table with new BBcode and regdate for user_id ".$row['user_id']);
***************
*** 681,684 ****
--- 672,676 ----
  	case 'convert_posts':
  		common_header();
+ 
  		$sql = "ALTER TABLE ".POSTS_TABLE." 
  			ADD bbcode_uid char(10) NOT NULL,
***************
*** 758,762 ****
  			lock_tables(0);
  		}
! 		end_step('convert_pm');
  
  	case 'convert_pm':
--- 750,755 ----
  			lock_tables(0);
  		}
! 
! 	end_step('convert_pm');
  
  	case 'convert_pm':
***************
*** 932,936 ****
  		{
  			// Loop fields in table
! 			print "<p>Table: $table<br>\n";
  			flush();
  			
--- 925,929 ----
  		{
  			// Loop fields in table
! 			print "Table: $table <br>\n";
  			flush();
  			
***************
*** 942,946 ****
  				$current_fields[] = $def['Field'];
  			}
- 			//print_r($current_fields);
  			
  			$alter_sql = "ALTER TABLE $table ";
--- 935,938 ----
***************
*** 962,971 ****
  					// 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];
  				}
--- 954,961 ----
***************
*** 991,995 ****
  				}
  			}
- 			print "$alter_sql<br>\n";
  			query($alter_sql, "Couldn't alter table $table");
  			flush();
--- 981,984 ----

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_admin.php,1.15,1.16

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

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

Modified Files:
	lang_admin.php 
Log Message:
Backtrack on IDENTITY ... doh

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** lang_admin.php	2001/11/30 23:15:53	1.15
--- lang_admin.php	2001/12/01 01:25:06	1.16
***************
*** 441,445 ****
  $lang['delete_group_moderator'] = "Delete the old group moderator?";
  $lang['delete_moderator_explain'] = "If you're changing the group moderator, check this box to remove the old moderator from the group.  Otherwise, do not check it, and the user will become a regular member of the group.";
! $lang['return_group_admin'] = "Click %sHere%s to return to Group Administration.";
  $lang['Select_group'] = "Select a group";
  $lang['Look_up_group'] = "Look up group";
--- 441,445 ----
  $lang['delete_group_moderator'] = "Delete the old group moderator?";
  $lang['delete_moderator_explain'] = "If you're changing the group moderator, check this box to remove the old moderator from the group.  Otherwise, do not check it, and the user will become a regular member of the group.";
! $lang['Click_return_groupsadmin'] = "Click %sHere%s to return to Group Administration.";
  $lang['Select_group'] = "Select a group";
  $lang['Look_up_group'] = "Look up group";

[Phpbb-checkins] CVS: phpBB2/admin admin_groups.php,1.16,1.17

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

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

Modified Files:
	admin_groups.php 
Log Message:
Backtrack on IDENTITY ... doh

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** admin_groups.php	2001/11/21 16:20:40	1.16
--- admin_groups.php	2001/12/01 01:20:10	1.17
***************
*** 137,142 ****
  		"L_GROUP_DELETE" => $lang['group_delete'],
  		"L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
! 		"L_SUBMIT" => $lang['submit_group_changes'],
! 		"L_RESET" => $lang['reset_group_changes'],
  		"L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
  		"L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
--- 137,142 ----
  		"L_GROUP_DELETE" => $lang['group_delete'],
  		"L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
! 		"L_SUBMIT" => $lang['Submit'],
! 		"L_RESET" => $lang['Reset'],
  		"L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
  		"L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
***************
*** 172,176 ****
  		}
  
! 		$message = $lang['Deleted_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  		message_die(GENERAL_MESSAGE, $message);
--- 172,176 ----
  		}
  
! 		$message = $lang['Deleted_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  		message_die(GENERAL_MESSAGE, $message);
***************
*** 243,247 ****
  			}
  	
! 			$message = $lang['Updated_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  			message_die(GENERAL_MESSAGE, $message);
--- 243,247 ----
  			}
  	
! 			$message = $lang['Updated_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  			message_die(GENERAL_MESSAGE, $message);
***************
*** 249,261 ****
  		else if( $mode == "newgroup" )
  		{
! 
! 			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) 
! 				VALUES ('" . $group_type . "', '" . $group_name . "', '" . $group_description . "', '" . $group_moderator . "',	'0')";
  			if ( !$result = $db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
  			}
  
! 			$new_group_id = $db->sql_nextid($result);
  
  			$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
--- 249,268 ----
  		else if( $mode == "newgroup" )
  		{
! 			$sql = "SELECT MAX(group_id) AS new_group_id 
! 				FROM " . GROUPS_TABLE;
  			if ( !$result = $db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
  			}
+ 			$row = $db->sql_fetchrow($result);
+ 
+ 			$new_group_id = $row['new_group_id'] + 1;
  
! 			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) 
! 				VALUES ($new_group_id, '" . $group_type . "', '" . $group_name . "', '" . $group_description . "', '" . $group_moderator . "',	'0')";
! 			if ( !$result = $db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
! 			}
  
  			$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
***************
*** 266,270 ****
  			}
  			
! 			$message = $lang['Added_new_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  			message_die(GENERAL_MESSAGE, $message);
--- 273,277 ----
  			}
  			
! 			$message = $lang['Added_new_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  			message_die(GENERAL_MESSAGE, $message);

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.7,1.8

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

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

Modified Files:
	mssql_schema.sql 
Log Message:
Backtrack on IDENTITY ... doh

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mssql_schema.sql	2001/12/01 00:34:50	1.7
--- mssql_schema.sql	2001/12/01 01:20:10	1.8
***************
*** 90,94 ****
  
  CREATE TABLE [phpbb_groups] (
! 	[group_id] [int] IDENTITY (1, 1) NOT NULL ,
  	[group_type] [smallint] NULL ,
  	[group_name] [varchar] (50) NOT NULL ,
--- 90,94 ----
  
  CREATE TABLE [phpbb_groups] (
! 	[group_id] [int] NOT NULL ,
  	[group_type] [smallint] NULL ,
  	[group_name] [varchar] (50) NOT NULL ,

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.6,1.7

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

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

Modified Files:
	mssql_schema.sql 
Log Message:
Missing IDENTITY on phpbb_groups, thanks Martin

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mssql_schema.sql	2001/11/30 23:15:53	1.6
--- mssql_schema.sql	2001/12/01 00:34:50	1.7
***************
*** 90,94 ****
  
  CREATE TABLE [phpbb_groups] (
! 	[group_id] [int] NOT NULL ,
  	[group_type] [smallint] NULL ,
  	[group_name] [varchar] (50) NOT NULL ,
--- 90,94 ----
  
  CREATE TABLE [phpbb_groups] (
! 	[group_id] [int] IDENTITY (1, 1) NOT NULL ,
  	[group_type] [smallint] NULL ,
  	[group_name] [varchar] (50) NOT NULL ,

[Phpbb-checkins] CVS: phpBB2/includes db.php,1.8,1.9

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

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

Modified Files:
	db.php 
Log Message:
Updated for improved use with ODBC setups + introduced a re-install feature ... the schema updates _only_ remove foreign key and drop table clauses

Index: db.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/db.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** db.php	2001/11/20 22:35:46	1.8
--- db.php	2001/11/30 23:22:56	1.9
***************
*** 39,48 ****
  		break;
  
  	case 'msaccess':
  		include($phpbb_root_path . 'db/msaccess.'.$phpEx);
  		break;
  
! 	case 'oracle':
! 		include($phpbb_root_path . 'db/oracle.'.$phpEx);
  		break;
  }
--- 39,52 ----
  		break;
  
+ 	case 'oracle':
+ 		include($phpbb_root_path . 'db/oracle.'.$phpEx);
+ 		break;
+ 
  	case 'msaccess':
  		include($phpbb_root_path . 'db/msaccess.'.$phpEx);
  		break;
  
! 	case 'mssql-odbc':
! 		include($phpbb_root_path . 'db/mssql-odbc.'.$phpEx);
  		break;
  }

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_admin.php,1.14,1.15

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

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

Modified Files:
	lang_admin.php 
Log Message:
Updated for improved use with ODBC setups + introduced a re-install feature ... the schema updates _only_ remove foreign key and drop table clauses

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** lang_admin.php	2001/11/29 11:26:44	1.14
--- lang_admin.php	2001/11/30 23:15:53	1.15
***************
*** 494,538 ****
  
  //
- // Install Process
- //
- $lang['Welcome_install'] = "Welcome to phpBB 2 Installation";
- $lang['Initial_config'] = "Basic Configuration";
- $lang['DB_config'] = "Database Configuration";
- $lang['Admin_config'] = "Admin Configuration";
- $lang['Installer_Error'] = "An error has occurred during installation";
- $lang['Previous_Install'] = "A previous installation has been detected";
- $lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist";
- $lang['Start_Install'] = "Start Install";
- $lang['Default_lang'] = "Default board language";
- $lang['DB_Host'] = "Database Server Hostname";
- $lang['DB_Name'] = "Your Database Name";
- $lang['Database'] = "Your Database";
- $lang['Install_lang'] = "Choose Language for Installation";
- $lang['dbms'] = "Database Type";
- $lang['Inst_Step_1'] = "Your database tables have been created and filled with some basic default data.  Please enter your chosen phpBB Admin Username and Password.";
- $lang['Create_User'] = "Create User";
- $lang['Inst_Step_2'] = "Your admin username has been created.  At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.";
- $lang['Finish_Install'] = "Finish Installation";
- $lang['Install_db_error'] = "An error occurred 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 un-writeable 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";
- 
- 
- //
  // Ranks admin
  //
--- 494,497 ----
***************
*** 665,668 ****
--- 624,679 ----
  $lang['img_poll_size'] = "Polling Image Size [px]";
  $lang['img_pm_size'] = "Private Message Status size [px]";
+ 
+ 
+ //
+ // Install Process
+ //
+ $lang['Welcome_install'] = "Welcome to phpBB 2 Installation";
+ $lang['Initial_config'] = "Basic Configuration";
+ $lang['DB_config'] = "Database Configuration";
+ $lang['Admin_config'] = "Admin Configuration";
+ 
+ $lang['Installer_Error'] = "An error has occurred during installation";
+ $lang['Previous_Install'] = "A previous installation has been detected";
+ $lang['Install_db_error'] = "An error occurred trying to update the database";
+ 
+ $lang['Re_install'] = "Your previous installation is still active. <br /><br />If you would like to re-install phpBB 2 you should click the Yes button below. Please be aware that doing so will destroy all existing data, no backups will be made! The administrator username and password you have used to login in to the board will be re-created after the re-installation, no other settings will be retained. <br /><br />Think carefully before pressing Yes!";
+ 
+ $lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist. If you are installing to a database that uses ODBC, e.g. MS Access you should first create a DSN for it before proceeding.";
+ 
+ $lang['Start_Install'] = "Start Install";
+ $lang['Finish_Install'] = "Finish Installation";
+ 
+ $lang['Default_lang'] = "Default board language";
+ $lang['DB_Host'] = "Database Server Hostname / DSN";
+ $lang['DB_Name'] = "Your Database Name";
+ $lang['Database'] = "Your Database";
+ $lang['Install_lang'] = "Choose Language for Installation";
+ $lang['dbms'] = "Database Type";
+ $lang['Table_Prefix'] = "Prefix for tables in database";
+ $lang['Admin_Username'] = "Administrator Username";
+ $lang['Admin_Password'] = "Administrator Password";
+ $lang['Admin_Password_confirm'] = "Administrator Password [ Confirm ]";
+ 
+ $lang['Inst_Step_2'] = "Your admin username has been created.  At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.";
+ 
+ $lang['Unwriteable_config'] = "Your config file is un-writeable 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['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_info'] = "Enter Your FTP Information";
+ $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_path'] = "FTP path to phpBB 2";
+ $lang['ftp_username'] = "Your FTP Username";
+ $lang['ftp_password'] = "Your FTP Password";
+ $lang['Transfer_config'] = "Start Transfer";
+ 
+ $lang['Install'] = "Install";
+ $lang['Upgrade'] = "Upgrade";
+ 
+ $lang['Install_Method'] = "Choose your installation method";
  
  //

[Phpbb-checkins] CVS: phpBB2/db mssql-odbc.php,1.1,1.2

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

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

Modified Files:
	mssql-odbc.php 
Log Message:
Updated for improved use with ODBC setups + introduced a re-install feature ... the schema updates _only_ remove foreign key and drop table clauses

Index: mssql-odbc.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql-odbc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mssql-odbc.php	2001/11/20 22:27:29	1.1
--- mssql-odbc.php	2001/11/30 23:15:53	1.2
***************
*** 51,59 ****
  		if($this->persistency)
  		{
! 			$this->db_connect_id = odbc_pconnect($this->server, "", "");
  		}
  		else
  		{
! 			$this->db_connect_id = odbc_connect($this->server, "", "");
  		}
  
--- 51,59 ----
  		if($this->persistency)
  		{
! 			$this->db_connect_id = odbc_pconnect($this->server, $this->user, $this->password);
  		}
  		else
  		{
! 			$this->db_connect_id = odbc_connect($this->server, $this->user, $this->password);
  		}
  
***************
*** 170,174 ****
  					$query = preg_replace("/\\\'/s", "''", $query);
  				}
- 
  				$this->query_result = odbc_exec($this->db_connect_id, $query);
  
--- 170,173 ----

[Phpbb-checkins] CVS: phpBB2/db/schemas mysql_schema.sql,1.4,1.5 mssql_schema.sql,1.5,1.6

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

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

Modified Files:
	mysql_schema.sql mssql_schema.sql 
Log Message:
Updated for improved use with ODBC setups + introduced a re-install feature ... the schema updates _only_ remove foreign key and drop table clauses

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mysql_schema.sql	2001/11/24 17:17:32	1.4
--- mysql_schema.sql	2001/11/30 23:15:53	1.5
***************
*** 8,12 ****
  # Table structure for table 'phpbb_auth_access'
  #
- DROP TABLE IF EXISTS phpbb_auth_access;
  CREATE TABLE phpbb_auth_access (
     group_id mediumint(8) DEFAULT '0' NOT NULL,
--- 8,11 ----
***************
*** 32,36 ****
  # Table structure for table 'phpbb_user_group'
  #
- DROP TABLE IF EXISTS phpbb_user_group;
  CREATE TABLE phpbb_user_group (
     group_id mediumint(8) DEFAULT '0' NOT NULL,
--- 31,34 ----
***************
*** 44,48 ****
  # Table structure for table 'phpbb_groups'
  #
- DROP TABLE IF EXISTS phpbb_groups;
  CREATE TABLE phpbb_groups (
     group_id mediumint(8) NOT NULL auto_increment,
--- 42,45 ----
***************
*** 61,65 ****
  # Table structure for table 'phpbb_banlist'
  #
- DROP TABLE IF EXISTS phpbb_banlist;
  CREATE TABLE phpbb_banlist (
     ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 58,61 ----
***************
*** 76,80 ****
  # Table structure for table 'phpbb_categories'
  #
- DROP TABLE IF EXISTS phpbb_categories;
  CREATE TABLE phpbb_categories (
     cat_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 72,75 ----
***************
*** 90,94 ****
  # Table structure for table 'phpbb_config'
  #
- DROP TABLE IF EXISTS phpbb_config;
  CREATE TABLE phpbb_config ( 
      config_name varchar(255) NOT NULL, 
--- 85,88 ----
***************
*** 102,106 ****
  # Table structure for table 'phpbb_disallow'
  #
- DROP TABLE IF EXISTS phpbb_disallow;
  CREATE TABLE phpbb_disallow (
     disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 96,99 ----
***************
*** 114,118 ****
  # Table structure for table 'phpbb_forum_prune'
  #
- DROP TABLE IF EXISTS phpbb_forum_prune;
  CREATE TABLE phpbb_forum_prune (
     prune_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 107,110 ----
***************
*** 129,133 ****
  # Table structure for table 'phpbb_forums'
  #
- DROP TABLE IF EXISTS phpbb_forums;
  CREATE TABLE phpbb_forums (
     forum_id smallint(5) UNSIGNED NOT NULL auto_increment,
--- 121,124 ----
***************
*** 164,168 ****
  # Table structure for table 'phpbb_posts'
  #
- DROP TABLE IF EXISTS phpbb_posts;
  CREATE TABLE phpbb_posts (
     post_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 155,158 ----
***************
*** 191,195 ****
  # Table structure for table 'phpbb_posts_text'
  #
- DROP TABLE IF EXISTS phpbb_posts_text;
  CREATE TABLE phpbb_posts_text (
     post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
--- 181,184 ----
***************
*** 205,209 ****
  # Table structure for table 'phpbb_privmsgs'
  #
- DROP TABLE IF EXISTS phpbb_privmsgs;
  CREATE TABLE phpbb_privmsgs (
     privmsgs_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 194,197 ----
***************
*** 228,232 ****
  # Table structure for table 'phpbb_privmsgs_text'
  #
- DROP TABLE IF EXISTS phpbb_privmsgs_text;
  CREATE TABLE phpbb_privmsgs_text (
     privmsgs_text_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
--- 216,219 ----
***************
*** 241,245 ****
  # Table structure for table 'phpbb_ranks'
  #
- DROP TABLE IF EXISTS phpbb_ranks;
  CREATE TABLE phpbb_ranks (
     rank_id smallint(5) UNSIGNED NOT NULL auto_increment,
--- 228,231 ----
***************
*** 257,261 ****
  # Table structure for table `phpbb_search_results`
  #
- DROP TABLE IF EXISTS phpbb_search_results;
  CREATE TABLE phpbb_search_results (
    search_id mediumint(8) UNSIGNED NOT NULL default '0',
--- 243,246 ----
***************
*** 271,275 ****
  # Table structure for table `phpbb_search_wordlist`
  #
- DROP TABLE IF EXISTS phpbb_search_wordlist;
  CREATE TABLE phpbb_search_wordlist (
    word_text varchar(50) binary NOT NULL default '',
--- 256,259 ----
***************
*** 284,288 ****
  # Table structure for table `phpbb_search_wordmatch`
  #
- DROP TABLE IF EXISTS phpbb_search_wordmatch;
  CREATE TABLE phpbb_search_wordmatch (
    post_id mediumint(8) UNSIGNED NOT NULL default '0',
--- 268,271 ----
***************
*** 308,312 ****
  # look at any code ... !
  #
- DROP TABLE IF EXISTS phpbb_sessions;
  CREATE TABLE phpbb_sessions (
     session_id char(32) DEFAULT '' NOT NULL,
--- 291,294 ----
***************
*** 328,332 ****
  # Table structure for table 'phpbb_smilies'
  #
- DROP TABLE IF EXISTS phpbb_smilies; 
  CREATE TABLE phpbb_smilies (
     smilies_id smallint(5) UNSIGNED NOT NULL auto_increment,
--- 310,313 ----
***************
*** 342,346 ****
  # Table structure for table 'phpbb_themes'
  #
- DROP TABLE IF EXISTS phpbb_themes;
  CREATE TABLE phpbb_themes (
     themes_id mediumint(8) UNSIGNED NOT NULL auto_increment, 
--- 323,326 ----
***************
*** 395,399 ****
  # Table structure for table 'phpbb_themes_name'
  #
- DROP TABLE IF EXISTS phpbb_themes_name;
  CREATE TABLE phpbb_themes_name (
     themes_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
--- 375,378 ----
***************
*** 436,440 ****
  # Table structure for table 'phpbb_topics'
  #
- DROP TABLE IF EXISTS phpbb_topics;
  CREATE TABLE phpbb_topics (
     topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 415,418 ----
***************
*** 461,465 ****
  # Table structure for table 'phpbb_topics_watch'
  #
- DROP TABLE IF EXISTS phpbb_topics_watch;
  CREATE TABLE phpbb_topics_watch (
    topic_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
--- 439,442 ----
***************
*** 476,480 ****
  # Table structure for table 'phpbb_users'
  #
- DROP TABLE IF EXISTS phpbb_users;
  CREATE TABLE phpbb_users (
     user_id mediumint(8) NOT NULL auto_increment,
--- 453,456 ----
***************
*** 530,534 ****
  # Table structure for table 'phpbb_vote_desc'
  #
- DROP TABLE IF EXISTS phpbb_vote_desc;
  CREATE TABLE phpbb_vote_desc (
    vote_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 506,509 ----
***************
*** 546,550 ****
  # Table structure for table 'phpbb_vote_results'
  #
- DROP TABLE IF EXISTS phpbb_vote_results;
  CREATE TABLE phpbb_vote_results (
    vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
--- 521,524 ----
***************
*** 561,565 ****
  # Table structure for table 'phpbb_vote_voters'
  #
- DROP TABLE IF EXISTS phpbb_vote_voters;
  CREATE TABLE phpbb_vote_voters (
    vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
--- 535,538 ----
***************
*** 576,580 ****
  # Table structure for table 'phpbb_words'
  #
- DROP TABLE IF EXISTS phpbb_words;
  CREATE TABLE phpbb_words (
     word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
--- 549,552 ----

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mssql_schema.sql	2001/11/29 15:08:21	1.5
--- mssql_schema.sql	2001/11/30 23:15:53	1.6
***************
*** 10,149 ****
  GO
  
- if exists (select * from dbo.sysobjects where id = object_id(N'[FK_phpbb_user_group_phpbb_groups]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
- ALTER TABLE [phpbb_user_group] DROP CONSTRAINT FK_phpbb_user_group_phpbb_groups
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[FK_phpbb_posts_text_phpbb_posts]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
- ALTER TABLE [phpbb_posts_text] DROP CONSTRAINT FK_phpbb_posts_text_phpbb_posts
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[FK_phpbb_privmsgs_text_phpbb_privmsgs]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
- ALTER TABLE [phpbb_privmsgs_text] DROP CONSTRAINT FK_phpbb_privmsgs_text_phpbb_privmsgs
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[FK_phpbb_search_wordmatch_phpbb_search_wordlist]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
- ALTER TABLE [phpbb_search_wordmatch] DROP CONSTRAINT FK_phpbb_search_wordmatch_phpbb_search_wordlist
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[FK_phpbb_themes_name_phpbb_themes]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
- ALTER TABLE [phpbb_themes_name] DROP CONSTRAINT FK_phpbb_themes_name_phpbb_themes
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[FK_phpbb_topics_watch_phpbb_topics]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
- ALTER TABLE [phpbb_topics_watch] DROP CONSTRAINT FK_phpbb_topics_watch_phpbb_topics
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_auth_access]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_auth_access]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_banlist]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_banlist]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_categories]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_categories]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_config]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_config]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_disallow]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_disallow]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_forum_prune]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_forum_prune]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_forums]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_forums]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_groups]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_groups]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_posts]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_posts]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_posts_text]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_posts_text]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_privmsgs]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_privmsgs]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_privmsgs_text]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_privmsgs_text]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_ranks]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_ranks]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_search_results]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_search_results]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_search_wordlist]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_search_wordlist]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_search_wordmatch]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_search_wordmatch]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_sessions]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_sessions]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_smilies]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_smilies]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_themes]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_themes]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_themes_name]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_themes_name]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_topics]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_topics]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_topics_watch]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_topics_watch]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_user_group]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_user_group]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_users]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_users]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_vote_desc]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_vote_desc]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_vote_results]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_vote_results]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_vote_voters]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_vote_voters]
- GO
- 
- if exists (select * from dbo.sysobjects where id = object_id(N'[phpbb_words]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
- drop table [phpbb_words]
- GO
- 
  CREATE TABLE [phpbb_auth_access] (
  	[group_id] [int] NULL ,
--- 10,13 ----
***************
*** 788,845 ****
  
   CREATE  INDEX [IX_phpbb_vote_voters_1] ON [phpbb_vote_voters]([vote_user_id]) ON [PRIMARY]
- GO
- 
- ALTER TABLE [phpbb_posts_text] ADD 
- 	CONSTRAINT [FK_phpbb_posts_text_phpbb_posts] FOREIGN KEY 
- 	(
- 		[post_id]
- 	) REFERENCES [phpbb_posts] (
- 		[post_id]
- 	)
- GO
- 
- ALTER TABLE [phpbb_privmsgs_text] ADD 
- 	CONSTRAINT [FK_phpbb_privmsgs_text_phpbb_privmsgs] FOREIGN KEY 
- 	(
- 		[privmsgs_text_id]
- 	) REFERENCES [phpbb_privmsgs] (
- 		[privmsgs_id]
- 	)
- GO
- 
- ALTER TABLE [phpbb_search_wordmatch] ADD 
- 	CONSTRAINT [FK_phpbb_search_wordmatch_phpbb_search_wordlist] FOREIGN KEY 
- 	(
- 		[word_id]
- 	) REFERENCES [phpbb_search_wordlist] (
- 		[word_id]
- 	)
- GO
- 
- ALTER TABLE [phpbb_themes_name] ADD 
- 	CONSTRAINT [FK_phpbb_themes_name_phpbb_themes] FOREIGN KEY 
- 	(
- 		[themes_id]
- 	) REFERENCES [phpbb_themes] (
- 		[themes_id]
- 	)
- GO
- 
- ALTER TABLE [phpbb_topics_watch] ADD 
- 	CONSTRAINT [FK_phpbb_topics_watch_phpbb_topics] FOREIGN KEY 
- 	(
- 		[topic_id]
- 	) REFERENCES [phpbb_topics] (
- 		[topic_id]
- 	)
- GO
- 
- ALTER TABLE [phpbb_user_group] ADD 
- 	CONSTRAINT [FK_phpbb_user_group_phpbb_groups] FOREIGN KEY 
- 	(
- 		[group_id]
- 	) REFERENCES [phpbb_groups] (
- 		[group_id]
- 	)
  GO
  
--- 652,655 ----

[Phpbb-checkins] CVS: phpBB2 install.php,1.16,1.17

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

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

Modified Files:
	install.php 
Log Message:
Updated for improved use with ODBC setups + introduced a re-install feature ... the schema updates _only_ remove foreign key and drop table clauses

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** install.php	2001/11/24 21:04:51	1.16
--- install.php	2001/11/30 23:15:53	1.17
***************
*** 23,26 ****
--- 23,30 ----
  include($phpbb_root_path.'extension.inc');
  
+ $userdata = array();
+ $lang = array();
+ $reinstall = false;
+ 
  if( !get_magic_quotes_gpc() )
  {
***************
[...1142 lines suppressed...]
  		
  		$template->pparse('body');
! 		exit();
  	}
  }
! ?>
--- 840,851 ----
  
  			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
! 			"S_FORM_ACTION" => ( $reinstall ) ? append_sid("login.$phpEx") : "login.$phpEx")
  		);
  		
  		$template->pparse('body');
! 
! 		exit;
  	}
  }
! 
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 login.php,1.33,1.34

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

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

Modified Files:
	login.php 
Log Message:
Allow admins to login to disabled board ... for admin panel access only

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** login.php	2001/11/18 14:00:31	1.33
--- login.php	2001/11/30 18:51:08	1.34
***************
*** 21,24 ****
--- 21,30 ----
   ***************************************************************************/
  
+ //
+ // Allow people to reach login page if
+ // board is shut down
+ //
+ define("IN_ADMIN", true);
+ 
  $phpbb_root_path = "./";
  include($phpbb_root_path . 'extension.inc');
***************
*** 41,45 ****
  		$password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : "";
  
! 		$sql = "SELECT user_id, username, user_password, user_active
  			FROM ".USERS_TABLE."
  			WHERE username = '$username'";
--- 47,51 ----
  		$password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : "";
  
! 		$sql = "SELECT user_id, username, user_password, user_active, user_level 
  			FROM ".USERS_TABLE."
  			WHERE username = '$username'";
***************
*** 54,90 ****
  		if( count($rowresult) )
  		{
! 	 		if( md5($password) == $rowresult['user_password'] && $rowresult['user_active'] )
  			{
! 				$autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0;
  
! 				$session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, TRUE, $autologin);
  
! 				if( $session_id )
! 				{
! 					if( !empty($HTTP_POST_VARS['redirect']) )
  					{
! 						header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  					}
  					else
  					{
! 						header("Location: " . append_sid("index.$phpEx", true));
  					}
  				}
  				else
  				{
! 					message_die(CRITICAL_ERROR, "Couldn't start session : login", __LINE__, __FILE__);
! 				}
! 			}
! 			else
! 			{
! 				$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "";
  
! 				$template->assign_vars(array(
! 					"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?$redirect") . '">')
! 				);
! 
! 				$message = $lang['Error_login'] . "<br /><br />" . sprintf($lang['Click_return_login'], "<a href=\"" . append_sid("login.$phpEx?$redirect") . "\">", "</a> ") . "<br /><br />" .  sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a> ");
! 					
! 				message_die(GENERAL_MESSAGE, $message);
  			}
  		}
--- 60,106 ----
  		if( count($rowresult) )
  		{
! 			if( $rowresult['user_level'] != ADMIN && $board_config['board_disable'] )
  			{
! 				header("HTTP/1.0 302 Redirect");
! 				header("Location: " . append_sid("index.$phpEx", true));
! 			}
! 			else
! 			{
! 				if( md5($password) == $rowresult['user_password'] && $rowresult['user_active'] )
! 				{
! 					$autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0;
  
! 					$session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, TRUE, $autologin);
  
! 					if( $session_id )
  					{
! 						if( !empty($HTTP_POST_VARS['redirect']) )
! 						{
! 							header("HTTP/1.0 302 Redirect");
! 							header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
! 						}
! 						else
! 						{
! 							header("HTTP/1.0 302 Redirect");
! 							header("Location: " . append_sid("index.$phpEx", true));
! 						}
  					}
  					else
  					{
! 						message_die(CRITICAL_ERROR, "Couldn't start session : login", __LINE__, __FILE__);
  					}
  				}
  				else
  				{
! 					$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "";
  
! 					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?$redirect") . '">')
! 					);
! 
! 					$message = $lang['Error_login'] . "<br /><br />" . sprintf($lang['Click_return_login'], "<a href=\"" . append_sid("login.$phpEx?$redirect") . "\">", "</a> ") . "<br /><br />" .  sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a> ");
! 						
! 					message_die(GENERAL_MESSAGE, $message);
! 				}
  			}
  		}
***************
*** 111,118 ****
--- 127,136 ----
  		if( !empty($HTTP_POST_VARS['redirect']) )
  		{
+ 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  		}
  		else
  		{
+ 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid("index.$phpEx", true));
  		}
***************
*** 122,129 ****
--- 140,149 ----
  		if( !empty($HTTP_POST_VARS['redirect']) )
  		{
+ 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid($HTTP_POST_VARS['redirect'], true));
  		}
  		else
  		{
+ 			header("HTTP/1.0 302 Redirect");
  			header("Location: " . append_sid("index.$phpEx", true));
  		}
***************
*** 204,207 ****
--- 224,228 ----
  	else
  	{
+ 		header("HTTP/1.0 302 Redirect");
  		header("Location: index.$phpEx");
  	}

[Phpbb-checkins] CVS: phpBB2/admin admin_groupauth.php,1.21,1.22

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

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

Modified Files:
	admin_groupauth.php 
Log Message:
Fix for [] not supported bug

Index: admin_groupauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groupauth.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** admin_groupauth.php	2001/11/19 19:06:01	1.21
--- admin_groupauth.php	2001/11/30 01:28:32	1.22
***************
*** 551,555 ****
  		WHERE g.group_id = $group_id
  			AND ug.group_id = g.group_id
! 			AND u.user_id = ug.user_id";
  	$g_result = $db->sql_query($sql);
  	$groupinf = $db->sql_fetchrowset($g_result);
--- 551,556 ----
  		WHERE g.group_id = $group_id
  			AND ug.group_id = g.group_id
! 			AND u.user_id = ug.user_id 
! 		ORDER BY u.username";
  	$g_result = $db->sql_query($sql);
  	$groupinf = $db->sql_fetchrowset($g_result);
***************
*** 770,773 ****
--- 771,776 ----
  	@reset($auth_group);
  
+ 	$username = array();
+ 	$user_id = array();
  	for($i = 0; $i < count($groupinf); $i++)
  	{

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

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

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

Modified Files:
	privmsg.php 
Log Message:
Implement suggestion in bug #484449

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** privmsg.php	2001/11/29 21:48:08	1.59
--- privmsg.php	2001/11/29 22:51:34	1.60
***************
*** 602,606 ****
  		$template->assign_vars(array(
  			"MESSAGE_TITLE" => $lang['Information'],
! 			"MESSAGE_TEXT" => $lang['Confirm_delete'], 
  
  			"L_YES" => $lang['Yes'],
--- 602,606 ----
  		$template->assign_vars(array(
  			"MESSAGE_TITLE" => $lang['Information'],
! 			"MESSAGE_TEXT" => ( count($mark_list) == 1 ) ? $lang['Confirm_delete_pm'] : $lang['Confirm_delete_pms'], 
  
  			"L_YES" => $lang['Yes'],

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.57,1.58

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

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

Modified Files:
	lang_main.php 
Log Message:
Implement suggestion in bug #484449

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** lang_main.php	2001/11/29 13:05:03	1.57
--- lang_main.php	2001/11/29 22:51:34	1.58
***************
*** 420,423 ****
--- 420,426 ----
  $lang['Unmark_all'] = "Unmark all";
  
+ $lang['Confirm_delete_pm'] = "Are you sure you want to delete this message?";
+ $lang['Confirm_delete_pms'] = "Are you sure you want to delete these messages?";
+ 
  $lang['Inbox_size'] = "Your Inbox is %d%% full"; // eg. Your Inbox is 50% full
  $lang['Sentbox_size'] = "Your Sentbox is %d%% full"; 

[Phpbb-checkins] CVS: phpBB2/admin admin_forums.php,1.30,1.31

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

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

Modified Files:
	admin_forums.php 
Log Message:
Fix bug #487265

Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** admin_forums.php	2001/11/29 08:45:54	1.30
--- admin_forums.php	2001/11/29 22:45:13	1.31
***************
*** 716,720 ****
  			$to_id = intval($HTTP_POST_VARS['to_id']);
  
! 			if (isset($to_id))
  			{
  				$sql = "SELECT *
--- 716,720 ----
  			$to_id = intval($HTTP_POST_VARS['to_id']);
  
! 			if (!empty($to_id))
  			{
  				$sql = "SELECT *
***************
*** 742,746 ****
  				WHERE cat_id = $from_id";
  				
- 			echo $sql;
  			if( !$result = $db->sql_query($sql) )
  			{
--- 742,745 ----
***************
*** 856,915 ****
  	}
  
- 	$forum_rows = $db->sql_fetchrowset($q_forums);
- 
  	if( $total_forums = $db->sql_numrows($q_forums) )
  	{
! 		//
! 		// Okay, let's build the index
! 		//
! 		$gen_cat = array();
  
! 		for($i = 0; $i < $total_categories; $i++)
! 		{
! 			$cat_id = $category_rows[$i]['cat_id'];
  
! 			$template->assign_block_vars("catrow", array( 
! 				'S_ADD_FORUM_SUBMIT' => "addforum[$cat_id]", 
! 				'S_ADD_FORUM_NAME' => "forumname[$cat_id]", 
! 
! 				'CAT_ID' => $cat_id,
! 				'CAT_DESC' => $category_rows[$i]['cat_title'],
! 
! 				'U_CAT_EDIT' => append_sid("admin_forums.$phpEx?mode=editcat&amp;cat_id=$cat_id"),
! 				'U_CAT_DELETE' => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"),
! 				'U_CAT_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"),
! 				'U_CAT_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"),
! 				'U_VIEWCAT' => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id"))
! 			);
  
! 			for($j = 0; $j < $total_forums; $j++)
! 			{
! 				$forum_id = $forum_rows[$j]['forum_id'];
! 				
! 				if ($forum_rows[$j]['cat_id'] == $cat_id)
! 				{
  
! 					$template->assign_block_vars("catrow.forumrow",	array(
! 						'FORUM_NAME' => $forum_rows[$j]['forum_name'],
! 						'FORUM_DESC' => $forum_rows[$j]['forum_desc'],
! 						'ROW_COLOR' => $row_color,
! 						'NUM_TOPICS' => $forum_rows[$j]['forum_topics'],
! 						'NUM_POSTS' => $forum_rows[$j]['forum_posts'],
! 
! 						'U_VIEWFORUM' => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;" . $forum_rows[$j]['forum_posts']),
! 						'U_FORUM_EDIT' => append_sid("admin_forums.$phpEx?mode=editforum&amp;forum_id=$forum_id"),
! 						'U_FORUM_DELETE' => append_sid("admin_forums.$phpEx?mode=deleteforum&amp;forum_id=$forum_id"),
! 						'U_FORUM_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=-15&forum_id=$forum_id"),
! 						'U_FORUM_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=15&forum_id=$forum_id"),
! 						'U_FORUM_RESYNC' => append_sid("admin_forums.$phpEx?mode=forum_sync&amp;forum_id=$forum_id"))
! 					);
  
! 				}// if ... forumid == catid
! 				
! 			} // for ... forums
  
! 		} // for ... categories
  
! 	}// if ... total_forums
  
  }// if ... total_categories
--- 855,913 ----
  	}
  
  	if( $total_forums = $db->sql_numrows($q_forums) )
  	{
! 		$forum_rows = $db->sql_fetchrowset($q_forums);
! 	}
  
! 	//
! 	// Okay, let's build the index
! 	//
! 	$gen_cat = array();
  
! 	for($i = 0; $i < $total_categories; $i++)
! 	{
! 		$cat_id = $category_rows[$i]['cat_id'];
  
! 		$template->assign_block_vars("catrow", array( 
! 			'S_ADD_FORUM_SUBMIT' => "addforum[$cat_id]", 
! 			'S_ADD_FORUM_NAME' => "forumname[$cat_id]", 
! 
! 			'CAT_ID' => $cat_id,
! 			'CAT_DESC' => $category_rows[$i]['cat_title'],
! 
! 			'U_CAT_EDIT' => append_sid("admin_forums.$phpEx?mode=editcat&amp;cat_id=$cat_id"),
! 			'U_CAT_DELETE' => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"),
! 			'U_CAT_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"),
! 			'U_CAT_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"),
! 			'U_VIEWCAT' => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id"))
! 		);
  
! 		for($j = 0; $j < $total_forums; $j++)
! 		{
! 			$forum_id = $forum_rows[$j]['forum_id'];
! 			
! 			if ($forum_rows[$j]['cat_id'] == $cat_id)
! 			{
  
! 				$template->assign_block_vars("catrow.forumrow",	array(
! 					'FORUM_NAME' => $forum_rows[$j]['forum_name'],
! 					'FORUM_DESC' => $forum_rows[$j]['forum_desc'],
! 					'ROW_COLOR' => $row_color,
! 					'NUM_TOPICS' => $forum_rows[$j]['forum_topics'],
! 					'NUM_POSTS' => $forum_rows[$j]['forum_posts'],
! 
! 					'U_VIEWFORUM' => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;" . $forum_rows[$j]['forum_posts']),
! 					'U_FORUM_EDIT' => append_sid("admin_forums.$phpEx?mode=editforum&amp;forum_id=$forum_id"),
! 					'U_FORUM_DELETE' => append_sid("admin_forums.$phpEx?mode=deleteforum&amp;forum_id=$forum_id"),
! 					'U_FORUM_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=-15&forum_id=$forum_id"),
! 					'U_FORUM_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=15&forum_id=$forum_id"),
! 					'U_FORUM_RESYNC' => append_sid("admin_forums.$phpEx?mode=forum_sync&amp;forum_id=$forum_id"))
! 				);
  
! 			}// if ... forumid == catid
! 			
! 		} // for ... forums
  
! 	} // for ... categories
  
  }// if ... total_categories

[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.58,1.59 profile.php,1.150,1.151

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

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

Modified Files:
	privmsg.php profile.php 
Log Message:
Fix bugs #487201 & #487182

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** privmsg.php	2001/11/29 12:46:16	1.58
--- privmsg.php	2001/11/29 21:48:08	1.59
***************
*** 1271,1287 ****
  
  			$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject'];
- 			$privmsg_message = $privmsg['privmsgs_text'];
- 			$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
  
  			$to_username = $privmsg['username'];
  			$to_userid = $privmsg['user_id'];
  
- 			$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
- 			$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
- 			$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
- 
  			if( $mode == "quote" )
  			{
! 				$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]";
--- 1271,1288 ----
  
  			$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject'];
  
  			$to_username = $privmsg['username'];
  			$to_userid = $privmsg['user_id'];
  
  			if( $mode == "quote" )
  			{
! 				$privmsg_message = $privmsg['privmsgs_text'];
! 				$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
! 
! 				$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
! 				$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
! 				$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
! 				
! 				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); 
  
  				$privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]";

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -r1.150 -r1.151
*** profile.php	2001/11/29 12:47:39	1.150
--- profile.php	2001/11/29 21:48:08	1.151
***************
*** 252,256 ****
  		{
  			$total_posts = get_db_stat("postcount");
! 			$percentage = ( $total_posts ) ? sprintf("%.2f", max(100, ($profiledata['user_posts'] / $total_posts) * 100)) : 0;
  		}
  		else
--- 252,256 ----
  		{
  			$total_posts = get_db_stat("postcount");
! 			$percentage = ( $total_posts ) ? sprintf("%.2f", min(100, ($profiledata['user_posts'] / $total_posts) * 100)) : 0;
  		}
  		else

[Phpbb-checkins] CVS: phpBB2/db/schemas ms_access_primer.zip,1.2,1.3

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

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

Modified Files:
	ms_access_primer.zip 
Log Message:
Updated for bbcode_uid move

Index: ms_access_primer.zip
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/ms_access_primer.zip,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Binary files /tmp/cvsrnp6C2 and /tmp/cvsMuCdRW differ

[Phpbb-checkins] CVS: phpBB2/develop search_fill.php,1.2,1.3

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

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

Modified Files:
	search_fill.php 
Log Message:
Updated to take account of schema changes

Index: search_fill.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/search_fill.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search_fill.php	2001/11/15 22:07:29	1.2
--- search_fill.php	2001/11/29 15:27:48	1.3
***************
*** 11,16 ****
--- 11,25 ----
  	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", "o", "o", "o", "o", "o", "o", "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", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
+ 
  	$entry = " " . strip_tags(strtolower($entry)) . " ";
  
+ 	$entry = str_replace($sgml_match, $sgml_match, $entry);
+ 	$entry = str_replace($accent_match, $accent_replace, $entry);
+ 
  	// Replace line endings by a space
  	$entry = preg_replace("/[\n\r]/is", " ", $entry); 
***************
*** 63,69 ****
  	global $db;
  	
! 	$sql = "
! 		SELECT
! 			COUNT(DISTINCT post_id) as total_posts
  	   FROM " . SEARCH_MATCH_TABLE;
  	$result = $db->sql_query($sql); 
--- 72,76 ----
  	global $db;
  	
! 	$sql = "SELECT COUNT(DISTINCT post_id) as total_posts
  	   FROM " . SEARCH_MATCH_TABLE;
  	$result = $db->sql_query($sql); 
***************
*** 76,92 ****
  	$total_posts = $total_posts['total_posts'];
  	
! 	$common_threshold = floor($total_posts * ($percent/100));
  
! 	$sql = "
! 		SELECT 
! 			word_id, 
! 			count(word_id) AS word_occur 
! 		FROM 
! 			".SEARCH_MATCH_TABLE."
! 		GROUP BY 
! 			word_id
! 		HAVING
! 			word_occur > $common_threshold
! 		";
  	$result = $db->sql_query($sql); 
  	if( !$result )
--- 83,92 ----
  	$total_posts = $total_posts['total_posts'];
  	
! 	$common_threshold = floor($total_posts * ( $percent / 100 ));
  
! 	$sql = "SELECT word_id 
! 		FROM " . SEARCH_MATCH_TABLE . "
! 		GROUP BY word_id
! 		HAVING count(word_id) > $common_threshold";
  	$result = $db->sql_query($sql); 
  	if( !$result )
***************
*** 178,184 ****
  //
  $sql = "
! 	SELECT 
! 		count(*) as total,
! 		max(post_id) as max_post_id 
  	FROM ". POSTS_TEXT_TABLE;
  if(!$result = $db->sql_query($sql)) 
--- 178,182 ----
  //
  $sql = "
! 	SELECT count(*) as total, max(post_id) as max_post_id 
  	FROM ". POSTS_TEXT_TABLE;
  if(!$result = $db->sql_query($sql)) 
***************
*** 202,209 ****
  	
  	$sql = "SELECT *
! 		FROM " .
! 			POSTS_TEXT_TABLE ."
! 		WHERE 
! 			post_id BETWEEN $batchstart AND $batchend";
  	if(!$posts_result = $db->sql_query($sql))
  	{
--- 200,207 ----
  	
  	$sql = "SELECT *
! 		FROM " . POSTS_TEXT_TABLE ."
! 		WHERE post_id 
! 			BETWEEN $batchstart 
! 				AND $batchend";
  	if(!$posts_result = $db->sql_query($sql))
  	{
***************
*** 300,308 ****
  			{
  				$comma = ($sql_insert != '')? ', ': '';
! 				$sql_insert .= "$comma($post_id, ".$row['word_id'].", ".$word_count[$row['word_text']]." ,0)";
  			}
  			
  			$sql = "INSERT INTO ".SEARCH_MATCH_TABLE."
! 				(post_id, word_id, word_count, title_match)
  				VALUES
  				$sql_insert
--- 298,306 ----
  			{
  				$comma = ($sql_insert != '')? ', ': '';
! 				$sql_insert .= "$comma($post_id, ".$row['word_id'].", 0)";
  			}
  			
  			$sql = "INSERT INTO ".SEARCH_MATCH_TABLE."
! 				(post_id, word_id, title_match)
  				VALUES
  				$sql_insert

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.4,1.5

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

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

Added Files:
	mssql_schema.sql 
Log Message:
Let's try another commit and see if its ascii ... I hate CVS at times

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.3,NONE

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

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

Removed Files:
	mssql_schema.sql 
Log Message:
And again for some reason the MSSQL schema commits as binary ... even though it was set as ascii (UNIX format)

--- mssql_schema.sql DELETED ---