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

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.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-serv31493/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
Fix a few things left over from old global announce stuff

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** lang_main.php	2001/10/16 15:48:24	1.9
--- lang_main.php	2001/10/16 16:23:33	1.10
***************
*** 285,288 ****
--- 285,289 ----
  $lang['Edit_Post'] = "Edit post";
  $lang['Post_Normal'] = "Normal";
+ $lang['Post_Global_Announcement'] = "Global Announcement";
  $lang['Post_Announcement'] = "Announcement";
  $lang['Post_Sticky'] = "Sticky";

[Phpbb-checkins] CVS: phpBB2/templates/subSilver posting_body.tpl,1.4,1.5

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

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

Modified Files:
	posting_body.tpl 
Log Message:
Slight mods to the usersearch function, moved to search.php

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** posting_body.tpl	2001/10/16 11:12:25	1.4
--- posting_body.tpl	2001/10/16 14:47:27	1.5
***************
*** 210,214 ****
  		<input type="text"  class="post" name="username" maxlength="50" size="20" tabindex="1" value="{USERNAME}" />
  		&nbsp; 
! 		<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('privmsg.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
  		</span></td>
  	</tr>
--- 210,214 ----
  		<input type="text"  class="post" name="username" maxlength="50" size="20" tabindex="1" value="{USERNAME}" />
  		&nbsp; 
! 		<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
  		</span></td>
  	</tr>

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.6,1.7

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

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

Modified Files:
	lang_main.php 
Log Message:
Topic review changes + updates

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** lang_main.php	2001/10/15 20:15:46	1.6
--- lang_main.php	2001/10/16 11:23:57	1.7
***************
*** 275,278 ****
--- 275,279 ----
  //
  $lang['Message_body'] = "Message body";
+ $lang['Topic_review'] = "Topic review";
  
  $lang['No_post_mode'] = "No post mode specified";
***************
*** 448,451 ****
--- 449,453 ----
  $lang['No_connection_URL'] = "A connection could not be made to the URL you gave";
  $lang['Incomplete_URL'] = "The URL you entered is incomplete";
+ $lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid";
  
  $lang['Always_smile'] = "Always enable Smilies";

[Phpbb-checkins] CVS: phpBB2/admin admin_announce.php,NONE,1.1

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

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

Added Files:
	admin_announce.php 
Log Message:
More changes for global announcements.  They no longer require the mode to be set (it works without), posting.php has been updated to reflect replies to announcements in ALL forums, and a admin page for announcements (global) has been added, although it can only link to pages with the true forum and auth permissions.  A more refined version will be coming soon

--- NEW FILE ---
<?php
/***************************************************************************
 *                            admin_announce.php
 *                            -------------------
 *   begin                : Saturday, Feb 13, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : su...@ph...
 *
 *   $Id: admin_announce.php,v 1.1 2001/10/16 13:10:09 dougk_ff7 Exp $
 *
 *
 ***************************************************************************/

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

define("IN_ADMIN", true);

if($setmodules == 1)
{
	$filename = basename(__FILE__);
	$module['General']['Announcements']   = $filename;

	return;
}

//
// Load default header
//
$phpbb_root_dir = "./../";
$no_page_header = TRUE;
require('pagestart.inc');

message_die(GENERAL_MESSAGE, "Announcements are not yet implemented.  Click <a href=\"" . append_sid("admin_forumauth." . $phpEx . "?f=-1&submit=submit") . "\">here</a> to view the global announcement permissions. Click <a href=\"" . append_sid("./../viewforum." . $phpEx . "?f=-1") . "\">here</a> to view the global announcments forum separately.", __LINE__, __FILE__, "", "");
?>

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.75,1.76 sessions.php,1.35,1.36

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

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

Modified Files:
	functions.php sessions.php 
Log Message:
Fixed some bugs with banning and some code that wasnt updated when we changed the theme/template system

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** functions.php	2001/10/15 20:15:46	1.75
--- functions.php	2001/10/16 10:35:24	1.76
***************
*** 1070,1074 ****
  		if( empty($theme) )
  		{
! 			$theme = setuptheme($board_config['default_theme']);
  		}
  
--- 1070,1074 ----
  		if( empty($theme) )
  		{
! 			$theme = setup_style($board_config['default_style']);
  		}
  

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** sessions.php	2001/10/15 01:35:32	1.35
--- sessions.php	2001/10/16 10:35:24	1.36
***************
*** 79,83 ****
  	if($ban_info['ban_ip'] || $ban_info['ban_userid'])
  	{
! 		include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '.'.$phpEx);
  		message_die(CRITICAL_MESSAGE, $lang['You_been_banned']);
  	}
--- 79,83 ----
  	if($ban_info['ban_ip'] || $ban_info['ban_userid'])
  	{
! 		include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx);
  		message_die(CRITICAL_MESSAGE, $lang['You_been_banned']);
  	}

[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.27,1.28 admin_userauth.php,1.22,1.23

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

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

Modified Files:
	admin_users.php admin_userauth.php 
Log Message:
Slight mods to the usersearch function, moved to search.php

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** admin_users.php	2001/10/16 10:49:11	1.27
--- admin_users.php	2001/10/16 14:43:03	1.28
***************
*** 21,26 ****
   ***************************************************************************/
  
- define("IN_ADMIN", true);
- 
  if($setmodules == 1)
  {
--- 21,24 ----
***************
*** 36,41 ****
  $phpbb_root_dir = "./../";
  require('pagestart.inc');
- include($phpbb_root_path . 'includes/post.'.$phpEx);
- include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
  
  if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
--- 34,37 ----
***************
*** 128,140 ****
  if( $mode == "searchuser" )
  {
- 	if( isset($HTTP_POST_VARS['search']) )
- 	{
- 		$username_list = username_search("admin_users.$phpEx", $HTTP_POST_VARS['search_author'], 1);
- 	}
- 	else
- 	{
- 		username_search("admin_users.$phpEx", "", 1);
- 	}
- 	
  	//
  	// Remove this later
--- 124,127 ----
***************
*** 142,146 ****
  	exit;
  }
! else if ( ($mode == "edit" && (isset($HTTP_POST_VARS['username']) && $mode != "save" ) || ( isset($HTTP_POST_VARS[POST_USERS_URL]) || isset($HTTP_GET_VARS[POST_USERS_URL]) ) ) )
  {
  	//
--- 129,133 ----
  	exit;
  }
! else if ( ($mode == "edit") || (isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL])) )
  {
  	//
***************
*** 236,240 ****
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = '<option value="0">No Special Rank</option>';
  
  	for($i = 0; $i < $rank_count; $i++)
--- 223,227 ----
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = "";
  
  	for($i = 0; $i < $rank_count; $i++)
***************
*** 242,246 ****
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		if ( $this_userdata['user_rank'] == $rank_id )
  		{
  			$rank_select_box .= "<option value=\"" . $rank_id . "\" selected=\"selected\">" . $rank . "</option>";
--- 229,233 ----
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		if ( $this_userdata['user_rank'] == $i + 1 )
  		{
  			$rank_select_box .= "<option value=\"" . $rank_id . "\" selected=\"selected\">" . $rank . "</option>";
***************
*** 409,415 ****
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
  	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : 0;
  	
! 	$user_rank_sql = ", user_rank = " . $user_rank;
  
  	if(isset($HTTP_POST_VARS['submit']))
--- 396,402 ----
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
  	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : "";
  	
! 	$user_rank_sql = (isset($user_rank)) ? ", user_rank = " . $user_rank : "";
  
  	if(isset($HTTP_POST_VARS['submit']))
***************
*** 547,551 ****
  				$template->assign_vars(array(
  					"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! 					"MESSAGE_TEXT" => "Error updating user profile<br>$sql")
  				);
  				$template->pparse("body");
--- 534,538 ----
  				$template->assign_vars(array(
  					"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! 					"MESSAGE_TEXT" => "Error updating user profile")
  				);
  				$template->pparse("body");
***************
*** 571,574 ****
--- 558,563 ----
  	// Default user selection box
  	//
+ 	// This should be altered on the final system
+ 	//
  	$sql = "SELECT user_id, username
  		FROM " . USERS_TABLE . "
***************
*** 596,600 ****
  		"L_FIND_USERNAME" => $lang['Find_username'],
  
! 		"U_SEARCH_USER" => append_sid("admin_users.$phpEx?mode=searchuser"), 
  
  		"S_USER_ACTION" => append_sid("admin_users.$phpEx"),
--- 585,589 ----
  		"L_FIND_USERNAME" => $lang['Find_username'],
  
! 		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 
  
  		"S_USER_ACTION" => append_sid("admin_users.$phpEx"),

Index: admin_userauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_userauth.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** admin_userauth.php	2001/10/15 20:49:39	1.22
--- admin_userauth.php	2001/10/16 14:43:03	1.23
***************
*** 965,969 ****
  		"L_FIND_USERNAME" => $lang['Find_username'],
  
! 		"U_SEARCH_USER" => append_sid("admin_users.$phpEx?mode=searchuser"), 
  
  		"S_USER_ACTION" => append_sid("admin_userauth.$phpEx"))
--- 965,969 ----
  		"L_FIND_USERNAME" => $lang['Find_username'],
  
! 		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 
  
  		"S_USER_ACTION" => append_sid("admin_userauth.$phpEx"))

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.7,1.8

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

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

Modified Files:
	lang_main.php 
Log Message:
Slight mods to the usersearch function, moved to search.php

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** lang_main.php	2001/10/16 11:23:57	1.7
--- lang_main.php	2001/10/16 14:43:03	1.8
***************
*** 623,628 ****
  $lang['matches'] = "Matches";
  $lang['Search_new'] = "View posts since last visit";
  
- 
  //
  // Auth related entries
--- 623,628 ----
  $lang['matches'] = "Matches";
  $lang['Search_new'] = "View posts since last visit";
+ $lang['Close_window'] = "Close Window";
  
  //
  // Auth related entries
***************
*** 1117,1119 ****
  // -------------------------------------------------
  
! ?>
--- 1117,1119 ----
  // -------------------------------------------------
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.76,1.77

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

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

Modified Files:
	functions.php 
Log Message:
Slight mods to the usersearch function, moved to search.php

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** functions.php	2001/10/16 10:35:24	1.76
--- functions.php	2001/10/16 14:43:03	1.77
***************
*** 898,911 ****
  // Username search
  //
! function username_search($calling_script, $search_match, $enable_window = 0, $default_list = "")
  {
! 	global $db, $template, $lang, $theme;
! 
! 	if( $enable_window )
! 	{
! 		$template->set_filenames(array(
! 			"minisearchbody" => "mini_search.tpl")
! 		);
! 	}
  
  	$author_list = "";
--- 898,905 ----
  // Username search
  //
! function username_search($search_match, $is_inline_review = 0, $default_list = "")
  {
! 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
! 	global $starttime;
  
  	$author_list = "";
***************
*** 936,995 ****
  		}
  
- 		if( $enable_window )
- 		{
- 			$template->assign_vars(array(
- 				"S_AUTHOR_OPTIONS" => $author_list)
- 			);
- 				
- 			$template->assign_block_vars("select_name", array());
- 		}
  	}
  
! 	if( $enable_window )
  	{
! 		// 
! 		// This theme var setup is very very temporary, completely
! 		// forgot about it, doh!
! 		//
  		$template->assign_vars(array(
- 			"T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
- 			"T_BODY_BACKGROUND" => $theme['body_background'],
- 			"T_BODY_BGCOLOR" => "#".$theme['body_bgcolor'],
- 			"T_BODY_TEXT" => "#".$theme['body_text'],
- 			"T_BODY_LINK" => "#".$theme['body_link'],
- 			"T_BODY_VLINK" => "#".$theme['body_vlink'],
- 			"T_BODY_ALINK" => "#".$theme['body_alink'],
- 			"T_BODY_HLINK" => "#".$theme['body_hlink'],
- 			"T_TR_COLOR1" => "#".$theme['tr_color1'],
- 			"T_TR_COLOR2" => "#".$theme['tr_color2'],
- 			"T_TR_COLOR3" => "#".$theme['tr_color3'],
- 			"T_TR_CLASS1" => $theme['tr_class1'],
- 			"T_TR_CLASS2" => $theme['tr_class2'],
- 			"T_TR_CLASS3" => $theme['tr_class3'],
- 			"T_TH_COLOR1" => "#".$theme['th_color1'],
- 			"T_TH_COLOR2" => "#".$theme['th_color2'],
- 			"T_TH_COLOR3" => "#".$theme['th_color3'],
- 			"T_TH_CLASS1" => $theme['th_class1'],
- 			"T_TH_CLASS2" => $theme['th_class2'],
- 			"T_TH_CLASS3" => $theme['th_class3'],
- 			"T_TD_COLOR1" => "#".$theme['td_color1'],
- 			"T_TD_COLOR2" => "#".$theme['td_color2'],
- 			"T_TD_COLOR3" => "#".$theme['td_color3'],
- 			"T_TD_CLASS1" => $theme['td_class1'],
- 			"T_TD_CLASS2" => $theme['td_class2'],
- 			"T_TD_CLASS3" => $theme['td_class3'],
- 			"T_FONTFACE1" => $theme['fontface1'],
- 			"T_FONTFACE2" => $theme['fontface2'],
- 			"T_FONTFACE3" => $theme['fontface3'],
- 			"T_FONTSIZE1" => $theme['fontsize1'],
- 			"T_FONTSIZE2" => $theme['fontsize2'],
- 			"T_FONTSIZE3" => $theme['fontsize3'],
- 			"T_FONTCOLOR1" => "#".$theme['fontcolor1'],
- 			"T_FONTCOLOR2" => "#".$theme['fontcolor2'],
- 			"T_FONTCOLOR3" => "#".$theme['fontcolor3'],
- 			"T_SPAN_CLASS1" => $theme['span_class1'],
- 			"T_SPAN_CLASS2" => $theme['span_class2'],
- 			"T_SPAN_CLASS3" => $theme['span_class3'],
- 			
  			"L_CLOSE_WINDOW" => $lang['Close_window'], 
  			"L_SEARCH_USERNAME" => $lang['Find_username'], 
--- 930,947 ----
  		}
  
  	}
  
! 	if( !$is_inline_review )
  	{
! 		$gen_simple_header = TRUE;
! 
! 		$page_title = $lang['Search'];
! 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! 
! 		$template->set_filenames(array(
! 			"search_user_body" => "search_username.tpl")
! 		);
! 
  		$template->assign_vars(array(
  			"L_CLOSE_WINDOW" => $lang['Close_window'], 
  			"L_SEARCH_USERNAME" => $lang['Find_username'], 
***************
*** 997,1005 ****
  			"L_SELECT" => $lang['Select'], 
  			"L_SEARCH" => $lang['Search'], 
  
! 			"S_SEARCH_ACTION" => append_sid("$calling_script?mode=searchuser"))
  		);
  
! 		$template->pparse("minisearchbody");
  	}
  
--- 949,971 ----
  			"L_SELECT" => $lang['Select'], 
  			"L_SEARCH" => $lang['Search'], 
+ 			"L_SEARCH_EXPLAIN" => $lang['Search_author_explain'], 
+ 			"L_CLOSE_WINDOW" => $lang['Close_window'], 
  
! 			"S_AUTHOR_OPTIONS" => $author_list, 
! 			"S_SEARCH_ACTION" => append_sid("search.$phpEx?mode=searchuser"))
  		);
+ 
+ 		//
+ 		// If we have results then dump them out and enable
+ 		// the appropriate switch block
+ 		//
+ 		if( !empty($author_list) )
+ 		{
+ 			$template->assign_block_vars("switch_select_name", array());
+ 		}
+ 
+ 		$template->pparse("search_user_body");
  
! 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  	}
  
***************
*** 1070,1074 ****
  		if( empty($theme) )
  		{
! 			$theme = setup_style($board_config['default_style']);
  		}
  
--- 1036,1040 ----
  		if( empty($theme) )
  		{
! 			$theme = setup_style($board_config['default_theme']);
  		}
  

[Phpbb-checkins] CVS: phpBB2/templates/subSilver search_username.tpl,NONE,1.1

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

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

Added Files:
	search_username.tpl 
Log Message:
Slight mods to the usersearch function, moved to search.php

--- NEW FILE ---

<script language="javascript" type="text/javascript">
<!--
function refresh_username(selected_username)
{
	opener.document.forms['post'].username.value = selected_username;
}
//-->
</script>

<form method="post" name="search" action="{S_SEARCH_ACTION}"><table width="100%" border="0" cellspacing="0" cellpadding="5" align="center" height="100%">
	<tr>
		<td><table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline">
			<tr>
				<th class="thHead">{L_SEARCH_USERNAME}</th>
			</tr>
			<tr>
				<td valign="top" class="row1"><span class="genmed"><br /><input type="text" name="search_author" value="{AUTHOR}" class="post" /> &nbsp;<input type="submit" name="search" value="{L_SEARCH}" class="liteoption" /></span><br /><span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
				<!-- BEGIN switch_select_name -->
				<span class="genmed">{L_UPDATE_USERNAME}<br /><select name="author_list">{S_AUTHOR_OPTIONS}</select> &nbsp;<input type="submit" class="liteoption" onClick="refresh_username(this.form.author_list.options[this.form.author_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br />
				<!-- END switch_select_name -->
				<br /><span class="gen"><a href="javascript:window.close();" class="gen">{L_CLOSE_WINDOW}</a></span></td>
			</tr>
		</table></td>
	</tr>
</table></form>

[Phpbb-checkins] CVS: phpBB2 search.php,1.21,1.22 privmsg.php,1.35,1.36

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

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

Modified Files:
	search.php privmsg.php 
Log Message:
Slight mods to the usersearch function, moved to search.php

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** search.php	2001/10/15 23:04:16	1.21
--- search.php	2001/10/16 14:43:03	1.22
***************
*** 400,404 ****
  // Begin core code
  //
! if( $query_keywords != "" || $query_author != "" || $search_id )
  {
  
--- 400,424 ----
  // Begin core code
  //
! if( $mode == "searchuser" )
! {
! 	//
! 	// This handles the simple windowed user search
! 	// functions called from various other scripts. If a 
! 	// script allows an 'inline' user search then this is
! 	// handled by the script itself, this is only for the
! 	// windowed version
! 	//
! 	if( isset($HTTP_POST_VARS['search']) )
! 	{
! 		username_search($HTTP_POST_VARS['search_author'], false);
! 	}
! 	else
! 	{
! 		username_search("", false);
! 	}
! 
! 	exit;
! }
! else if( $query_keywords != "" || $query_author != "" || $search_id )
  {
  

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** privmsg.php	2001/10/14 22:32:38	1.35
--- privmsg.php	2001/10/16 14:43:03	1.36
***************
*** 746,762 ****
  	if( $mode == "searchuser" )
  	{
- 		if( isset($HTTP_POST_VARS['search']) )
- 		{
- 			$username_list = username_search("privmsg.$phpEx", $HTTP_POST_VARS['search_author'], 1);
- 		}
- 		else
- 		{
- 			username_search("privmsg.$phpEx", "", 1);
- 		}
- 		
  		//
! 		// Remove this later
  		//
! 		exit;
  	}
  
--- 746,755 ----
  	if( $mode == "searchuser" )
  	{
  		//
! 		// This 'will' handle a simple user search 
! 		// performed from within the private message post
! 		// form
  		//
! 
  	}
  
***************
*** 1489,1492 ****
--- 1482,1486 ----
  		"S_POST_ACTION" => append_sid("privmsg.$phpEx"),
  			
+ 		"U_SEARCH_USER" => append_sid("search.$phpEx?mode=searchuser"), 
  		"U_VIEW_FORUM" => append_sid("privmsg.$phpEx"))
  	);

[Phpbb-checkins] CVS: phpBB2 posting.php,1.81,1.82 viewforum.php,1.92,1.93 viewtopic.php,1.121,1.122

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

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

Modified Files:
	posting.php viewforum.php viewtopic.php 
Log Message:
More changes for global announcements.  They no longer require the mode to be set (it works without), posting.php has been updated to reflect replies to announcements in ALL forums, and a admin page for announcements (global) has been added, although it can only link to pages with the true forum and auth permissions.  A more refined version will be coming soon

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** posting.php	2001/10/16 11:12:27	1.81
--- posting.php	2001/10/16 13:09:23	1.82
***************
*** 926,930 ****
  
  				if($db->sql_query($sql))
! 				{
  					$sql = "UPDATE " . FORUMS_TABLE . "
  						SET forum_last_post_id = $new_post_id, forum_posts = forum_posts + 1";
--- 926,930 ----
  
  				if($db->sql_query($sql))
! 				{				
  					$sql = "UPDATE " . FORUMS_TABLE . "
  						SET forum_last_post_id = $new_post_id, forum_posts = forum_posts + 1";
***************
*** 933,938 ****
  						$sql .= ", forum_topics = forum_topics + 1";
  					}
  					$sql .= " WHERE forum_id = $forum_id";
! 
  					if($db->sql_query($sql))
  					{
--- 933,953 ----
  						$sql .= ", forum_topics = forum_topics + 1";
  					}
+ 					
+ 					$sqlquery = "SELECT topic_type FROM " . TOPICS_TABLE . "
+ 						WHERE topic_id = $topic_id";
+ 					if($result = $db->sql_query($sqlquery))
+ 					{
+ 						$topic_row = $db->sql_fetchrow($result);
+ 						$topic_type = intval($topic_row['topic_type']);
+ 					}
+ 					else
+ 					{
+ 						message_die(GENERAL_ERROR, "Could not query topics table.", __LINE__, __FILE__, $sqlquery, "");
+ 					}
+ 					if($topic_type != POST_ANNOUNCE)
+ 					{		
  					$sql .= " WHERE forum_id = $forum_id";
! 					}
! 					
  					if($db->sql_query($sql))
  					{

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** viewforum.php	2001/10/16 01:00:47	1.92
--- viewforum.php	2001/10/16 13:09:45	1.93
***************
*** 436,451 ****
  		{
  			$topic_type = $lang['Topic_Announcement'] . " ";
- 			$is_announcement = TRUE;
  		}
  		else if($topic_type == POST_STICKY)
  		{
  			$topic_type = $lang['Topic_Sticky'] . " ";
- 			$is_announcement = FALSE;
  		}
  		else
  		{
! 			$topic_type = "";
! 			$is_announcement = FALSE;
! 		}
  
  		if( $topic_rowset[$i]['topic_vote'] )
--- 436,447 ----
  		{
  			$topic_type = $lang['Topic_Announcement'] . " ";
  		}
  		else if($topic_type == POST_STICKY)
  		{
  			$topic_type = $lang['Topic_Sticky'] . " ";
  		}
  		else
  		{
! 			$topic_type = "";		}
  
  		if( $topic_rowset[$i]['topic_vote'] )
***************
*** 556,568 ****
  				}
  			}
- 		}
- 		if($is_announcement == TRUE)
- 		{
- 			$view_topic_url = append_sid("viewtopic.$phpEx?mode=viewannounce&". POST_FORUM_URL . "=" . $forum_id . "&" . POST_TOPIC_URL . "=$topic_id");
- 		}
- 		else
- 		{
- 			$view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
  		}
  
  		$topic_poster = $topic_rowset[$i]['username'];
--- 552,558 ----
  				}
  			}
  		}
+ 		
+ 		$view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
  
  		$topic_poster = $topic_rowset[$i]['username'];
***************
*** 573,584 ****
  		$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
  		$last_post .= ( $topic_rowset[$i]['id2'] == ANONYMOUS ) ? $topic_rowset[$i]['user2'] . " " : "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $topic_rowset[$i]['id2']) . "\">" . $topic_rowset[$i]['user2'] . "</a> ";
! 		if($is_announcement == TRUE)
! 		{
! 			$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?mode=viewannounce&" . POST_FORUM_URL . "=" . $forum_id . "&" . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] .  "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
! 		}
! 		else
! 		{
! 			$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
! 		}
  
  		$views = $topic_rowset[$i]['topic_views'];
--- 563,567 ----
  		$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
  		$last_post .= ( $topic_rowset[$i]['id2'] == ANONYMOUS ) ? $topic_rowset[$i]['user2'] . " " : "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $topic_rowset[$i]['id2']) . "\">" . $topic_rowset[$i]['user2'] . "</a> ";
! 		$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
  
  		$views = $topic_rowset[$i]['topic_views'];

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -r1.121 -r1.122
*** viewtopic.php	2001/10/16 01:00:47	1.121
--- viewtopic.php	2001/10/16 13:09:56	1.122
***************
*** 148,169 ****
  $order_sql = (!isset($post_id)) ? "" : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
  
! if( $mode=="viewannounce" )
! {
! 	$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
! 		FROM $join_sql_table " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
! 		WHERE $join_sql AND
! 			t.topic_type = " . POST_ANNOUNCE . " AND
! 			(f.forum_id = " . $forum_id . "
! 			OR f.forum_id = -1)
! 			$order_sql";
! }
! else
! {
! 	$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
! 		FROM $join_sql_table " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
! 		WHERE $join_sql
! 			AND f.forum_id = t.forum_id
! 			$order_sql";
! }
  
  if(!$result = $db->sql_query($sql))
--- 148,156 ----
  $order_sql = (!isset($post_id)) ? "" : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
  
! $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
! 	FROM $join_sql_table " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
! 	WHERE $join_sql
! 		AND f.forum_id = t.forum_id
! 		$order_sql";
  
  if(!$result = $db->sql_query($sql))

[Phpbb-checkins] CVS: phpBB2/templates/subSilver mini_search.tpl,1.1,NONE

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

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

Removed Files:
	mini_search.tpl 
Log Message:
Name change to search_username

--- mini_search.tpl DELETED ---

[Phpbb-checkins] CVS: phpBB2/admin admin_user_ban.php,1.10,1.11

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

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

Modified Files:
	admin_user_ban.php 
Log Message:
Fixed some bugs with banning and some code that wasnt updated when we changed the theme/template system

Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** admin_user_ban.php	2001/10/14 15:46:53	1.10
--- admin_user_ban.php	2001/10/16 10:35:24	1.11
***************
*** 360,364 ****
  		$user_list = $db->sql_fetchrowset($u_result);
  
! 		$select_userlist = "";
  		for($i = 0; $i < count($user_list); $i++)
  		{
--- 360,364 ----
  		$user_list = $db->sql_fetchrowset($u_result);
  
! 		$select_userlist = "<option value=\"0\">Select a Username</option>";
  		for($i = 0; $i < count($user_list); $i++)
  		{

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

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

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

Modified Files:
	admin_users.php 
Log Message:
Oops..broke the click on user goto modify page on admin index functionality with my last commit, fixed it


Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** admin_users.php	2001/10/16 09:57:43	1.26
--- admin_users.php	2001/10/16 10:49:11	1.27
***************
*** 142,146 ****
  	exit;
  }
! else if ( $mode == "edit" && (isset($HTTP_POST_VARS['username']) && $mode != "save" ))
  {
  	//
--- 142,146 ----
  	exit;
  }
! else if ( ($mode == "edit" && (isset($HTTP_POST_VARS['username']) && $mode != "save" ) || ( isset($HTTP_POST_VARS[POST_USERS_URL]) || isset($HTTP_GET_VARS[POST_USERS_URL]) ) ) )
  {
  	//

[Phpbb-checkins] CVS: phpBB2/templates/subSilver posting_topic_review.tpl,NONE,1.1 simple_footer.tpl,NONE,1.1 simple_header.tpl,NONE,1.1 posting_body.tpl,1.3,1.4

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

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

Modified Files:
	posting_body.tpl 
Added Files:
	posting_topic_review.tpl simple_footer.tpl simple_header.tpl 
Log Message:
Topic review changes + updates

--- NEW FILE ---

<!-- BEGIN switch_inline_mode -->
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
	<tr> 
	  <th class="thTop" height="25"><b>{L_TOPIC_REVIEW}</b></th>
	</tr>
	<tr>
		<td><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}">
<!-- END switch_inline_mode -->

<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
	<tr>
		<th class="thLeft" width="22%" height="26">{L_AUTHOR}</th>
		<th class="thRight">{L_MESSAGE}</th>
	</tr>
	<!-- BEGIN postrow -->
	<tr>
		<td width="22%" align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span></td>
		<td class="{postrow.ROW_CLASS}" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
			<tr> 
				<td width="100%">{postrow.MINI_POST_IMG}<span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen">&nbsp;</span>&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
			</tr>
			<tr> 
				<td colspan="2"><hr /></td>
			</tr>
			<tr> 
				<td colspan="2"><span class="postbody">{postrow.MESSAGE}</span></td>
			</tr>
		</table></td>
	</tr>
	<tr> 
		<td colspan="2" height="1" class="spaceRow"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td>
	</tr>
	 <!-- END postrow -->
</table>

<!-- BEGIN switch_inline_mode -->
		</iframe></td>
	</tr>
</table>
<!-- END switch_inline_mode -->

--- NEW FILE ---

  <!--

	Please note that the following copyright notice
	MUST be displayed on each and every page output
	by phpBB. You may alter the font, colour etc. but
	you CANNOT remove it, nor change it so that it be,
	to all intents and purposes, invisible. You may ADD
	your own notice to it should you have altered the
	code but you may not replace it. The hyperlink must
	also remain intact. These conditions are part of the
	licence this software is released under. See the
	LICENCE and README files for more information.

	The phpBB Group : 2001

// -->
<div align="center"> <span class="copyright"><br />Powered by phpBB {PHPBB_VERSION} &copy; 2001 <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB 
  Group</a></span></div>
	</td>
  </tr>
</table>
&nbsp;
</body>
</html>

--- NEW FILE ---
<!-- DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" -->
<!-- <html xmlns="http://www.w3.org/1999/xhtml"> -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"  />
<meta http-equiv="Content-Style-Type" content="text/css" />
<style type="text/css">
<!--
-->
</style>
{META}
<title>{SITENAME} :: {PAGE_TITLE}</title>
<style type="text/css">
<!--
/* subSilver Theme for phpBB2
 * Created by subBlue design
 * http://www.subBlue.com
 */

body { 	background-color:{T_BODY_BGCOLOR};
		scrollbar-face-color: #C8D1D7; scrollbar-highlight-color: #EAF0F7;
		scrollbar-shadow-color: #95AFC4; scrollbar-3dlight-color: #D6DDE2;
		scrollbar-arrow-color:  #006699; scrollbar-track-color: #EFEFEF;
		scrollbar-darkshadow-color: #7294AF;
}

font	{ font-family: Verdana, Arial, Helvetica, sans-serif }
td		{ font-family: Verdana, Arial, Helvetica, sans-serif }
th		{ font-family: Verdana, Arial, Helvetica, sans-serif }
P		{ font-family: Verdana, Arial, Helvetica, sans-serif }
hr		{ height: 1px; color:{T_TR_COLOR3} }


/* Forum colours */
.bodyline	{ background-color:#FFFFFF; border: {T_TD_COLOR1}; border-style: solid; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px }
.forumline	{ background-color:#FFFFFF; border: 2px #006699 solid }


/* Main table cell colours and backgrounds */
TH			{ background-color: {T_TH_COLOR3}; height: 25px; font-size: 11px; line-height : 100%; font-weight: bold; color: #FFB163; background-image: url(templates/subSilver/images/cellpic3.gif) }
TD.tablebg	{ background-color: #000000 }
TD.cat		{ background-color: {T_TH_COLOR1}; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif) }
TD.row1		{ background-color: {T_TR_COLOR1} }
TD.row2		{ background-color: {T_TR_COLOR2} }
TD.row3		{ background-color: {T_TR_COLOR3} }
TD.spaceRow { background-color: {T_TR_COLOR3}; border: #FFFFFF; border-style: solid; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
TD.rowpic	{ background-color: #FFFFFF; background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }
td.icqback	{ background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat }


/* Setting additional nice borders for the main table cells */
TD.catHead,TD.catSides,TD.catLeft,TD.catRight,TD.catBottom { background-color:{T_TH_COLOR1}; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif); border: #FFFFFF; border-style: solid; }	

TD.catHead	 { height: 29px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	
TD.catSides  { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
TD.catLeft	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px }	
TD.catRight	 { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
TD.catBottom { height: 29px; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px }	

TH.thHead,TH.thSides,TH.thTop,TH.thLeft,TH.thRight,TH.thBottom,TH.thCornerL,TH.thCornerR { border: #FFFFFF; border-style: solid; }

TH.thHead	 { font-weight : bold; font-size: 12px; height: 25px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	
TH.thSides	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
TH.thTop	 { border-left-width: 0px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px }	
TH.thLeft	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px }	
TH.thRight	 { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
TH.thBottom  { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px }	
TH.thCornerL { border-left-width: 1px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px }	
TH.thCornerR { border-left-width: 0px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	

TD.row3Right	 { background-color: {T_TR_COLOR3}; border: #FFFFFF; border-style: solid;  border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }

/* The largest text used in the index page title and toptic title etc. */
.maintitle	{ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000;}


/* General normal text */
.gen		{ font-size : 12px; color : #000000; }
a.gen		{ color: #006699; text-decoration: none; }
a.gen:hover	{ color: #C23030; text-decoration: underline; }

/* General medium text */
.genmed		{ font-size : 11px; color : #000000; }
a.genmed		{ text-decoration: none; color : #006699; }
a.genmed:hover	{ text-decoration: underline; color : #C23030; }


/* General small */
.gensmall		{ font-size : 10px; color : #000000; }
a.gensmall		{ color: #006699; text-decoration: none; }
a.gensmall:hover	{ color: #C23030; text-decoration: underline; }


/* The register, login, search etc links at the top of the page */
.mainmenu			{ font-size : 11px; text-decoration : none; color : #000000 }
a.mainmenu			{ text-decoration: none; color : #006699;  }
a.mainmenu:hover	{ text-decoration: underline; color : #C23030; }


/* Forum categories */
.cattitle			{ font-size : 12px; line-height : 100%; letter-spacing: 1px; font-weight : bold; text-decoration : none; color : #004c75 }
a.cattitle			{ text-decoration: none; color : #004c75; }
a.cattitle:hover	{ text-decoration: underline; }


/* Forum title: Text and link to the forums used in: index.php */
.forumlink			{ font-size : 12px; font-weight : bold; text-decoration : none; color : #136C99; }
a.forumlink			{ text-decoration: none; color : #136C99; }
a.forumlink:hover	{ text-decoration: underline; color : #D68000; }


/* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */
.nav			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000;}
a.nav			{ text-decoration: none; color : #006699; }
a.nav:hover		{ text-decoration: underline; }


/* titles for the topics: can specify viewed link colour too */
.topictitle			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000; }
a.topictitle		{ text-decoration: none; color : #006699; }
a.topictitle:hover	{ text-decoration: underline; color : #D68000; }
a.topictitle:visited	{ text-decoration: none; color : #5584AA; }


/* Name of poster in viewmsg.php and viewtopic.php and other places */
.name			{ font-size : 11px; text-decoration : none; color : #000000;}
a.name			{ color: #006699; text-decoration: none;}
a.name:hover	{ color: #C23030; text-decoration: underline;}


/* Location, number of posts, post date etc */
.postdetails		{ font-size : 10px; color : #000000; }
a.postdetails		{ color: #006699; text-decoration: none; }
a.postdetails:hover	{ color: #C23030; text-decoration: underline; }


/* The content of the posts (body of text) */
.postbody { font-size : 12px; line-height: 150%}

a.postlink	{ text-decoration: none; color : {T_BODY_LINK} }
a.postlink:hover { text-decoration: underline; color : #C23030 }


/* Quote Code (currently not used) */
.code	{ font-family: Courier, Courier New; font-size: 11px; color: #006600;
		  background-color: #FAFAFA; border: {T_TR_COLOR3}; border-style: solid;
		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
		}
.quote	{ font-family: Verdana, Arial; font-size: 11px; color: #444444; line-height: 125%;
		  background-color: #FAFAFA; border: {T_TR_COLOR3}; border-style: solid;
		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
		}
.signature	{ font-size : 11px; text-decoration : none; line-height : 150%; color : #333366; }
.editedby	{ font-size : 10px; line-height : 100%; color : #333333; }


/* Form elements */
input,textarea, select {
color : #000000; 
font-family : Verdana, Arial, Helvetica, sans-serif; 
font-size : 11px; 
font-weight : normal;
border-color : #000000; 
}

/* The text input fields background colour */
input.post, textarea.post, select {
background-color : #FFFFFF; 
}

input { text-indent : 2px; }

/* The buttons used for bbCode styling in message post */
input.button {
background-color : {T_TR_COLOR1}; 
color : #000000; 
font-family : Verdana, Arial, Helvetica, sans-serif; 
font-size : 11px; 
}


/* The main submit button option */
input.mainoption {
background-color : #FAFAFA;
font-weight : bold;
}

/* None bold submit button */
input.liteoption {
background-color : #FAFAFA;
font-weight : normal;
}

/* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */
@import url("templates/subSilver/formIE.css"); 

.helpline { background-color: {T_TR_COLOR2}; border-style: none; }


/* Copyright and bottom info */
.copyright		{ font-family: Verdana, Arial, Helvetica, sans-serif; color: #555555; font-size: 10px; letter-spacing: -1px;}
a.copyright		{ color: #333333; text-decoration: none;}
a.copyright:hover { color: #000000; text-decoration: underline;}
-->
</style>
</head>

<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}">
<span class="gen"><a name="top"></a></span><table width="100%" border="0" cellspacing="0" cellpadding="10" align="center"> 
<tr> 
	<td class="bodyline"> 

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** posting_body.tpl	2001/10/02 00:12:45	1.3
--- posting_body.tpl	2001/10/16 11:12:25	1.4
***************
*** 2,10 ****
  <!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
  <!-- Remember to uncomment the spellchecker button near the end of this template -->
! <!-- <script type="text/javascript" language="javascript" src=spellcheck/spch.js></script> -->
  <!-- End spellchecker option -->
  
- 
- 
  <script language="JavaScript" type="text/javascript">
  <!--
--- 2,8 ----
  <!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
  <!-- Remember to uncomment the spellchecker button near the end of this template -->
! <!-- script type="text/javascript" language="javascript" src=spellcheck/spch.js></script -->
  <!-- End spellchecker option -->
  
  <script language="JavaScript" type="text/javascript">
  <!--
***************
*** 422,426 ****
  		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
  		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
! 		<!-- <input type="button" tabindex="4" class="liteoption" name="spellcheck" value="Spell Check" onClick= "doSpell ('uk', document.post.message, 'http://www.yourhost.com/path_to_phpbb2/spellcheck/sproxy.php', true);" /> -->
  		<!-- End spellchecker option -->
  		&nbsp; 
--- 420,424 ----
  		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
  		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
! 		<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="Spell Check" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->
  		<!-- End spellchecker option -->
  		&nbsp; 
***************
*** 442,443 ****
--- 440,443 ----
    </tr>
  </table>
+ 
+ {TOPIC_REVIEW_BOX}

[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.25,1.26

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

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

Modified Files:
	admin_users.php 
Log Message:
Fixed some minor issues in user admin

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** admin_users.php	2001/10/15 02:58:50	1.25
--- admin_users.php	2001/10/16 09:57:43	1.26
***************
*** 36,39 ****
--- 36,41 ----
  $phpbb_root_dir = "./../";
  require('pagestart.inc');
+ include($phpbb_root_path . 'includes/post.'.$phpEx);
+ include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
  
  if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
***************
*** 140,144 ****
  	exit;
  }
! else if ( ($mode == "edit") || (isset($HTTP_POST_VARS['username_select']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL])) )
  {
  	//
--- 142,146 ----
  	exit;
  }
! else if ( $mode == "edit" && (isset($HTTP_POST_VARS['username']) && $mode != "save" ))
  {
  	//
***************
*** 152,156 ****
  	else
  	{
! 		$this_userdata = get_userdata($HTTP_POST_VARS['username_select']);
  	}
  
--- 154,158 ----
  	else
  	{
! 		$this_userdata = get_userdata($HTTP_POST_VARS['username']);
  	}
  
***************
*** 234,238 ****
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = "";
  
  	for($i = 0; $i < $rank_count; $i++)
--- 236,240 ----
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = '<option value="0">No Special Rank</option>';
  
  	for($i = 0; $i < $rank_count; $i++)
***************
*** 240,244 ****
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		if ( $this_userdata['user_rank'] == $i + 1 )
  		{
  			$rank_select_box .= "<option value=\"" . $rank_id . "\" selected=\"selected\">" . $rank . "</option>";
--- 242,246 ----
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		if ( $this_userdata['user_rank'] == $rank_id )
  		{
  			$rank_select_box .= "<option value=\"" . $rank_id . "\" selected=\"selected\">" . $rank . "</option>";
***************
*** 407,413 ****
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
  	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : "";
  	
! 	$user_rank_sql = (isset($user_rank)) ? ", user_rank = " . $user_rank : "";
  
  	if(isset($HTTP_POST_VARS['submit']))
--- 409,415 ----
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
  	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : 0;
  	
! 	$user_rank_sql = ", user_rank = " . $user_rank;
  
  	if(isset($HTTP_POST_VARS['submit']))
***************
*** 545,549 ****
  				$template->assign_vars(array(
  					"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! 					"MESSAGE_TEXT" => "Error updating user profile")
  				);
  				$template->pparse("body");
--- 547,551 ----
  				$template->assign_vars(array(
  					"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! 					"MESSAGE_TEXT" => "Error updating user profile<br>$sql")
  				);
  				$template->pparse("body");
***************
*** 568,573 ****
  	//
  	// Default user selection box
- 	//
- 	// This should be altered on the final system
  	//
  	$sql = "SELECT user_id, username
--- 570,573 ----

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.54,1.55 page_tail.php,1.20,1.21

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

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

Modified Files:
	page_header.php page_tail.php 
Log Message:
Topic review changes + updates

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** page_header.php	2001/10/14 18:20:40	1.54
--- page_header.php	2001/10/16 11:12:32	1.55
***************
*** 57,63 ****
  // Parse and show the overall header.
  //
! $template->set_filenames(array(
! 	"overall_header" => "overall_header.tpl")
! );
  
  //
--- 57,72 ----
  // Parse and show the overall header.
  //
! if( empty($gen_simple_header) )
! {
! 	$template->set_filenames(array(
! 		"overall_header" => "overall_header.tpl")
! 	);
! }
! else
! {
! 	$template->set_filenames(array(
! 		"overall_header" => "simple_header.tpl")
! 	);
! }
  
  //

Index: page_tail.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_tail.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** page_tail.php	2001/08/30 22:20:23	1.20
--- page_tail.php	2001/10/16 11:12:32	1.21
***************
*** 34,40 ****
  $current_time = time();
  
! $template->set_filenames(array(
! 	"overall_footer" => "overall_footer.tpl")
! );
  
  $template->assign_vars(array(
--- 34,49 ----
  $current_time = time();
  
! if( empty($gen_simple_header) )
! {
! 	$template->set_filenames(array(
! 		"overall_footer" => "overall_footer.tpl")
! 	);
! }
! else
! {
! 	$template->set_filenames(array(
! 		"overall_footer" => "simple_footer.tpl")
! 	);
! }
  
  $template->assign_vars(array(

[Phpbb-checkins] CVS: phpBB2 common.php,1.63,1.64 posting.php,1.80,1.81

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

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

Modified Files:
	common.php posting.php 
Log Message:
Topic review changes + updates

Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** common.php	2001/10/09 23:28:31	1.63
--- common.php	2001/10/16 11:12:27	1.64
***************
*** 102,105 ****
--- 102,106 ----
  $images = Array();
  $lang = Array();
+ $gen_simple_header = FALSE;
  
  @include($phpbb_root_path . 'config.'.$phpEx);

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** posting.php	2001/10/14 22:32:38	1.80
--- posting.php	2001/10/16 11:12:27	1.81
***************
*** 27,30 ****
--- 27,222 ----
  include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
  
+ // -----------------------
+ // Page specific functions
+ //
+ function topic_review($topic_id, $is_inline_review)
+ {
+ 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
+ 	global $userdata, $session_length, $user_ip;
+ 	global $orig_word, $replacement_word;
+ 	global $starttime;
+ 
+ 	if( !$is_inline_review )
+ 	{
+ 		if( !isset($topic_id) )
+ 		{
+ 			message_die(GENERAL_MESSAGE, 'Topic_not_exist');
+ 		}
+ 
+ 		//
+ 		// Get topic info ...
+ 		//
+ 		$sql = "SELECT f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments 
+ 			FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f 
+ 			WHERE t.topic_id = $topic_id
+ 				AND f.forum_id = t.forum_id";
+ 		if(!$result = $db->sql_query($sql))
+ 		{
+ 			message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
+ 		}
+ 
+ 		if( !$total_rows = $db->sql_numrows($result) )
+ 		{
+ 			message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
+ 		}
+ 		$forum_row = $db->sql_fetchrow($result);
+ 
+ 		$forum_id = $forum_row['forum_id'];
+ 		
+ 		//
+ 		// Start session management
+ 		//
+ 		$userdata = session_pagestart($user_ip, $forum_id, $session_length);
+ 		init_userprefs($userdata);
+ 		//
+ 		// End session management
+ 		//
+ 
+ 		$is_auth = array();
+ 		$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row);
+ 
+ 	}
+ 
+ 	//
+ 	// 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
+ 			AND p.poster_id = u.user_id
+ 			AND p.post_id = pt.post_id
+ 		ORDER BY p.post_time DESC
+ 		LIMIT " . $board_config['posts_per_page'];
+ 	if(!$result = $db->sql_query($sql))
+ 	{
+ 		message_die(GENERAL_ERROR, "Couldn't obtain post/user information.", "", __LINE__, __FILE__, $sql);
+ 	}
+ 
+ 	if(!$total_posts = $db->sql_numrows($result))
+ 	{
+ 		message_die(GENERAL_ERROR, "There don't appear to be any posts for this topic.", "", __LINE__, __FILE__, $sql);
+ 	}
+ 	$postrow = $db->sql_fetchrowset($result);
+ 
+ 	//
+ 	// Define censored word matches
+ 	//
+ 	if( empty($orig_word) && empty($replacement_word) )
+ 	{
+ 		$orig_word = array();
+ 		$replacement_word = array();
+ 		obtain_word_list($orig_word, $replacement_word);
+ 	}
+ 
+ 	//
+ 	// Dump out the page header and load viewtopic body template
+ 	//
+ 	if( !$is_inline_review )
+ 	{
+ 		$gen_simple_header = TRUE;
+ 
+ 		$page_title = $lang['Review_topic'] ." - $topic_title";
+ 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ 
+ 		$template->set_filenames(array(
+ 			"reviewbody" => "posting_topic_review.tpl")
+ 		);
+ 	}
+ 
+ 	//
+ 	// Okay, let's do the loop, yeah come on baby let's do the loop
+ 	// and it goes like this ...
+ 	//
+ 	for($i = 0; $i < $total_posts; $i++)
+ 	{
+ 		$poster_id = $postrow[$i]['user_id'];
+ 		$poster = $postrow[$i]['username'];
+ 
+ 		$post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']);
+ 
+ 		$mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" />';
+ 
+ 		//
+ 		// Handle anon users posting with usernames
+ 		//
+ 		if( $poster_id == ANONYMOUS && $postrow[$i]['post_username'] != '' )
+ 		{
+ 			$poster = $postrow[$i]['post_username'];
+ 			$poster_rank = $lang['Guest'];
+ 		}
+ 
+ 		$post_subject = ( $postrow[$i]['post_subject'] != "" ) ? $postrow[$i]['post_subject'] : "";
+ 
+ 		$message = $postrow[$i]['post_text'];
+ 		$bbcode_uid = $postrow[$i]['bbcode_uid'];
+ 
+ 		//
+ 		// If the board has HTML off but the post has HTML
+ 		// on then we process it, else leave it alone
+ 		//
+ 		if( !$board_config['allow_html'] )
+ 		{
+ 			if( $postrow[$i]['enable_html'] )
+ 			{
+ 				$message = preg_replace("#(<)([\/]?.*?)(>)#is", "&lt;\\2&gt;", $message);
+ 			}
+ 		}
+ 
+ 		if( $bbcode_uid != "" )
+ 		{
+ 			$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
+ 		}
+ 
+ 		$message = make_clickable($message);
+ 
+ 		if( count($orig_word) )
+ 		{
+ 			$post_subject = preg_replace($orig_word, $replacement_word, $post_subject);
+ 			$message = preg_replace($orig_word, $replacement_word, $message);
+ 		}
+ 
+ 		if( $board_config['allow_smilies'] && $postrow[$i]['enable_smilies'] )
+ 		{
+ 			$message = smilies_pass($message);
+ 		}
+ 
+ 		$message = str_replace("\n", "<br />", $message);
+ 
+ 		//
+ 		// Again this will be handled by the templating
+ 		// code at some point
+ 		//
+ 		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
+ 		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
+ 
+ 		$template->assign_block_vars("postrow", array(
+ 			"ROW_COLOR" => "#" . $row_color, 
+ 			"ROW_CLASS" => $row_class, 
+ 
+ 			"MINI_POST_IMG" => $mini_post_img, 
+ 			"POSTER_NAME" => $poster, 
+ 			"POST_DATE" => $post_date, 
+ 			"POST_SUBJECT" => $post_subject, 
+ 			"MESSAGE" => $message)
+ 		);
+ 	}
+ 
+ 	$template->assign_vars(array(
+ 		"L_POSTED" => $lang['Posted'],
+ 		"L_POST_SUBJECT" => $lang['Post_subject'], 
+ 		"L_TOPIC_REVIEW" => $lang['Topic_review'])
+ 	);
+ 
+ 	if( !$is_inline_review )
+ 	{
+ 		$template->pparse("reviewbody");
+ 
+ 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+ 	}
+ }
+ //
+ // End page specific functions
+ // ---------------------------
+ 
  // -------------------------------------------
  // Do some initial checks, set basic variables,
***************
*** 129,152 ****
  
  //
! // Set topic type
  //
! if( isset($HTTP_POST_VARS['topictype']) )
! {
! 	if($HTTP_POST_VARS['topictype']  == "announce")
! 	{
! 		$topic_type = POST_ANNOUNCE;
! 	}
! 	else if($HTTP_POST_VARS['topictype'] == "sticky")
! 	{
! 		$topic_type = POST_STICKY;
! 	}
! 	else
! 	{
! 		$topic_type = POST_NORMAL;
! 	}
! }
! else
  {
! 	$topic_type = POST_NORMAL;
  }
  
--- 321,331 ----
  
  //
! // If the mode is set to topic review then output
! // that review ...
  //
! if( $mode == "topicreview" )
  {
! 	topic_review($topic_id, false);
! 	exit;
  }
  
***************
*** 343,346 ****
--- 522,548 ----
  
  //
+ // Set topic type
+ //
+ if( isset($HTTP_POST_VARS['topictype']) )
+ {
+ 	if($HTTP_POST_VARS['topictype']  == "announce")
+ 	{
+ 		$topic_type = POST_ANNOUNCE;
+ 	}
+ 	else if($HTTP_POST_VARS['topictype'] == "sticky")
+ 	{
+ 		$topic_type = POST_STICKY;
+ 	}
+ 	else
+ 	{
+ 		$topic_type = POST_NORMAL;
+ 	}
+ }
+ else
+ {
+ 	$topic_type = POST_NORMAL;
+ }
+ 
+ //
  // Auth checks
  //
***************
*** 387,390 ****
--- 589,597 ----
  		break;
  
+ 	case 'topicreview':
+ 		$is_auth_type = "auth_read";
+ 		$auth_string = $lang['can_read'];
+ 		break;
+ 
  	default:
  		message_die(GENERAL_MESSAGE, $lang['No_post_mode']);
***************
*** 411,414 ****
--- 618,622 ----
  				break;
  			case 'reply':
+ 			case 'topicreview':
  				$redirect = "mode=reply&" . POST_TOPIC_URL . "=$topic_id";
  				break;
***************
*** 1832,1836 ****
  	"body" => "posting_body.tpl", 
  	"pollbody" => "posting_poll_body.tpl", 
! 	"jumpbox" => "jumpbox.tpl")
  );
  
--- 2040,2045 ----
  	"body" => "posting_body.tpl", 
  	"pollbody" => "posting_poll_body.tpl", 
! 	"jumpbox" => "jumpbox.tpl", 
! 	"reviewbody" => "posting_topic_review.tpl")
  );
  
***************
*** 2113,2117 ****
  	"L_DELETE_POST" => $lang['Delete_post'],
  
! 	"U_TOPIC_REVIEW" => ( $mode == "reply" ) ? append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc") : "", 
  
  	"S_HTML_CHECKED" => (!$html_on) ? "checked=\"checked\"" : "", 
--- 2322,2327 ----
  	"L_DELETE_POST" => $lang['Delete_post'],
  
! 	"U_VIEWTOPIC" => ( $mode == "reply" ) ? append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc") : "", 
! 	"U_REVIEW_TOPIC" => ( $mode == "reply" ) ? append_sid("posting.$phpEx?mode=topicreview&amp;" . POST_TOPIC_URL . "=$topic_id") : "", 
  
  	"S_HTML_CHECKED" => (!$html_on) ? "checked=\"checked\"" : "", 
***************
*** 2166,2169 ****
--- 2376,2393 ----
  	$template->assign_var_from_handle("POLLBOX", "pollbody");
  
+ }
+ 
+ //
+ // Topic review
+ //
+ if( $mode == "reply" )
+ {
+ 	topic_review($topic_id, true);
+ 
+ 	//
+ 	// Enable inline mode ...
+ 	//
+ 	$template->assign_block_vars("switch_inline_mode", array());
+ 	$template->assign_var_from_handle("TOPIC_REVIEW_BOX", "reviewbody");
  }
  

[Phpbb-checkins] CVS: phpBB2 config.php,1.41,1.42

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

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

Modified Files:
	config.php 
Log Message:
*@#%^&, I did it again. Oh well.

Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** config.php	2001/10/16 01:00:47	1.41
--- config.php	2001/10/16 01:01:56	1.42
***************
*** 1,19 ****
- <?php
- 
- //
- // phpBB 2.x auto-generated config file
- // Do not change anything in this file!
- //
- 
- $dbms = "mysql";
- 
- $dbhost = "127.0.0.1";
- $dbname = "devphpbb2";
- $dbuser = "dougk";
- $dbpasswd = "dougk";
- 
- $table_prefix = "phpbb_";
- 
- define('PHPBB_INSTALLED', true);
- 
- ?>
\ No newline at end of file
--- 0 ----

[Phpbb-checkins] CVS: phpBB2/db mysql_basic.sql,1.63,1.64

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

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

Modified Files:
	mysql_basic.sql 
Log Message:
Just the start to the wonderful world of global announcements.  Adds support for them as well as creates a new forum, id -1.  Do not delete the forum.  I'll write the admin later.

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql_basic.sql,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** mysql_basic.sql	2001/10/11 22:26:00	1.63
--- mysql_basic.sql	2001/10/16 01:00:47	1.64
***************
*** 62,66 ****
  # -- Forums
  INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 'Test Forum 1', 'This is just a test forum.', 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 1, 1, 1, 3);
! 
  
  # -- Users
--- 62,66 ----
  # -- Forums
  INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 'Test Forum 1', 'This is just a test forum.', 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 1, 1, 1, 3);
! INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (-1, 'Global Announcements', 'This forum is required for the global announcements to function properly.  DO NOT DELETE IT UNDER ANY CIRCUMSTANCES!', 6, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 1, 1, 1, 3);
  
  # -- Users

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

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

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

Modified Files:
	admin_forums.php 
Log Message:
Just the start to the wonderful world of global announcements.  Adds support for them as well as creates a new forum, id -1.  Do not delete the forum.  I'll write the admin later.

Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** admin_forums.php	2001/10/14 15:46:53	1.23
--- admin_forums.php	2001/10/16 01:00:47	1.24
***************
*** 331,338 ****
  			$max_order = $row['max_order'];
  			$next_order = $max_order + 1;
  
  			// There is no problem having duplicate forum names so we won't check for it.
! 			$sql = "INSERT INTO " . FORUMS_TABLE . " (forum_name, cat_id, forum_desc, forum_order, forum_status, prune_enable)
! 				VALUES ('" . $HTTP_POST_VARS['forumname'] . "', " . intval($HTTP_POST_VARS['cat_id']) . ", '" . $HTTP_POST_VARS['forumdesc'] . "', $next_order, " . intval($HTTP_POST_VARS['forumstatus']) . ", " . intval($HTTP_POST_VARS['prune_enable']) . ")";
  			if( !$result = $db->sql_query($sql) )
  			{
--- 331,349 ----
  			$max_order = $row['max_order'];
  			$next_order = $max_order + 1;
+ 			
+ 			$sql = "SELECT MAX(forum_id) AS max_id
+ 				FROM " . FORUMS_TABLE;
+ 			if( !$result = $db->sql_query($sql) )
+ 			{
+ 				message_die(GENERAL_ERROR, "Couldn't get order number from forums table", "", __LINE__, __FILE__, $sql);
+ 			}
+ 			$row = $db->sql_fetchrow($result);
  
+ 			$max_id = $row['max_id'];
+ 			$next_id = $max_id + 1;
+ 
  			// There is no problem having duplicate forum names so we won't check for it.
! 			$sql = "INSERT INTO " . FORUMS_TABLE . " (forum_id, forum_name, cat_id, forum_desc, forum_order, forum_status, prune_enable)
! 				VALUES ('" . $next_id . "', '" . $HTTP_POST_VARS['forumname'] . "', " . intval($HTTP_POST_VARS['cat_id']) . ", '" . $HTTP_POST_VARS['forumdesc'] . "', $next_order, " . intval($HTTP_POST_VARS['forumstatus']) . ", " . intval($HTTP_POST_VARS['prune_enable']) . ")";
  			if( !$result = $db->sql_query($sql) )
  			{

[Phpbb-checkins] CVS: phpBB2 config.php,1.40,1.41 viewforum.php,1.91,1.92 viewtopic.php,1.120,1.121

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

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

Modified Files:
	config.php viewforum.php viewtopic.php 
Log Message:
Just the start to the wonderful world of global announcements.  Adds support for them as well as creates a new forum, id -1.  Do not delete the forum.  I'll write the admin later.

Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** config.php	2001/10/14 20:05:48	1.40
--- config.php	2001/10/16 01:00:47	1.41
***************
*** 0 ****
--- 1,19 ----
+ <?php
+ 
+ //
+ // phpBB 2.x auto-generated config file
+ // Do not change anything in this file!
+ //
+ 
+ $dbms = "mysql";
+ 
+ $dbhost = "127.0.0.1";
+ $dbname = "devphpbb2";
+ $dbuser = "dougk";
+ $dbpasswd = "dougk";
+ 
+ $table_prefix = "phpbb_";
+ 
+ define('PHPBB_INSTALLED', true);
+ 
+ ?>
\ No newline at end of file

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** viewforum.php	2001/10/14 18:22:32	1.91
--- viewforum.php	2001/10/16 01:00:47	1.92
***************
*** 436,447 ****
--- 436,450 ----
  		{
  			$topic_type = $lang['Topic_Announcement'] . " ";
+ 			$is_announcement = TRUE;
  		}
  		else if($topic_type == POST_STICKY)
  		{
  			$topic_type = $lang['Topic_Sticky'] . " ";
+ 			$is_announcement = FALSE;
  		}
  		else
  		{
  			$topic_type = "";
+ 			$is_announcement = FALSE;
  		}
  
***************
*** 450,454 ****
  			$topic_type .= $lang['Topic_Poll'] . " ";
  		}
! 
  		$topic_id = $topic_rowset[$i]['topic_id'];
  
--- 453,457 ----
  			$topic_type .= $lang['Topic_Poll'] . " ";
  		}
! 		
  		$topic_id = $topic_rowset[$i]['topic_id'];
  
***************
*** 554,559 ****
  			}
  		}
! 
! 		$view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
  
  		$topic_poster = $topic_rowset[$i]['username'];
--- 557,568 ----
  			}
  		}
! 		if($is_announcement == TRUE)
! 		{
! 			$view_topic_url = append_sid("viewtopic.$phpEx?mode=viewannounce&". POST_FORUM_URL . "=" . $forum_id . "&" . POST_TOPIC_URL . "=$topic_id");
! 		}
! 		else
! 		{
! 			$view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! 		}
  
  		$topic_poster = $topic_rowset[$i]['username'];
***************
*** 564,568 ****
  		$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
  		$last_post .= ( $topic_rowset[$i]['id2'] == ANONYMOUS ) ? $topic_rowset[$i]['user2'] . " " : "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $topic_rowset[$i]['id2']) . "\">" . $topic_rowset[$i]['user2'] . "</a> ";
! 		$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
  
  		$views = $topic_rowset[$i]['topic_views'];
--- 573,584 ----
  		$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
  		$last_post .= ( $topic_rowset[$i]['id2'] == ANONYMOUS ) ? $topic_rowset[$i]['user2'] . " " : "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $topic_rowset[$i]['id2']) . "\">" . $topic_rowset[$i]['user2'] . "</a> ";
! 		if($is_announcement == TRUE)
! 		{
! 			$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?mode=viewannounce&" . POST_FORUM_URL . "=" . $forum_id . "&" . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] .  "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
! 		}
! 		else
! 		{
! 			$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
! 		}
  
  		$views = $topic_rowset[$i]['topic_views'];

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -r1.120 -r1.121
*** viewtopic.php	2001/10/14 18:22:32	1.120
--- viewtopic.php	2001/10/16 01:00:47	1.121
***************
*** 39,47 ****
  
  $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
  //
  // End initial var setup
  //
  
! if( !isset($topic_id) && !isset($post_id) )
  {
  	message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
--- 39,52 ----
  
  $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
+ 
+ $mode = (isset($HTTP_GET_VARS['mode'])) ? addslashes($HTTP_GET_VARS['mode']) : "";
+ 
+ $forum_id = (isset($HTTP_GET_VARS['f'])) ? intval($HTTP_GET_VARS['f']) : "";
+ 
  //
  // End initial var setup
  //
  
! if( !isset($topic_id) && !isset($post_id) && ($mode != "viewannounce") )
  {
  	message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
***************
*** 131,134 ****
--- 136,140 ----
  }
  
+ 
  //
  // This rather complex gaggle of code handles querying for topics but
***************
*** 142,150 ****
  $order_sql = (!isset($post_id)) ? "" : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
  
! $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
! 	FROM $join_sql_table " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
! 	WHERE $join_sql
! 		AND f.forum_id = t.forum_id
! 		$order_sql";
  
  if(!$result = $db->sql_query($sql))
--- 148,169 ----
  $order_sql = (!isset($post_id)) ? "" : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
  
! if( $mode=="viewannounce" )
! {
! 	$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
! 		FROM $join_sql_table " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
! 		WHERE $join_sql AND
! 			t.topic_type = " . POST_ANNOUNCE . " AND
! 			(f.forum_id = " . $forum_id . "
! 			OR f.forum_id = -1)
! 			$order_sql";
! }
! else
! {
! 	$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
! 		FROM $join_sql_table " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
! 		WHERE $join_sql
! 			AND f.forum_id = t.forum_id
! 			$order_sql";
! }
  
  if(!$result = $db->sql_query($sql))

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin user_select_body.tpl,1.4,1.5

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

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

Modified Files:
	user_select_body.tpl 
Log Message:
Oops, commited wrong file earlier to fix user select bug in admin_user/admin_userauth

Index: user_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_select_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** user_select_body.tpl	2001/10/15 02:58:50	1.4
--- user_select_body.tpl	2001/10/15 23:18:21	1.5
***************
*** 9,13 ****
  	</tr>
  	<tr>
! 		<td class="row1" align="center"><input type="text" class="post" name="username_select" maxlength="50" size="20" /> <input type="hidden" name="mode" value="edit" /><input type="submit" name="submit" value="{L_LOOK_UP}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
  	</tr>
  </table></form>
--- 9,13 ----
  	</tr>
  	<tr>
! 		<td class="row1" align="center"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="hidden" name="mode" value="edit" /><input type="submit" name="submit" value="{L_LOOK_UP}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
  	</tr>
  </table></form>

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

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

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

Modified Files:
	search.php 
Log Message:
And all because the lady loves Milk Tray, erm, sorry ... all because I missed a . from a string concaten...thingy

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** search.php	2001/10/14 18:22:32	1.20
--- search.php	2001/10/15 23:04:16	1.21
***************
*** 20,826 ****
   *
   ***************************************************************************/
- /*
  
- /* ====================================================================
-  * Copyright (c) 2000 Steven Haryanto.  All rights reserved.
-  *
-  * KwIndex
-  *   A PHP module to do full text indexing with MySQL database
-  * 
-  * This module is released under the GNU General Public License. See:
-  *   http://www.gnu.org/copyleft/gpl.html
-  * 
-  * Version
-  *   0.04, Sat Dec  2 14:54:41 2000
-  *   based on DBIx::KwIndex 0.03
-  *
-  * For documentation, support and latest version, visit:
-  *   http://steven.haryan.to/php/KwIndex.html
-  * 
-  * ====================================================================
-  *
-  */
- /*
- 
- class KwIndex {
- 
- 	# CONSTRUCTOR
- 	#############
- 
- 	function KwIndex($args) {
- 		# check for argument type
- 		if (!is_array(&$args))
- 			die("KwIndex: constructor: syntax: KwIndex(array \$args)");
- 
- 		# check for unknown arguments
- 		$known_arguments = array_flip(array(
- 			"linkid", "db_name", "hostname", "username", "password", 
- 			"index_name", "wordlist_cardinality", "doclist_cardinality", 
- 			"stoplist_cardinality", "vectorlist_cardinality",
- 			"max_word_length", "use_persistent_connection"));
- 		while(list($k,$v) = each($args))
- 			if (!isset($known_arguments[$k]))
- 				die("KwIndex: constructor: unknown argument `$k'");
- 
- 		# required for required arguments
- 		if (!isset($args["db_name"]))
- 			die("KwIndex: constructor: You must specify 'db_name'");
- 		if (!isset($args["linkid"]) &&
- 		    (!isset($args["hostname"]) || !isset($args["username"]) || 
- 		     !isset($args["password"])))
- 			die("KwIndex: constructor: You must either specify 'linkid' or ".
- 			    "arguments to mysql_connect ('hostname', 'username', and ".
- 				   "'password')");
- 
- 		# supply default values for optional arguments
- 		if (!isset($args["index_name"]))
- 			$args["index_name"] = "kwindex";
- 		if (!isset($args["wordlist_cardinality"]))
- 			$args["wordlist_cardinality"] = 100000;
- 		if (!isset($args["stoplist_cardinality"]))
- 			$args["stoplist_cardinality"] = 10000;
- 		if (!isset($args["vectorlist_cardinality"]))
- 			$args["vectorlist_cardinality"] = 100000000;
- 		if (!isset($args["doclist_cardinality"]))
- 			$args["doclist_cardinality"] = 1000000;
- 		if (!isset($args["max_word_length"]))
- 			$args["max_word_length"] = 32;
- 		if (!isset($args["use_persistent_connection"]))
- 			$args["use_persistent_connection"] = 1;
- 
- 		# set object attributes
- 		$this->db_name = $args["db_name"];
- 		$this->index_name = $args["index_name"];
- 		$this->wordlist_cardinality = $args["wordlist_cardinality"];
- 		$this->stoplist_cardinality = $args["stoplist_cardinality"];
- 		$this->vectorlist_cardinality = $args["vectorlist_cardinality"];
- 		$this->doclist_cardinality = $args["doclist_cardinality"];
- 		$this->max_word_length = $args["max_word_length"];
- 
- 		if (!isset($args["linkid"])) {
- 			if ($args["use_persistent_connection"]) {
- 				$linkid = mysql_pconnect($args["hostname"], $args["username"],
- 				                         $args["password"]);
- 			} else {
- 				$linkid = mysql_connect($args["hostname"], $args["username"],
- 				                        $args["password"]);
- 			}
- 			if (!$linkid)
- 				die("KwIndex: constructor: Can't connect to database: ".
- 				    mysql_error());
- 		} else {
- 			$linkid = $args["linkid"];
- 		}
- 
- 		$this->linkid = $linkid;
- 		$idx = $this->index_name;
- 
- 		if (!mysql_select_db($this->db_name, $linkid)) 
- 			die("KwIndex: constructor: Can't select DB: ".
- 			    mysql_error($linkid));
- 
- 		if (!$this->_index_exists()) $this->_create_index();
- 
- 		# load stoplist as keys of array
- 		$this->stoplist = array();
- 		if (!($res = mysql_query("SELECT word FROM ${idx}_stoplist",
- 		                         $linkid)))
- 			die("KwIndex: constructor: Can't load stoplist: ".
- 			    mysql_error($linkid));
- 		while($row = mysql_fetch_row($res)) {
- 			$this->stoplist[ strtolower($row[0]) ] = 1;
- 		}
- 	} // constructor
- 
- 
- 	# PUBLIC METHODS
- 	################
- 
- 	function &document_sub($doc_ids) {
- 		die("KwIndex: document_sub: this method must be overriden");
- 	}
- 
- 	function add_document($doc_ids) {
- 		if (!is_array(&$doc_ids))
- 			die("KwIndex: syntax: add_document(array \$doc_ids)");
- 
- 		if (!sizeof(&$doc_ids)) return 1;
- 
- 		$wordlist = array();
- 			# structure: ( 'word1' => [ [doc_id,freq], ... ], ... )
- 		$doclist = array();
- 			# format: ( doc_id => n, ... ); # n = number of words in document
- 
- 		# retrieve documents
- 		####################
- 		$docs = $this->document_sub(&$doc_ids);
- 
- 		if(!is_array(&$docs))
- 			die("KwIndex: add_document: ".
- 			    "'document_sub' does not return an array");
- 		if (sizeof(&$doc_ids) < sizeof(&$docs))
- 			die("KwIndex: add_document: ".
- 			    "'document_sub' does not return enough documents");
- 		if (sizeof(&$doc_ids) > sizeof(&$docs))
- 			die("KwIndex: add_document: ".
- 			    "'document_sub' returns too many documents");
-     
- 		# split documents into words
- 		############################
- 		while(list($id, $doc) = each($docs)) {
- 			if (!isset($doc) || !strlen($doc)) continue;
-     	
- 			$words = $this->_split_to_words($doc);
- 			$num_of_words = sizeof(&$words);
- 				# note: this means that numbers, etc are counted
- 			$doclist[$id] = $num_of_words;
- 
- 			# filter non-qualifying words: 1-char length, numbers, words
- 			# that are too long
- 
- 			$w2 = array();
- 			while(list($k, $v) = each($words)) {
- 				$len = strlen($v);
- 				$lower_v = strtolower($v);
- 				if ($len > 1 &&
- 				    $len <= $this->max_word_length && 
- 				    preg_match("/[a-z]/", $lower_v) &&
- 				    !isset($this->stoplist[$lower_v])) ++$w2[ $lower_v ];
- 			}
- 
- 			while(list($k, $v) = each($w2)) {
- 				$lower_k = strtolower($k); 
- 				if (!isset($wordlist[$lower_k]))
- 					$wordlist[$lower_k] = array();
- 				array_push($wordlist[$lower_k], array($id, $v/$num_of_words));
- 			}
- 		}
- 
- #_debug("wordlist: ", Dumper($wordlist));
- 
- 		# submit to database
- 		####################
- 		$linkid = $this->linkid;
- 		$idx = $this->index_name;
- 
- 		# lock the tables in case some other process remove a certain word
- 		# between step 0 and 1 and 2 and 3
- 		if(!mysql_query("LOCK TABLES ${idx}_doclist WRITE, ".
- 		                            "${idx}_vectorlist WRITE, ".
- 		                            "${idx}_wordlist WRITE",
- 		                $linkid)) {
- 			$this->ERROR = "Can't lock tables when adding documents: ".
- 			                mysql_error($linkid);
- 			return;
- 		}
- 
- 		# 0
- 		# add the docs first
- #_debug( "doclist = ", Dumper($doclist));
- 		while(list($k,$v) = each($doclist)) {
- 			if(!mysql_query("REPLACE INTO ${idx}_doclist (id,n) VALUES (".
- 			                   "'".(addslashes($k))."'".
- 			                   ",".
- 			                   "'".(addslashes($v))."'".
- 			                   ")",
- 		                    $linkid)) {
- 				$this->ERROR = "Can't add doc id=`$_' to doclist: ".
- 				               mysql_error($linkid);
- 				mysql_query("UNLOCK TABLES", $linkid);
- 				return;
- 			}
- 		}
- 
- 		# 1
- 		# and then add the words 
- 		while(list($k,$v) = each($wordlist)) {
- 			if(!mysql_query("INSERT IGNORE INTO ${idx}_wordlist (word) ".
- 			                        "VALUES (".
- 			                           "'".(addslashes($k))."'".
- 			                        ")",
- 		                    $linkid)) {
- 				$this->ERROR = "Can't add word `$k' to wordlist: ".
- 				               mysql_error($linkid);
- 				mysql_query("UNLOCK TABLES", $linkid);
- 				return;
- 			}
- 		}
- 
- 		# 2
- 		# get the resulting word ids
- 		$word_ids = array();
- 		$e_wordlist = array();
- 		reset($wordlist);
- 		while(list($k,$v) = each($wordlist))
- 			array_push($e_wordlist, "'".addslashes($k)."'");
- 
- 		if (sizeof(&$wordlist)) {
- 			if(!($res = mysql_query("SELECT id,word FROM ${idx}_wordlist ".
- 			                           "WHERE word IN (".
- 			                              join(',', $e_wordlist).
- 			                           ")",
- 			                        $linkid))) {
- 				$this->ERROR = "Can't get data from wordlist: ".
- 				               mysql_error($linkid);
- 				mysql_query('UNLOCK TABLES', $linkid);
- 				return;
- 			}
- 			while($row = mysql_fetch_row($res)) {
- #echo "row = ", Dumper($row), "<br>\n";
- 				$word_ids[ $row[1] ] = $row[0];
- 			}
- 		}
- 
- 		# 3
- 		# now add the vectors
- #_debug("word_ids = ", Dumper($word_ids));
- 		reset($wordlist);
- 		while (list($word, $hitlist) = each($wordlist)) {
- 			while(list($i, $hit) = each($hitlist)) {
- #echo "adding word=$word, hit = ($hit[0], $hit[1])<br>\n";
- 				if(!mysql_query("INSERT INTO ${idx}_vectorlist (wid,did,f)".
- 				                  "VALUES (".
- 				                     ("'".addslashes($word_ids[$word]))."',".
- 				                     ("'".addslashes($hit[0]))."',".
- 				                     ("'".addslashes($hit[1]))."')",
- 				                $linkid)) {
- 					$this->ERROR = "Can't add to vectorlist: ".
- 					               mysql_error($linkid);
- 					mysql_query('UNLOCK TABLES', $linkid);
- 					return;
- 				}
- 			}
- 		}
- 
- 		# if all goes well, return TRUE
- 		mysql_query('UNLOCK TABLES', $linkid);
- 		return 1;
- 	}
- 
- 
- 	function remove_document($doc_ids) {
- 		if (!is_array(&$doc_ids))
- 			die("KwIndex: syntax: remove_document(array \$doc_ids)");
- 
- 		if (!sizeof(&$doc_ids)) return 1;
- 
- 		$linkid = $this->linkid;
- 		$idx = $this->index_name;
- 
- 		if(!mysql_query("LOCK TABLES ${idx}_doclist WRITE, ".
- 		                            "${idx}_vectorlist WRITE",
- 		                $linkid)) {
- 			$this->ERROR = "Can't lock tables when removing documents: ".
- 			                mysql_error($linkid);
- 			return;
- 		}
- 
- 		if(!mysql_query("DELETE FROM ${idx}_doclist WHERE id IN (".
- 		                   join(',', $doc_ids).")",
- 		                $linkid)) {
- 			$this->ERROR = "Can't delete from doclist: ".
- 			               mysql_error($linkid);
- 			mysql_query('UNLOCK TABLES', $linkid);
- 			return;
- 		}
- 
- 		if(!mysql_query("DELETE FROM ${idx}_vectorlist WHERE did IN (".
- 		                   join(',', $doc_ids).")",
- 		                $linkid)) {
- 			$this->ERROR = "Can't delete from vectorlist: ".
- 			               mysql_error($linkid);
- 			mysql_query('UNLOCK TABLES', $linkid);
- 			return;
- 		}
- 
- 		# if all goes well, return TRUE
- 		mysql_query("UNLOCK TABLES", $linkid);
- 		return 1;
- 	}
- 
- 
- 	function update_document($doc_ids) {
- 		if (!is_array(&$doc_ids))
- 			die("KwIndex: syntax: update_document(array \$doc_ids)");
- 
- 		if (!sizeof(&$doc_ids)) return 1;
- 
- 		return $this->remove_document(&$doc_ids) && 
- 		       $this->add_document(&$doc_ids);
- 	}
- 
- 
- 	# find all words that are contained in at least $k % of all documents
- 
- 	function &common_word($k = 80) {
- 		$linkid = $this->linkid;
- 		$idx = $this->index_name;
- 
- 		# first select the number of documents
- 		$num = $this->document_count();
- 		if ($num == -1) {
- 			$this->ERROR = "Can't retrieve the number of documents: ".
- 			               mysql_error($linkid);
- 			return;
- 		}
- 
- 		# get the statistics from vectorlist
- 		if(!($res1 = mysql_query("SELECT wid,COUNT(*)/$num as k FROM
- 		                             ${idx}_vectorlist GROUP BY wid HAVING k>=".
- 		                             ($k/100),
- 		                         $linkid))) {
- 			$this->ERROR = "Can't retrieve common words: ".
- 			               mysql_error($linkid);
- 			return;
- 		}
- 		$wids = array();
- 		while($row = mysql_fetch_row($res1)) array_push($wids, $row[0]);
- 
- 		# convert it to word by consulting the wordlist table
- 		$words = array();
- 		if (sizeof(&$wids)) {
- 			if (!($res2 = mysql_query("SELECT word FROM ${idx}_wordlist ".
- 			                             "WHERE id IN (".join(',', $wids).
- 			                              ")",
- 			                          $linkid))) {
- 				$this->ERROR = "Can't retrieve common words: ".
- 				               mysql_error($linkid);
- 				return;
- 			}
- 
- 			while($row = mysql_fetch_row($res2))
- 				array_push($words, $row[0]);
- 		}
- 
- 		return $words;
- 	}
- 
- 
- 	# find all words that are not contained in all documents (vectorlist)
- 	# XXX not yet written
- 
- 	function &orphan_word() {
- 		return array();
- 	}
- 
- 
- 	# remove words from index
- 
- 	function remove_word($words) {
- 		if (!is_array(&$words))
- 			die("KwIndex: syntax: remove_word(array \$words)");
- 
- 		$linkid = $this->linkid;
- 		$idx = $this->index_name;
- 	
- 		if(!mysql_query("LOCK TABLES ${idx}_wordlist WRITE, ".
- 		                            "${idx}_vectorlist WRITE",
- 		                $linkid)) {
- 			$this->ERROR = "Can't lock tables when removing words: ".
- 			                mysql_error($linkid);
- 			return;
- 		}
- 
- 		$e_words = array();
- 		while(list($k,$v) = each($words))
- 			array_push($e_words, "'".addslashes(strtolower($v))."'");
- 
- 		# retrieve word ids
- 		if(!($res0 = mysql_query("SELECT id FROM ${idx}_wordlist WHERE ".
- 		                            "word IN (".join(',', $e_words).")",
- 		                         $linkid))) {
- 			$this->ERROR = "Can't delete from wordlist: ".
- 			               mysql_error($linkid);
- 			mysql_query('UNLOCK TABLES', $linkid);
- 			return;
- 		}
- 		
- 		$word_ids = array();
- 		while($row = mysql_fetch_row($res0))
- 			array_push($word_ids, $row[0]);
- 		$word_ids = join(',', $word_ids); # we'll make it a string
- 
- 		if (!strlen($word_ids)) return 1;
- 	
- 		# delete from wordlist
- 		if(!mysql_query("DELETE FROM ${idx}_wordlist WHERE id IN ".
- 		                   "($word_ids)",
- 		                $linkid)) {
- 			$this->ERROR = "Can't delete from wordlist: ".
- 			               mysql_error($linkid);
- 			mysql_query("UNLOCK TABLES", $linkid);
- 			return;
- 		}
- 		if(!mysql_query("DELETE FROM ${idx}_vectorlist WHERE wid IN ".
- 		                   "($word_ids)", $linkid)) {
- 			$this->ERROR = "Can't delete from vectorlist: ".
- 			               mysql_error($linkid);
- 			mysql_query("UNLOCK TABLES", $linkid);
- 			return;
- 		}
- 
- 		return 1;
- 	}
- 
- 	# add stop words. note: you must manually delete previously indexed
- 	# words with delete_word()
- 
- 	function add_stop_word($words) {
- 		if (!is_array(&$words))
- 			die("KwIndex: syntax: add_stop_word(array words)");
- 			
- 		if (!sizeof(&$words)) return 1;
- 		
- 		$linkid = $this->linkid;
- 		$idx = $this->index_name;
- 	
- 		while(list($k, $v) = each($words)) {
- 			$lv = strtolower($v);
- 			if(!mysql_query("REPLACE INTO ${idx}_stoplist (word) VALUES (".
- 			                   ("'".addslashes($lv)."'").
- 			                   ")", $linkid)) {
- 				$this->ERROR = "Can't add to stoplist: ".
- 				               mysql_error($linkid);
- 				return;
- 			}
- 			$this->stoplist[ $lv ] = 1;
- 		}
- 
- 		return 1;
- 	}
- 
- 	# remove stop words from index
- 
- 	function remove_stop_word($words) {
- 		if (!is_array(&$words))
- 			die("KwIndex: syntax: remove_stop_word(array words)");
- 
- 		if (!sizeof(&$words)) return 1;
- 		
- 		$linkid = $this->linkid;
- 		$idx = $this->index_name;
- 
- 		$e_words = array();
- 		while(list($k,$v) = each($words))
- 			array_push($e_words, "'".addslashes(strtolower($v))."'");
- 		 
- 		if(!mysql_query("DELETE FROM ${idx}_stoplist WHERE word IN (".
- 		                   join(',', $e_words).")",
- 		                $linkid)) {
- 			$this->ERROR = "Can't delete from stoplist: ".
- 			               mysql_error($linkid);
- 			return;
- 		}
- 
- 		while(list($k,$v) = each($words))
- 			unset($this->stoplist[ strtolower($v) ]);
- 		
- 		return 1;
- 	}
- 
- 	function is_stop_word($word) {
- 		return isset($this->stoplist[ strtolower($word) ]);
- 	}
- 
- 	function &_search_or_match_count($is_count, &$args) {
- 		if (!isset($args["words"]))
- 			die("KwIndex: search: option 'words' must be defined");
- 
- 		$linkid = $this->linkid;
- 		$idx = $this->index_name;
- 
- 		# split the words if we are offered a single string/not array
- 		# (assume it's a phrase)
- 
- 		$words = array();
- 		if (is_array(&$args["words"])) {
- 			$words = $args["words"];
- 		} else {
- 			$words = $this->_split_to_words($args["words"]);
- 		}
- 
- 		# delete duplicate words, convert them all to lowercase
- 		$hashwords = array();
- 		while(list($k,$v) = each($words)) $hashwords[ strtolower($v) ] = 1;
- 		$words = array_keys(&$hashwords);
- 		
- 		if (!sizeof(&$words)) {
- 			if ($is_count) {
- 				return 0;
- 			} else {
- 				return array();
- 			}
- 		}
- 
- 		# first we retrieve the word ids
- 		$op = $args["re"] ? 'REGEXP':'LIKE';
- 		$bool = isset($args['boolean']) && $args['boolean'] &&
- 		        strtoupper($args['boolean']) == 'AND' ? 'AND':'OR';
- 		
- 		$op_phrases = array();
- 		while(list($k,$v) = each($words))
- 			array_push($op_phrases, "word $op '".addslashes($v)."'");
- 		
- 		if (!($res0 = mysql_query("SELECT id FROM ${idx}_wordlist WHERE ".
- 		                             join(' OR ', $op_phrases),
- 		                          $linkid))) {
- 			$this->ERROR = "Can't retrieve word ids: ".mysql_error($linkid);
- 			return;
- 		}
- 		$word_ids = array();
- 		while($row = mysql_fetch_row($res0)) array_push($word_ids, $row[0]);
- 		
- 		if (!sizeof(&$word_ids) || 
- 		    ($bool == 'AND' && sizeof(&$word_ids) < sizeof(&$words))) {
- 			if ($is_count) {
- 				return 0;
- 			} else {
- 				return array();
- 			}
- 		}
- 
- 		# and then we search the vectorlist
- 		$can_optimize=0;
- 		$stmt = '';
- 
- 		if ($is_count) {
- 
- 			if ($bool == 'AND' && !$args['re']) {
- 				$stmt = 'SELECT did,count(wid) as c '.
- 			    	    "FROM ${idx}_vectorlist WHERE wid IN (".
- 				           join(',',$word_ids).
- 				         ") ".
- 				        "GROUP BY did ".
- 				        "HAVING c >= ".sizeof(&$word_ids);
- 			} else {
- 				$can_optimize=1;
- 				$stmt = "SELECT COUNT(DISTINCT did) ".
- 				        "FROM ${idx}_vectorlist WHERE wid IN (".
- 				           join(',',$word_ids).
- 				        ")";
- 			}
- 
- 		} else { // ! $is_count
- 
- 			$stmt = "SELECT did, count(wid) as c, avg(f) as a, ".
- 			               "count(wid)*count(wid)*count(wid)*avg(f) as ca ".
- 
- 			        "FROM ${idx}_vectorlist WHERE wid IN (".
- 			            join(',',$word_ids).
- 			        ") ".
- 
- 			        "GROUP BY did ".
- 			        ($bool == 'AND' && !$args['re'] ? 
- 			        "HAVING c >= ".sizeof(&$word_ids):'').
- 			        " ORDER BY ca DESC ".
- 			        (isset($args['num']) ? "LIMIT " . (isset($args['start']) ?
- 			        (($args['start'] - 1).",".$args['num']) : $args['num'])
- 			        :'');
- 
- 		}
- 
- _debug("search SQL: ", $stmt);
- 
- 		if(!($res = mysql_query($stmt, $linkid))) {
- 			$this->ERROR = "Can't search vectorlist: ".mysql_error($linkid);
- 			return;
- 		}
- 
- 		if ($is_count) {
- 
- 			if ($can_optimize) {
- 				$row = mysql_fetch_row($res);
- 				return $row[0];
- 			} else {
- 				return mysql_num_rows($res);
- 			}
- 	
- 		} else { // ! $is_count
- 
- 			$doc_ids = array();
- 			while($row = mysql_fetch_row($res)) array_push($doc_ids, $row[0]);
- 			return $doc_ids;
- 		}
- 	}
- 
- 	function &search($args) {
- 		return $this->_search_or_match_count(0, &$args);
- 	}
- 
- 	function &match_count($args) {
- 		return $this->_search_or_match_count(1, &$args);
- 	}
- 
- 	function remove_index() {
- 		$linkid = $this->linkid;
-     	$idx = $this->index_name;
- 
- 		if(!mysql_query("DROP TABLE IF EXISTS ${idx}_wordlist", $linkid)) {
- 			$this->ERROR = "Can't remove table ${idx}_wordlist: ".
- 			               mysql_error($linkid);
- 			return;
- 		}
- 		if(!mysql_query("DROP TABLE IF EXISTS ${idx}_doclist", $linkid)) {
- 			$this->ERROR = "Can't remove table ${idx}_doclist: ".
- 			               mysql_error($linkid);
- 			return;
- 		}
- 		if(!mysql_query("DROP TABLE IF EXISTS ${idx}_vectorlist", $linkid)) {
- 			$this->ERROR = "Can't remove table ${idx}_vectorlist: ".
- 			               mysql_error($linkid);
- 			return;
- 		}
- 		if(!mysql_query("DROP TABLE IF EXISTS ${idx}_stoplist", $linkid)) {
- 			$this->ERROR = "Can't remove table ${idx}_stoplist: ".
- 			               mysql_error($linkid);
- 			return;
- 		}
- 		
- 		return 1;
- 	}
- 
- 	function empty_index() {
- 		return $this->remove_index() && $this->_create_index();
- 	}
- 
- 	# number of documents in the collection
- 	function document_count() {
- 		$linkid = $this->linkid;
-     	$idx = $this->index_name;
- 	    
-    		if (!($res = mysql_query("SELECT COUNT(*) FROM ${idx}_doclist", 
-    		                         $linkid))) return;
-    		$row = mysql_fetch_row($res);
-    		return $row[0];
- 	}
- 
- 	# number of unique words 
- 	function word_count() {
- 		$linkid = $this->linkid;
- 		$idx = $this->index_name;
- 	    
- 		if (!($res = mysql_query("SELECT COUNT(*) FROM ${idx}_wordlist", 
- 		                         $linkid))) return;
- 		$row = mysql_fetch_row($res);
- 		return $row[0];
- 	}
- 
- 
- 	# PRIVATE METHODS
- 	#################
- 
- 	function &_split_to_words($str) {
- 		preg_match_all("/\b(\w[\w']*\w+|\w+)\b/", $str, $matches);
- 		return $matches[1];
- 	}
- 
- 	function _create_index() {
- 		$linkid = $this->linkid;
-     	$idx = $this->index_name;
- 
- 		$stmt = '';
- 
- 		# drop previous tables, if they exist
- 		if (!$this->remove_index()) return;
- 
- 		# create doclist table
- 		$stmt = "CREATE TABLE ${idx}_doclist " . 
- 		        '(id ' . $this->_int_column_type($this->doclist_cardinality).
- 		        ' AUTO_INCREMENT PRIMARY KEY, ' .
- 		        ' n ' . $this->_int_column_type($this->wordlist_cardinality).
- 		        ' NOT NULL'.
- 		        ')';
- 		if (!mysql_query($stmt, $linkid))
- 			die("KwIndex: Can't create table ${idx}_doclist: ".
- 			    mysql_error($linkid));
- 		
- 		# create wordlist table
- 		$stmt = "CREATE TABLE ${idx}_wordlist " . 
- 		        '(id ' . $this->_int_column_type($this->wordlist_cardinality) .
- 		        ' AUTO_INCREMENT PRIMARY KEY, ' .
- 		        " word VARCHAR($this->max_word_length)" .
- 		        ' BINARY NOT NULL, ' .
- 		        "UNIQUE (word) " .
- 		        ')';
- 		if(!mysql_query($stmt, $linkid))
- 			die("KwIndex: Can't create table ${idx}_wordlist: ".
- 			    mysql_error($linkid));
- 
- 		# create stoplist table
- 		$stmt = "CREATE TABLE ${idx}_stoplist " .
- 		        '(id ' . $this->_int_column_type($this->wordlist_cardinality).
- 		        ' AUTO_INCREMENT PRIMARY KEY, ' .
- 		        " word VARCHAR($this->max_word_length)" .
- 		        ' BINARY NOT NULL, ' .
- 		        "UNIQUE (word) " .
- 		        ')';
- 		if (!mysql_query($stmt, $linkid)) 
- 			die("KwIndex: Can't create table ${idx}_stoplist: ".
- 			    mysql_error($linkid));
- 
- 		# create vectorlist table
- 		$stmt = "CREATE TABLE ${idx}_vectorlist " .
- 		        '(wid '. $this->_int_column_type($this->wordlist_cardinality). 
- 		        ' NOT NULL, ' .
- 		        'did '. $this->_int_column_type($this->doclist_cardinality). 
- 		        ' NOT NULL, '.
- 		        'UNIQUE (wid,did), '.
- 		        'f FLOAT(10,4) NOT NULL'.
- 		        ')';
- 		if (!mysql_query($stmt, $linkid)) {
- 			die("KwIndex: Can't create table ${idx}_stoplist: ".
- 			    mysql_error($linkid));
-     	}
-     	
- 		$this->stoplist = array();
- 
- 		return 1;
- 	}
- 
- 	function _int_column_type($cardinality) {
- 		if ($cardinality >= 16*1024*1024) return 'INT UNSIGNED';
- 		if ($cardinality >= 64*1024) return 'MEDIUMINT UNSIGNED';
- 		if ($cardinality >= 256) return 'SMALLINT UNSIGNED';
- 		return 'TINYINT UNSIGNED';
- 	}
- 
- 	function &_index_tables() {
- 		$idx = $this->index_name;
- 
- 		$tables = array(
- 			"${idx}_doclist",
- 			"${idx}_wordlist",
- 			"${idx}_vectorlist",
- 			"${idx}_stoplist");
- 
- 		return $tables;
- 	}
- 
- 	function _index_exists() {
- 		$linkid = $this->linkid;
-     	$idx = $this->index_name;
- 
- 		if (!($res = mysql_list_tables($this->db_name, $linkid)))
- 			die("Can't list table: ".mysql_error($linkid));
- 		
- 		$existing_tables = array();
- 		$i = 0;
- 		while ($i < mysql_num_rows($res)) {
- 			$existing_tables[ mysql_tablename($res, $i) ] = 1;
- 			$i++;
- 		}
- 
- 		$index_tables = $this->_index_tables();
- 		while(list($k,$v) = each($index_tables)) {
- 			if (!isset($existing_tables[$v])) return 0;
- 		}
- 		
- 		return 1;
- 	}
- 
- } // class
- 
- */
- 
  //
  // Massive overhaul for phpBB2, originally based on search code
--- 20,24 ----
***************
*** 1295,1301 ****
  							if( $ignore_forum_sql != "" )
  							{
! 								$ignore_forum_sql = ", ";
  							}
! 							$ignore_forum_sql = $key;
  						}
  					}
--- 493,499 ----
  							if( $ignore_forum_sql != "" )
  							{
! 								$ignore_forum_sql .= ", ";
  							}
! 							$ignore_forum_sql .= $key;
  						}
  					}
***************
*** 1467,1471 ****
  	if( count($searchset) )
  	{
- 
  		//
  		// Output header
--- 665,668 ----

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

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

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

Modified Files:
	admin_userauth.php 
Log Message:
Looks like I missed this one

Index: admin_userauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_userauth.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22