phpbb-checkins Mailing List for phpBB (Page 610)

phpBB is the world's leading open source discussion forum software.

Brought to you by: acydburn, marshalrusty, naderman, noxwizard979

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

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (193)	Nov (393)	Dec (347)
2002	Jan (401)	Feb (232)	Mar (343)	Apr (129)	May (129)	Jun (116)	Jul (189)	Aug (129)	Sep (68)	Oct (172)	Nov (298)	Dec (148)
2003	Jan (264)	Feb (210)	Mar (322)	Apr (309)	May (234)	Jun (188)	Jul (215)	Aug (161)	Sep (234)	Oct (163)	Nov (110)	Dec (7)
2004	Jan (95)	Feb (107)	Mar (55)	Apr (3)	May (49)	Jun (35)	Jul (57)	Aug (43)	Sep (56)	Oct (40)	Nov (25)	Dec (21)
2005	Jan (93)	Feb (25)	Mar (22)	Apr (72)	May (45)	Jun (24)	Jul (29)	Aug (20)	Sep (50)	Oct (93)	Nov (69)	Dec (183)
2006	Jan (185)	Feb (143)	Mar (402)	Apr (260)	May (322)	Jun (367)	Jul (234)	Aug (299)	Sep (206)	Oct (288)	Nov (338)	Dec (307)
2007	Jan (296)	Feb (250)	Mar (261)	Apr (434)	May (539)	Jun (274)	Jul (440)	Aug (190)	Sep (128)	Oct (249)	Nov (86)	Dec (51)
2008	Jan (177)	Feb (67)	Mar (61)	Apr (48)	May (56)	Jun (97)	Jul (60)	Aug (64)	Sep (151)	Oct (79)	Nov (109)	Dec (123)
2009	Jan (70)	Feb (70)	Mar (73)	Apr (80)	May (22)	Jun (193)	Jul (191)	Aug (181)	Sep (120)	Oct (48)	Nov (24)	Dec

Flat | Threaded

<< < 1 .. 608 609 610 611 612 .. 629 > >> (Page 610 of 629)

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

From: Bart v. B. <ba...@us...> - 2001-11-23 18:52:50

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

Modified Files:
	mysql_schema.sql 
Log Message:
Oops, smallint is too small for group_id.. Thanks Paul :D

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mysql_schema.sql	2001/11/23 18:44:11	1.2
--- mysql_schema.sql	2001/11/23 18:52:46	1.3
***************
*** 10,14 ****
  DROP TABLE IF EXISTS phpbb_auth_access;
  CREATE TABLE phpbb_auth_access (
!    group_id smallint(5) DEFAULT '0' NOT NULL,
     forum_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
     auth_view tinyint(1) DEFAULT '0' NOT NULL,
--- 10,14 ----
  DROP TABLE IF EXISTS phpbb_auth_access;
  CREATE TABLE phpbb_auth_access (
!    group_id mediumint(8) DEFAULT '0' NOT NULL,
     forum_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
     auth_view tinyint(1) DEFAULT '0' NOT NULL,
***************
*** 34,38 ****
  DROP TABLE IF EXISTS phpbb_user_group;
  CREATE TABLE phpbb_user_group (
!    group_id smallint(5) DEFAULT '0' NOT NULL,
     user_id mediumint(8) DEFAULT '0' NOT NULL,
     user_pending tinyint(1), 
--- 34,38 ----
  DROP TABLE IF EXISTS phpbb_user_group;
  CREATE TABLE phpbb_user_group (
!    group_id mediumint(8) DEFAULT '0' NOT NULL,
     user_id mediumint(8) DEFAULT '0' NOT NULL,
     user_pending tinyint(1), 
***************
*** 46,50 ****
  DROP TABLE IF EXISTS phpbb_groups;
  CREATE TABLE phpbb_groups (
!    group_id smallint(5) NOT NULL auto_increment,
     group_type tinyint(4) DEFAULT '1' NOT NULL, 
     group_name varchar(40) NOT NULL,
--- 46,50 ----
  DROP TABLE IF EXISTS phpbb_groups;
  CREATE TABLE phpbb_groups (
!    group_id mediumint(8) NOT NULL auto_increment,
     group_type tinyint(4) DEFAULT '1' NOT NULL, 
     group_name varchar(40) NOT NULL,

[Phpbb-checkins] CVS: phpBB2/db/schemas mysql_schema.sql,1.1,1.2

From: Bart v. B. <ba...@us...> - 2001-11-23 18:44:15

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

Modified Files:
	mysql_schema.sql 
Log Message:
Some space/speed checkups on the types in the MySQL schema

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mysql_schema.sql	2001/11/20 22:28:41	1.1
--- mysql_schema.sql	2001/11/23 18:44:11	1.2
***************
*** 10,15 ****
  DROP TABLE IF EXISTS phpbb_auth_access;
  CREATE TABLE phpbb_auth_access (
!    group_id int(11) DEFAULT '0' NOT NULL,
!    forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
     auth_view tinyint(1) DEFAULT '0' NOT NULL,
     auth_read tinyint(1) DEFAULT '0' NOT NULL,
--- 10,15 ----
  DROP TABLE IF EXISTS phpbb_auth_access;
  CREATE TABLE phpbb_auth_access (
!    group_id smallint(5) DEFAULT '0' NOT NULL,
!    forum_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
     auth_view tinyint(1) DEFAULT '0' NOT NULL,
     auth_read tinyint(1) DEFAULT '0' NOT NULL,
***************
*** 34,39 ****
  DROP TABLE IF EXISTS phpbb_user_group;
  CREATE TABLE phpbb_user_group (
!    group_id int(11) DEFAULT '0' NOT NULL,
!    user_id int(11) DEFAULT '0' NOT NULL,
     user_pending tinyint(1), 
     KEY group_id (group_id),
--- 34,39 ----
  DROP TABLE IF EXISTS phpbb_user_group;
  CREATE TABLE phpbb_user_group (
!    group_id smallint(5) DEFAULT '0' NOT NULL,
!    user_id mediumint(8) DEFAULT '0' NOT NULL,
     user_pending tinyint(1), 
     KEY group_id (group_id),
***************
*** 46,54 ****
  DROP TABLE IF EXISTS phpbb_groups;
  CREATE TABLE phpbb_groups (
!    group_id int(11) NOT NULL auto_increment,
     group_type tinyint(4) DEFAULT '1' NOT NULL, 
     group_name varchar(40) NOT NULL,
     group_description varchar(255) NOT NULL,
!    group_moderator int(11) DEFAULT '0' NOT NULL, 
     group_single_user tinyint(1) DEFAULT '1' NOT NULL, 
     PRIMARY KEY (group_id), 
--- 46,54 ----
  DROP TABLE IF EXISTS phpbb_groups;
  CREATE TABLE phpbb_groups (
!    group_id smallint(5) NOT NULL auto_increment,
     group_type tinyint(4) DEFAULT '1' NOT NULL, 
     group_name varchar(40) NOT NULL,
     group_description varchar(255) NOT NULL,
!    group_moderator mediumint(8) DEFAULT '0' NOT NULL, 
     group_single_user tinyint(1) DEFAULT '1' NOT NULL, 
     PRIMARY KEY (group_id), 
***************
*** 64,68 ****
  CREATE TABLE phpbb_banlist (
     ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
!    ban_userid int(11) NOT NULL,
     ban_ip char(8) NOT NULL,
     ban_email varchar(255),
--- 64,68 ----
  CREATE TABLE phpbb_banlist (
     ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
!    ban_userid mediumint(8) NOT NULL,
     ban_ip char(8) NOT NULL,
     ban_email varchar(255),
***************
*** 117,121 ****
  CREATE TABLE phpbb_forum_prune (
     prune_id mediumint(8) UNSIGNED NOT NULL auto_increment,
!    forum_id mediumint(8) UNSIGNED NOT NULL,
     prune_days tinyint(4) UNSIGNED NOT NULL,
     prune_freq tinyint(4) UNSIGNED NOT NULL,
--- 117,121 ----
  CREATE TABLE phpbb_forum_prune (
     prune_id mediumint(8) UNSIGNED NOT NULL auto_increment,
!    forum_id smallint(5) UNSIGNED NOT NULL,
     prune_days tinyint(4) UNSIGNED NOT NULL,
     prune_freq tinyint(4) UNSIGNED NOT NULL,
***************
*** 131,135 ****
  DROP TABLE IF EXISTS phpbb_forums;
  CREATE TABLE phpbb_forums (
!    forum_id mediumint(8) UNSIGNED NOT NULL auto_increment,
     cat_id mediumint(8) UNSIGNED NOT NULL,
     forum_name varchar(150),
--- 131,135 ----
  DROP TABLE IF EXISTS phpbb_forums;
  CREATE TABLE phpbb_forums (
!    forum_id smallint(5) UNSIGNED NOT NULL auto_increment,
     cat_id mediumint(8) UNSIGNED NOT NULL,
     forum_name varchar(150),
***************
*** 168,173 ****
     post_id mediumint(8) UNSIGNED NOT NULL auto_increment,
     topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
!    forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
!    poster_id int(11) DEFAULT '0' NOT NULL,
     post_time int(11) DEFAULT '0' NOT NULL,
     poster_ip char(8) NOT NULL, 
--- 168,173 ----
     post_id mediumint(8) UNSIGNED NOT NULL auto_increment,
     topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
!    forum_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
!    poster_id mediumint(8) DEFAULT '0' NOT NULL,
     post_time int(11) DEFAULT '0' NOT NULL,
     poster_ip char(8) NOT NULL, 
***************
*** 210,215 ****
     privmsgs_type tinyint(4) DEFAULT '0' NOT NULL,
     privmsgs_subject varchar(255) DEFAULT '0' NOT NULL,
!    privmsgs_from_userid int(11) DEFAULT '0' NOT NULL,
!    privmsgs_to_userid int(11) DEFAULT '0' NOT NULL,
     privmsgs_date int(11) DEFAULT '0' NOT NULL,
     privmsgs_ip char(8) NOT NULL,
--- 210,215 ----
     privmsgs_type tinyint(4) DEFAULT '0' NOT NULL,
     privmsgs_subject varchar(255) DEFAULT '0' NOT NULL,
!    privmsgs_from_userid mediumint(8) DEFAULT '0' NOT NULL,
!    privmsgs_to_userid mediumint(8) DEFAULT '0' NOT NULL,
     privmsgs_date int(11) DEFAULT '0' NOT NULL,
     privmsgs_ip char(8) NOT NULL,
***************
*** 311,315 ****
  CREATE TABLE phpbb_sessions (
     session_id char(32) DEFAULT '' NOT NULL,
!    session_user_id int(11) DEFAULT '0' NOT NULL,
     session_start int(11) DEFAULT '0' NOT NULL,
     session_time int(11) DEFAULT '0' NOT NULL,
--- 311,315 ----
  CREATE TABLE phpbb_sessions (
     session_id char(32) DEFAULT '' NOT NULL,
!    session_user_id mediumint(8) DEFAULT '0' NOT NULL,
     session_start int(11) DEFAULT '0' NOT NULL,
     session_time int(11) DEFAULT '0' NOT NULL,
***************
*** 439,445 ****
  CREATE TABLE phpbb_topics (
     topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
!    forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
!    topic_title char(100) NOT NULL,
!    topic_poster int(11) DEFAULT '0' NOT NULL,
     topic_time int(11) DEFAULT '0' NOT NULL,
     topic_views mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
--- 439,445 ----
  CREATE TABLE phpbb_topics (
     topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
!    forum_id smallint(8) UNSIGNED DEFAULT '0' NOT NULL,
!    topic_title char(60) NOT NULL,
!    topic_poster mediumint(8) DEFAULT '0' NOT NULL,
     topic_time int(11) DEFAULT '0' NOT NULL,
     topic_views mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
***************
*** 464,468 ****
  CREATE TABLE phpbb_topics_watch (
    topic_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
!   user_id int(11) NOT NULL DEFAULT '0',
    notify_status tinyint(1) NOT NULL default '0',
    KEY topic_id (topic_id),
--- 464,468 ----
  CREATE TABLE phpbb_topics_watch (
    topic_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
!   user_id mediumint(8) NOT NULL DEFAULT '0',
    notify_status tinyint(1) NOT NULL default '0',
    KEY topic_id (topic_id),
***************
*** 478,482 ****
  DROP TABLE IF EXISTS phpbb_users;
  CREATE TABLE phpbb_users (
!    user_id int(11) NOT NULL auto_increment,
     user_active tinyint(1) DEFAULT '1',
     username varchar(25) NOT NULL,
--- 478,482 ----
  DROP TABLE IF EXISTS phpbb_users;
  CREATE TABLE phpbb_users (
!    user_id mediumint(8) NOT NULL auto_increment,
     user_active tinyint(1) DEFAULT '1',
     username varchar(25) NOT NULL,
***************
*** 564,568 ****
  CREATE TABLE phpbb_vote_voters (
    vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
!   vote_user_id int(11) NOT NULL DEFAULT '0',
    vote_user_ip char(8) NOT NULL,
    KEY vote_id (vote_id),
--- 564,568 ----
  CREATE TABLE phpbb_vote_voters (
    vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
!   vote_user_id mediumint(8) NOT NULL DEFAULT '0',
    vote_user_ip char(8) NOT NULL,
    KEY vote_id (vote_id),

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.103,1.104

From: James A. <th...@us...> - 2001-11-23 09:32:03

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

Modified Files:
	viewforum.php 
Log Message:
Added alternating row color/class for topicrow


Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** viewforum.php	2001/11/18 14:00:30	1.103
--- viewforum.php	2001/11/23 09:31:59	1.104
***************
*** 563,567 ****
--- 563,571 ----
  
  		$views = $topic_rowset[$i]['topic_views'];
+ 		
+ 		$row_color = ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'];
+ 		$row_class = ( !($i%2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
+ 
  		$template->assign_block_vars("topicrow", array(
  			"FORUM_ID" => $forum_id,
***************
*** 576,579 ****
--- 580,585 ----
  			"VIEWS" => $views,
  			"LAST_POST" => $last_post,
+ 			"ROW_COLOR" => $row_color,
+ 			"ROW_CLASS" => $row_class,
  
  			"U_VIEW_TOPIC" => $view_topic_url)

[Phpbb-checkins] CVS: phpBB2/templates/PSO posting_body.tpl,1.19,1.20 search_username.tpl,1.1,1.2 jumpbox.tpl,1.5,1.6

From: Paul S. O. <ps...@us...> - 2001-11-23 01:08:00

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

Modified Files:
	posting_body.tpl search_username.tpl jumpbox.tpl 
Log Message:
Missed these earlier

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/posting_body.tpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** posting_body.tpl	2001/11/20 02:20:24	1.19
--- posting_body.tpl	2001/11/23 01:07:55	1.20
***************
*** 69,73 ****
  			<tr>
  				<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
! 				<td class="row2"><input type="text" name="username" maxlength="50" size="20" /> &nbsp; <input type="submit"  name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('privmsg.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td>
  			</tr>
  			<!-- END privmsg_extensions -->
--- 69,73 ----
  			<tr>
  				<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
! 				<td class="row2"><input type="text" name="username" maxlength="50" size="20" /> &nbsp; <input type="submit"  name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('search.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td>
  			</tr>
  			<!-- END privmsg_extensions -->

Index: search_username.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/search_username.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search_username.tpl	2001/11/20 02:20:24	1.1
--- search_username.tpl	2001/11/23 01:07:55	1.2
***************
*** 9,41 ****
  </script>
  
! <form method="post" name="search" action="{S_SEARCH_ACTION}">
!   <table width="100%" border="0" cellspacing="0" cellpadding="10">
  	<tr>
! 	  <td>
! 		<table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline">
! 		  <tr> 
! 			<th class="thHead" height="25">{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="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
! 		  </tr>
! 		</table>
! 	  </td>
  	</tr>
!   </table>
! </form>
--- 9,26 ----
  </script>
  
! <form method="post" name="search" action="{S_SEARCH_ACTION}"><table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
  	<tr>
! 		<td class="tablebg"><table width="100%" border="0" cellspacing="1" cellpadding="3">
! 			<tr>
! 				<th>{L_SEARCH_USERNAME}</th>
! 			</tr>
! 			<tr>
! 				<td valign="top" class="row1"><span class="gensmall"><br /><input type="text" name="search_author" value="{AUTHOR}" class="post" />&nbsp;<input class="mainoptiontable" 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="gensmall">{L_UPDATE_USERNAME}<br /><select name="author_list">{S_AUTHOR_OPTIONS}</select>&nbsp;<input class="liteoptiontable" 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="gensmall"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
! 			</tr>
! 		</table></td>
  	</tr>
! </table></form>

Index: jumpbox.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/jumpbox.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** jumpbox.tpl	2001/11/20 02:20:24	1.5
--- jumpbox.tpl	2001/11/23 01:07:55	1.6
***************
*** 2,6 ****
  <form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}"><table cellspacing="0" cellpadding="0" border="0">
  	<tr>
! 		<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp;<input type="submit" value="{L_GO}" /></span></td>
  	</tr>
  </table></form>
--- 2,6 ----
  <form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}"><table cellspacing="0" cellpadding="0" border="0">
  	<tr>
! 		<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp;<input class="outsidetable" type="submit" value="{L_GO}" /></span></td>
  	</tr>
  </table></form>

[Phpbb-checkins] CVS: phpBB2 posting.php,1.104,1.105 search.php,1.37,1.38

From: Paul S. O. <ps...@us...> - 2001-11-23 01:04:34

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

Modified Files:
	posting.php search.php 
Log Message:
Latest variants ... not finished yet ...

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** posting.php	2001/11/21 03:10:09	1.104
--- posting.php	2001/11/23 01:04:31	1.105
***************
*** 113,158 ****
  	$row = $db->sql_fetchrow($result);
  
! 	$common_threshold = floor($row['total_posts'] * $percent);
! 
! 	$sql = "SELECT word_id 
! 		FROM " . SEARCH_MATCH_TABLE . " 
! 		$word_id_sql 
! 		GROUP BY word_id 
! 		HAVING COUNT(word_id) > $common_threshold";
! 	$result = $db->sql_query($sql); 
! 	if( !$result )
  	{
! 		message_die(GENERAL_ERROR, "Couldn't obtain common word list", "", __LINE__, __FILE__, $sql);
! 	}
  
! 	if( $post_count = $db->sql_numrows($result) )
! 	{
! 		$common_word_id_list = array();
! 		while( $row = $db->sql_fetchrow($result) )
  		{
! 			$common_word_id_list[] = $row['word_id'];
  		}
  
! 		$db->sql_freeresult($result);
! 		
! 		if(count($common_word_ids) != 0)
  		{
! 			$common_word_id_list = implode(", ", $common_word_id_list);
! 
! 			$sql = "UPDATE " . SEARCH_WORD_TABLE . "
! 				SET word_common = 1
! 				WHERE word_id IN ($common_word_id_list)";
! 			$result = $db->sql_query($sql); 
! 			if( !$result )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
  			}
  
! 			$sql = "DELETE FROM " . SEARCH_WORD_MATCH . "  
! 				WHERE word_id IN ($common_word_id_list)";
! 			$result = $db->sql_query($sql); 
! 			if( !$result )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
  			}
  		}
--- 113,165 ----
  	$row = $db->sql_fetchrow($result);
  
! 	if( $row['total_posts'] > 100 )
  	{
! 		$common_threshold = floor($row['total_posts'] * $percent);
  
! 		$sql = "SELECT word_id 
! 			FROM " . SEARCH_MATCH_TABLE . " 
! 			$word_id_sql 
! 			GROUP BY word_id 
! 			HAVING COUNT(word_id) > $common_threshold";
! 		$result = $db->sql_query($sql); 
! 		if( !$result )
  		{
! 			message_die(GENERAL_ERROR, "Couldn't obtain common word list", "", __LINE__, __FILE__, $sql);
  		}
  
! 		if( $word_count = $db->sql_numrows($result) )
  		{
! 			$common_word_id_list = array();
! 			while( $row = $db->sql_fetchrow($result) )
  			{
! 				$common_word_id_list[] = $row['word_id'];
  			}
  
! 			$db->sql_freeresult($result);
! 			
! 			if( count($common_word_ids) != 0 )
  			{
! 				$common_word_id_list = implode(", ", $common_word_id_list);
! 
! 				$sql = "UPDATE " . SEARCH_WORD_TABLE . "
! 					SET word_common = " . TRUE . " 
! 					WHERE word_id IN ($common_word_id_list)";
! 				$result = $db->sql_query($sql); 
! 				if( !$result )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
! 				}
! 
! 				$sql = "DELETE FROM " . SEARCH_WORD_MATCH . "  
! 					WHERE word_id IN ($common_word_id_list)";
! 				$result = $db->sql_query($sql); 
! 				if( !$result )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
! 				}
! 			}
! 			else
! 			{
! 				return 0;
  			}
  		}
***************
*** 162,279 ****
  		}
  	}
  
! 	return $words_removed;
  }
  
! function remove_old_words($post_id)
  {
! 	global $db, $phpbb_root_path, $board_config, $lang;
  
! 	$stopword_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt"); 
! 	$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
! 
! 	$sql = "SELECT post_text 
! 		FROM " . POSTS_TEXT_TABLE . " 
! 		WHERE post_id = $post_id";
! 	if( $result = $db->sql_query($sql) )
  	{
! 		$row = $db->sql_fetchrow($result);
! 
! 		$search_text = clean_words($row['post_text'], $stopword_array, $synonym_array);
! 		$search_matches = split_words($search_text);
! 
! 		if( count($search_matches) )
! 		{
! 			$word = array();
! 			$word_count = array();
! 			$phrase_string = $text;
! 
! 			$sql_in = "";
! 			for ($j = 0; $j < count($search_matches); $j++)
! 			{ 
! 				$this_word = strtolower(trim($search_matches[$j]));
! 
! 				if( empty($word_count[$this_word]) )
! 				{
! 					$word_count[$this_word] = 1;
! 				}
  
! 				$new_word = true;
! 				for($k = 0; $k < count($word); $k++)
! 				{
! 					if( $this_word ==  $word[$k] )
! 					{
! 						$new_word = false;
! 						$word_count[$this_word]++;
! 					}
! 				}
  
! 				if( $new_word )
! 				{
! 					$word[] = $this_word;
! 				}
! 			}
  
! 			for($j = 0; $j < count($word); $j++)
  			{
! 				if( $word[$j] )
! 				{
! 					if( $sql_in != "" )
! 					{
! 						$sql_in .= ", ";
! 					}
! 					$sql_in .= "'" . $word[$j] . "'";
! 				}
  			}
  
! 			$sql = "SELECT word_id, word_text  
! 				FROM " . SEARCH_WORD_TABLE . " 
! 				WHERE word_text IN ($sql_in)";
  			$result = $db->sql_query($sql);
  			if( !$result )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
  			}
  
! 			if( $word_check_count = $db->sql_numrows($result) )
! 			{
! 				$check_words = $db->sql_fetchrowset($result);
  
! 				$word_id_sql = "";
! 				for($i = 0; $i < count($check_words); $i++ )
! 				{
! 					if( $word_id_sql != "" )
! 					{
! 						$word_id_sql .= ", ";
! 					}
! 					$word_id_sql .= $check_words[$i]['word_id'];
! 				}
  
! 				$sql = "SELECT word_id, COUNT(post_id) AS post_occur_count 
! 					FROM " . SEARCH_MATCH_TABLE . "   
! 					WHERE word_id IN ($word_id_sql)  
! 					GROUP BY word_id";
! 				if( !$result = $db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't obtain search word sums", "", __LINE__, __FILE__, $sql);
! 				}
! 
! 				if( $post_count = $db->sql_numrows($result) )
  				{
! 					$rowset = $db->sql_fetchrowset($result);
! 
! 					$word_id_sql = "";
! 					for($i = 0; $i < $post_count; $i++)
  					{
! 						if( $rowset[$i]['post_occur_count'] == 1 )
! 						{
! 							if( $word_id_sql != "" )
! 							{
! 								$word_id_sql .= ", ";
! 							}
! 							$word_id_sql .= $rowset[$i]['word_id'];
! 						}
  					}
  
  					if( $word_id_sql )
  					{
--- 169,255 ----
  		}
  	}
+ 	else
+ 	{
+ 		return 0;
+ 	}
  
! 	return $word_count;
  }
  
! function remove_unmatched_words()
  {
! 	global $db;
  
! 	switch(SQL_LAYER)
  	{
! 		case 'postgresql':
! 			$sql = "DELETE FROM " . SEARCH_WORD_TABLE . " 
! 				WHERE word_id NOT IN ( 
! 					SELECT word_id  
! 					FROM " . SEARCH_MATCH_TABLE . ") 
! 					GROUP BY word_id"; 
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
! 			}
  
! 			$unmatched_count = $db->sql_affectedrows();
  
! 			break;
  
! 		case 'oracle':
! 			$sql = "DELETE FROM " . SEARCH_WORD_TABLE . " 
! 				WHERE word_id IN (
! 					SELECT w.word_id 
! 					FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m 
! 					WHERE w.word_id = m.word_id(+) 
! 						AND m.word_id IS NULL)";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
  			}
  
! 			$unmatched_count = $db->sql_affectedrows();
! 
! 			break;
! 
! 		case 'mssql':
! 		case 'msaccess':
! 			$sql = "DELETE FROM " . SEARCH_WORD_TABLE . " 
! 				WHERE word_id IN ( 
! 					SELECT w.word_id  
! 					FROM " . SEARCH_WORD_TABLE . " w 
! 					LEFT JOIN " . SEARCH_MATCH_TABLE . " m ON m.word_id = w.word_id 
! 					WHERE m.word_id IS NULL)"; 
  			$result = $db->sql_query($sql);
  			if( !$result )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
  			}
  
! 			$unmatched_count = $db->sql_affectedrows();
  
! 			break;
  
! 		case 'mysql':
! 		case 'mysql4':
! 			$sql = "SELECT w.word_id 
! 				FROM " . SEARCH_WORD_TABLE . " w 
! 				LEFT JOIN " . SEARCH_MATCH_TABLE . " m ON m.word_id = w.word_id 
! 				WHERE m.word_id IS NULL"; 
! 			if( $result = $db->sql_query($sql) )
! 			{
! 				if( $unmatched_count = $db->sql_numrows($result) )
  				{
! 					$rowset = array();
! 					while( $row = $db->sql_fetchrow($result) )
  					{
! 						$rowset[] = $row['word_id'];
  					}
  
+ 					$word_id_sql = implode(", ", $rowset);
+ 
  					if( $word_id_sql )
  					{
***************
*** 286,307 ****
  						}
  					}
  				}
! 
! 				$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
! 					WHERE post_id = $post_id";
! 				$result = $db->sql_query($sql); 
! 				if( !$result )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't delete word match entry for this post", "", __LINE__, __FILE__, $sql);
  				}
  			}
! 		}
! 	}
! 	else
! 	{
! 		message_die(GENERAL_ERROR, "Couldn't obtain post text", "", __LINE__, __FILE__, $sql);
  	}
  
! 	return;
  }
  
--- 262,280 ----
  						}
  					}
+ 					else
+ 					{
+ 						return 0;
+ 					}
  				}
! 				else
  				{
! 					return 0;
  				}
  			}
! 
! 			break;
  	}
  
! 	return $unmatched_count;
  }
  
***************
*** 1659,1669 ****
  				if( $delete || $mode == "delete" )
  				{
! 					remove_old_words($post_id);
  
! 					$sql = "DELETE FROM " . POSTS_TEXT_TABLE . "
  						WHERE post_id = $post_id";
! 					if($db->sql_query($sql, BEGIN_TRANSACTION))
  					{
! 						$sql = "DELETE FROM " . POSTS_TABLE . "
  							WHERE post_id = $post_id";
  						if($db->sql_query($sql))
--- 1632,1650 ----
  				if( $delete || $mode == "delete" )
  				{
! 					$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
! 						WHERE post_id = $post_id";
! 					$result = $db->sql_query($sql, BEGIN_TRANSACTION); 
! 					if( !$result )
! 					{
! 						message_die(GENERAL_ERROR, "Couldn't delete word match entry for this post", "", __LINE__, __FILE__, $sql);
! 					}
! 
! 					remove_unmatched_words();
  
! 					$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
  						WHERE post_id = $post_id";
! 					if( $db->sql_query($sql) )
  					{
! 						$sql = "DELETE FROM " . POSTS_TABLE . " 
  							WHERE post_id = $post_id";
  						if($db->sql_query($sql))
***************
*** 1677,1681 ****
  								if( $db->sql_query($sql) )
  								{
! 									$sql = "DELETE FROM " . TOPICS_TABLE . "
  										WHERE topic_id = $topic_id";
  									if( $db->sql_query($sql) )
--- 1658,1662 ----
  								if( $db->sql_query($sql) )
  								{
! 									$sql = "DELETE FROM " . TOPICS_TABLE . " 
  										WHERE topic_id = $topic_id";
  									if( $db->sql_query($sql) )
***************
*** 1883,1892 ****
  			}
  
! 			remove_old_words($post_id);
  
  			$sql = "UPDATE " . POSTS_TABLE . "
  				SET bbcode_uid = '$bbcode_uid', enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . "
  				WHERE post_id = $post_id";
! 			if($db->sql_query($sql, BEGIN_TRANSACTION))
  			{
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
--- 1864,1879 ----
  			}
  
! 			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
! 				WHERE post_id = $post_id";
! 			$result = $db->sql_query($sql, BEGIN_TRANSACTION); 
! 			if( !$result )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't delete word match entry for this post", "", __LINE__, __FILE__, $sql);
! 			}
  
  			$sql = "UPDATE " . POSTS_TABLE . "
  				SET bbcode_uid = '$bbcode_uid', enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . "
  				WHERE post_id = $post_id";
! 			if($db->sql_query($sql))
  			{
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
***************
*** 1898,1902 ****
  					if( $db->sql_query($sql) )
  					{
! 						add_search_words($post_id, stripslashes($post_message));
  
  						//
--- 1885,1890 ----
  					if( $db->sql_query($sql) )
  					{
! 						add_search_words($post_id, stripslashes($post_message)); 
! 						remove_unmatched_words();
  
  						//
***************
*** 2021,2026 ****
  				else
  				{
- 					remove_old_words($post_id);
  					add_search_words($post_id, stripslashes($post_message));
  
  					if( $db->sql_query($sql, END_TRANSACTION) )
--- 2009,2014 ----
  				else
  				{
  					add_search_words($post_id, stripslashes($post_message));
+ 					remove_unmatched_words();
  
  					if( $db->sql_query($sql, END_TRANSACTION) )

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** search.php	2001/11/22 02:02:11	1.37
--- search.php	2001/11/23 01:04:31	1.38
***************
*** 89,160 ****
  	return $split_entries[1];
  }
- 
- function arrayintersect($array1, $array2) 
- { 
- 	//
- 	// make sure arguments are actually arrays
- 	//
- 	if( !is_array($array1) || !is_array($array2) )
- 	{
- 		return false; 
- 	}
- 
- 	if( sizeof($array2) > sizeof($array1) ) 
- 	{ 
- 		$temp = $array1; 
- 		$array1 = $array2; 
- 		$array2 = $temp; 
- 		
- 		unset($temp); 
- 	} 
- 
- 	sort($array1); 
- 	rsort($array2); 
- 
- 	// the greatest element in array2 
- 	$eg2 = $array2[0]; 
- 
- 	for($i = 0; $i < sizeof($array1); $i++) 
- 	{ 
- 		$e1 = $array1[$i];
- 
- 		for($j = 0; $j < sizeof($array2); $j++) 
- 		{ 
- 			$e2 = $array2[$j];
- 
- 			if( $e1 > $e2 ) 
- 			{ 
- 				//
- 				// we have passed the match 
- 				//
- 				if( $e2 == $eg2 )
- 				{
- 					break(2); 
- 				}
- 				else
- 				{
- 					break; 
- 				}
- 			} 
- 			else if( $e1 == $e2 ) 
- 			{ 
- 				//
- 				// we found a match 
- 				//
- 				$retArray[] = $e1; 
- 
- 				break; 
- 			} 
- 		} 
- 	} 
- 	return $retArray; 
- }
- 
- function inarray($needle, $haystack) 
- { 
- 	for($i = 0; $i < count($haystack) && $haystack[$i] != $needle; $i++); 
- 
- 	return ( $i != count($haystack) ); 
- }
  //
  // End of functions defns
--- 89,92 ----
***************
*** 353,357 ****
--- 285,291 ----
  		$split_search = split_words($cleaned_search);
  
+ 		$word_count = 0;
  		$word_match = array();
+ 		$result_list = array();
  		$current_match_type = "and";
  
***************
*** 377,395 ****
  				}
  
! 				$word_match[$current_match_type][] = $split_search[$i];
! 			}
! 		}
  
- 		@reset($word_match);
- 
- 		$word_count = 0;
- 		$result_list = array();
- 
- 		while( list($match_type, $match_word_list) = each($word_match) )
- 		{
- 			for($i = 0; $i < count($match_word_list); $i++ )
- 			{
- 				$match_word = str_replace("*", "%", $match_word_list[$i]);
- 
  				$sql = "SELECT m.post_id  
  					FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m 
--- 311,316 ----
  				}
  
! 				$match_word = str_replace("*", "%", $split_search[$i]);
  
  				$sql = "SELECT m.post_id  
  					FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m 
***************
*** 400,446 ****
  				if( !$result )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't matched posts", "", __LINE__, __FILE__, $sql);
  				}
  
  				$row = array();
- 
  				while( $temp_row = $db->sql_fetchrow($result) )
  				{
  					$row['' . $temp_row['post_id'] . ''] = 1;
- 				}
  
- 				@reset($row);
- 
- 				while( list($post_id, $match_count) = each($row) )
- 				{
  					if( !$word_count )
  					{
! 						$result_list['' . $post_id . ''] = $match_count;
  					}
! 					else if( $match_type == "and" )
  					{
! 						$result_list['' . $post_id . ''] = ( $result_list['' . $post_id . ''] ) ? $result_list['' . $post_id . ''] + intval($match_count) : 0;
! 					}
! 					else if( $match_type == "or" )
! 					{
! 						if(  $result_list['' . $post_id . ''] )
! 						{
! 							$result_list['' . $post_id . ''] += intval($match_count);
! 						}
! 						else
! 						{
! 							$result_list['' . $post_id . ''] = 0;
! 							$result_list['' . $post_id . ''] += intval($match_count);
! 						}
  					}
! 					else if( $match_type == "not" )
  					{
! 						$result_list['' . $post_id . ''] = 0;
  					}
  				}
  
! 				if( $match_type == "and" && $word_count )
  				{
- 					@reset($row);
  					@reset($result_list);
  
--- 321,348 ----
  				if( !$result )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't obtain matched posts list", "", __LINE__, __FILE__, $sql);
  				}
  
  				$row = array();
  				while( $temp_row = $db->sql_fetchrow($result) )
  				{
  					$row['' . $temp_row['post_id'] . ''] = 1;
  
  					if( !$word_count )
  					{
! 						$result_list['' . $temp_row['post_id'] . ''] = 1;
  					}
! 					else if( $current_match_type == "or" )
  					{
! 						$result_list['' . $temp_row['post_id'] . ''] = 1;
  					}
! 					else if( $current_match_type == "not" )
  					{
! 						$result_list['' . $temp_row['post_id'] . ''] = 0;
  					}
  				}
  
! 				if( $current_match_type == "and" && $word_count )
  				{
  					@reset($result_list);
  
***************
*** 495,520 ****
  			else
  			{
! 				$sql = "SELECT topic_id 
! 					FROM " . POSTS_TABLE . " 
! 					WHERE post_id IN ($sql_post_id_in) 
! 					GROUP BY topic_id";
! 				$result = $db->sql_query($sql); 
! 				if( !$result )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't matched posts", "", __LINE__, __FILE__, $sql);
! 				}
  
! 				$sql_post_id_in = "";
! 				while( $row = $db->sql_fetchrow($result) )
! 				{
! 					if( $sql_post_id_in != "" )
! 					{
! 						$sql_post_id_in .= ", ";
! 					}
! 					$sql_post_id_in .= $row['topic_id'];
! 				}
  
! 				$search_sql .= "t.topic_id IN ($sql_post_id_in) ";
! 		
  			}		
  		}
--- 397,436 ----
  			else
  			{
! 				switch(SQL_LAYER)
  				{
! 					case 'mysql':
! 					case 'mysql4':
! 						$sql = "SELECT topic_id 
! 							FROM " . POSTS_TABLE . " 
! 							WHERE post_id IN ($sql_post_id_in) 
! 							GROUP BY topic_id";
! 						$result = $db->sql_query($sql); 
! 						if( !$result )
! 						{
! 							message_die(GENERAL_ERROR, "Couldn't matched posts", "", __LINE__, __FILE__, $sql);
! 						}
  
! 						$sql_post_id_in = "";
! 						while( $row = $db->sql_fetchrow($result) )
! 						{
! 							if( $sql_post_id_in != "" )
! 							{
! 								$sql_post_id_in .= ", ";
! 							}
! 							$sql_post_id_in .= $row['topic_id'];
! 						}
  
! 						$search_sql .= "t.topic_id IN ($sql_post_id_in) ";
! 
! 						break;
! 
! 					default:
! 						$search_sql .= "t.topic_id IN ( 
! 							SELECT topic_id 
! 							FROM " . POSTS_TABLE . " 
! 							WHERE post_id IN ($sql_post_id_in) 
! 							GROUP BY topic_id )";
! 						break;
! 				}
  			}		
  		}
***************
*** 612,620 ****
  
  			$total_match_count = $db->sql_numrows($result);
! /*			if( $total_match_count > 500 )
! 			{
! 				message_die(GENERAL_MESSAGE, $lang['Too_many_results']);//"Your search returned too many matches, refine your search criteria and try again";
! 			}
! */
  			$searchset = $db->sql_fetchrowset($result);
  
--- 528,532 ----
  
  			$total_match_count = $db->sql_numrows($result);
! 
  			$searchset = $db->sql_fetchrowset($result);
  
***************
*** 869,877 ****
  				if($return_chars != 0 )
  				{
! 					if($return_chars != -1)
! 					{
! 						$message = (strlen($message) > $return_chars) ? substr($message, 0, $return_chars) . " ..." : $message;
! 					}
! 		
  					//
  					// If the board has HTML off but the post has HTML
--- 781,786 ----
  				if($return_chars != 0 )
  				{
! 					$bbcode_uid = $searchset[$i]['bbcode_uid'];
! 
  					//
  					// If the board has HTML off but the post has HTML
***************
*** 880,891 ****
  					if( $return_chars != -1 )
  					{
! 						$message = preg_replace("#<([\/]?.*?)>#is", "&lt;\\1&gt;", $message);
! 						$message = preg_replace("/[img\:[0-9a-z\:]+\].*?\[\/img\:[0-9a-z\:]+\]/si", "", $message);
! 						$message = preg_replace("/[\/[a-z\*]+\:[0-9a-z\:]+\]/si", "", $message);
  					}
  					else
  					{
- 						$bbcode_uid = $searchset[$i]['bbcode_uid'];
- 
  						$user_sig = $searchset[$i]['user_sig'];
  						$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
--- 789,799 ----
  					if( $return_chars != -1 )
  					{
! 						$message = (strlen($message) > $return_chars) ? substr($message, 0, $return_chars) . " ..." : $message;
! 						$message = strip_tags($message);
! 						$message = preg_replace("/\[.*?:$bbcode_uid:?.*?\]/si", "", $message);
! 						$message = preg_replace("/\[url\]|\[\/url\]/si", "", $message);
  					}
  					else
  					{
  						$user_sig = $searchset[$i]['user_sig'];
  						$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
***************
*** 965,969 ****
  			{
  				$message = "";
- 
  
  				if( count($orig_word) )
--- 873,876 ----

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

From: Paul S. O. <ps...@us...> - 2001-11-23 01:01:04

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

Modified Files:
	lang_admin.php 
Log Message:
Module and module function names now pulled from lang file

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** lang_admin.php	2001/11/21 03:10:10	1.8
--- lang_admin.php	2001/11/23 01:01:01	1.9
***************
*** 26,29 ****
--- 26,56 ----
  
  //
+ // Modules, this replaces the keys used
+ // in the modules[][] arrays in each module file
+ //
+ $lang['General'] = "General Admin";
+ $lang['Users'] = "User Admin";
+ $lang['Groups'] = "Group Admin";
+ $lang['Forums'] = "Forum Admin";
+ $lang['Styles'] = "Styles Admin";
+ 
+ $lang['Configuration'] = "Configuration";
+ $lang['Permissions'] = "Permissions";
+ $lang['Manage'] = "Manage";
+ $lang['Disallow'] = "Disallowed words";
+ $lang['Prune'] = "Pruning";
+ $lang['Mass_Email'] = "Send Bulk Email";
+ $lang['Ranks'] = "Ranks";
+ $lang['Smilies'] = "Smilies";
+ $lang['Ban_Management'] = "Ban Control";
+ $lang['Word_Censor'] = "Word Censoring";
+ $lang['Export'] = "Export";
+ $lang['Create_new'] = "Create";
+ $lang['Add_new'] = "Add";
+ $lang['Backup_DB'] = "Backup Database";
+ $lang['Restore_DB'] = "Restore Database";
+ 
+ 
+ //
  // Index
  //

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

From: Paul S. O. <ps...@us...> - 2001-11-23 01:01:03

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

Modified Files:
	index.php 
Log Message:
Module and module function names now pulled from lang file

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** index.php	2001/11/21 16:54:13	1.26
--- index.php	2001/11/23 01:01:01	1.27
***************
*** 25,28 ****
--- 25,29 ----
  //
  $phpbb_root_dir = "./../";
+ 
  $no_page_header = TRUE;
  require('pagestart.inc');
***************
*** 63,72 ****
--- 64,79 ----
  	);
  
+ 	ksort($module);
+ 
  	while( list($cat, $action_array) = each($module) )
  	{
+ 		$cat = $lang[$cat];
+ 
  		$template->assign_block_vars("catrow", array(
  			"ADMIN_CATEGORY" => $cat)
  		);
  
+ 		ksort($action_array);
+ 
  		$row_count = 0;
  		while( list($action, $file)	= each($action_array) )
***************
*** 75,79 ****
  			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 			$action = preg_replace("'_'", " ", $action);
  
  			$template->assign_block_vars("catrow.modulerow", array(
--- 82,86 ----
  			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 			$action = $lang[$action];
  
  			$template->assign_block_vars("catrow.modulerow", array(

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

From: Paul S. O. <ps...@us...> - 2001-11-23 00:36:11

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

Modified Files:
	mysql_basic.sql postgres_basic.sql postgres_schema.sql 
Log Message:
Updated and inline with MySQL - PostgreSQL fine under 7.1.2

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mysql_basic.sql	2001/11/20 22:28:41	1.1
--- mysql_basic.sql	2001/11/23 00:36:07	1.2
***************
*** 37,42 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username','');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password','');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15');
--- 37,40 ----
***************
*** 48,53 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_admin_style','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
--- 46,51 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_lang','english');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
***************
*** 66,78 ****
  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
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( '-1', 'Anonymous', '0', '', '', '', '', '', '', '', '', '', '', '0', '0', '', '', '', '', '', '', '', '0', '0', '1', '', '', '', '', '', '', '', '', '0', '0');
  
! # username: admin    password: admin (change this or remove it once everything is working!)
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( '2', 'Admin', '1', '', '', '', 'ad...@yo...', '', '', '', '', '', '', '1', '1', '', '', '', '1', '0', '1', '0', '1', '1', '1', '1', '1', '', '', '0', 'd M Y h:i a', '', '', '0', '1');
  
  
  # -- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '1', 'Site Admin', '-1', '-1', '1', '');
  
  # -- Groups
--- 64,78 ----
  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
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', '', '', '', '', 0, 0);
  
! # -- username: admin    password: admin (change this or remove it once everything is working!)
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', '', 'ad...@yo...', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);
  
  
  # -- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, -1, 1, NULL);
! 
  
  # -- Groups
***************
*** 91,147 ****
  
  # -- Demo Post
! INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, '972086460', '', '7F000001');
! INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, '', 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');
  
  
  # -- Themes
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1,'subSilver','subSilver','','','E5E5E5','000000','006699','5584AA','FF9933','EDF2F2','EFEFEF','DEE3E7','c2cdd6','','','','CBD3D9','BCBCBC','1B7CAD','','','','AEBDC4','006699','FFFFFF','row1','row2','','Verdana,Arial,Helvetica,sans-serif','Verdana,Arial,Helvetica,sans-serif','courier','','','','004c75','004c75','004c75','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (2,'PSO [ Wheat ] ','PSO','','','FFFFFF','000000','002266','004411','','','','','','','','','001100','E5CCA5','D4A294','','','','EBE4D9','DAD1C4','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (3,'PSO [ Ocean ]','PSO','','','DFF5FF','000000','011001','2100cc','','','','','','','','','000000','A7C1CB','7897A8','','','','83D7CC','A0CCE0','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'','','','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (4,'PSO [ Blue ]','PSO','','','FFFFFF','000000','417FB9','4E6172','0000AA','','','','','','','','000000','90BAE2','5195D4','','','','cde3f2','daedFd','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (5,'PSO [ Cool Midnight ]','PSO', '','','444444','ECECEC','EDF2F2','DDEDED','FFFFFF','EDF2F2','','','','','','','000000','80707F','66555F','','','','60707D','667A80','','row1','row2','','Verdana,serif','Arial,Helvetica,sans-serif','courier',NULL,NULL,NULL,'ECECEC','ECECEC','ECECEC','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (6,'PSO [ Pastel Purple ]','PSO','','','FFFFFF','000000','445588','337744','','','','','','','','','CCCCDD','CCCCDD','DDDDEE','','','','EFEFEF','FEFEFE','','row1','row2','','Verdana,serif','Arial,Helvetica,sans-serif','courier',1,2,3,'','','0000EE','','','');
  
  
  # -- Smilies
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '1', ':D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '2', ':-D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '3', ':grin:', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '4', ':)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '5', ':-)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '6', ':smile:', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '7', ':(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '8', ':-(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '9', ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '10', ':o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '11', ':-o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '12', ':eek:', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '13', ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '14', ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '15', ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '16', '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '17', '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '18', ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '19', ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '20', ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '21', ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '22', ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '23', ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '24', ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '25', ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '26', ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '27', ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '28', ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '29', ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '30', ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '31', ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '32', ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '33', ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '34', ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '35', ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '36', ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '37', ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '38', ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '39', ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '40', ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '41', ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
--- 91,177 ----
  
  # -- Demo Post
! INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, 972086460, NULL, '7F000001');
! INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, NULL, 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');
  
  
  # -- Themes
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', NULL, NULL, 'E5E5E5', '000000', '006699', '5584AA', 'FF9933', 'EDF2F2', 'EFEFEF', 'DEE3E7', 'c2cdd6', NULL, NULL, NULL, 'CBD3D9', 'BCBCBC', '1B7CAD', NULL, NULL, NULL, 'AEBDC4', '006699', 'FFFFFF', 'row1', 'row2', NULL, 'Verdana, Arial, Helvetica, sans-serif', 'Verdana, Arial, Helvetica, sans-serif', 'courier', NULL, NULL, NULL, '004c75', '004c75', '004c75', NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (2, 'PSO [ Wheat ] ', 'PSO', NULL, NULL, 'FFFFFF', '000000', '002266', '004411', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '001100', 'E5CCA5', 'D4A294', NULL, NULL, NULL, 'EBE4D9', 'DAD1C4', NULL, 'row1', 'row2', NULL, 'verdana, serif', 'arial, helvetica', 'courier', 1, 2, 3, '000000', NULL, NULL, NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (3, 'PSO [ Ocean ]', 'PSO', NULL, NULL, 'DFF5FF', '000000', '011001', '2100cc', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '000000', 'A7C1CB', '7897A8', NULL, NULL, NULL, '83D7CC', 'A0CCE0', NULL, 'row1', 'row2', NULL, 'verdana, serif', 'arial, helvetica', 'courier', 1, 2, 3, NULL, NULL, NULL, NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (4, 'PSO [ Blue ]', 'PSO', NULL, NULL, 'FFFFFF', '000000', '417FB9', '4E6172', '0000AA', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '000000', '90BAE2', '5195D4', NULL, NULL, NULL, 'cde3f2', 'daedFd', NULL, 'row1', 'row2', NULL, 'verdana, serif', 'arial, helvetica', 'courier', 1, 2, 3, '000000', NULL, NULL, NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (5, 'PSO [ Cool Midnight ]', 'PSO', NULL, NULL, '444444', 'ECECEC', 'EDF2F2', 'DDEDED', 'FFFFFF', 'EDF2F2', NULL, NULL, NULL, NULL, NULL, NULL, '000000', '80707F', '66555F', NULL, NULL, NULL, '60707D', '667A80', NULL, 'row1', 'row2', NULL, 'Verdana, serif', 'Arial, Helvetica, sans-serif', 'courier', 1, 2, 3, 'ECECEC', 'ECECEC', 'ECECEC', NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (6, 'PSO [ Pastel Purple ]', 'PSO', NULL, NULL, 'FFFFFF', '000000', '445588', '337744', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'CCCCDD', 'CCCCDD', 'DDDDEE', NULL, NULL, NULL, 'EFEFEF', 'FEFEFE', NULL, 'row1', 'row2', NULL, 'Verdana, serif', 'Arial, Helvetica, sans-serif', 'courier', 1, 2, 3, NULL, NULL, '0000EE', NULL, NULL, NULL);
  
  
  # -- Smilies
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 3, ':grin:', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 4, ':)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 5, ':-)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 6, ':smile:', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 7, ':(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
! 
! 
! # -- wordlist
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 1, 'example', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 2, 'post', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 3, 'phpbb', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 4, 'installation', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 5, 'may', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 6, 'delete', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 7, 'topic', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 8, 'forum', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 9, 'since', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 10, 'everything', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 11, 'seems', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 12, 'working', 0 );
! 
! 
! # -- wordmatch
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 1, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 2, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 4, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 5, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 6, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 7, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 8, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 9, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 10, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 11, 1, 0 );
! INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 12, 1, 0 );

Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** postgres_basic.sql	2001/11/20 22:28:41	1.1
--- postgres_basic.sql	2001/11/23 00:36:08	1.2
***************
*** 6,13 ****
  
  -- Config
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb2postgres');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain','');
--- 6,14 ----
  
  -- Config
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('config_id','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb2mysql');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain','');
***************
*** 22,27 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_theme_create','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15');
--- 23,28 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_theme_create','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15');
***************
*** 37,42 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username','');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password','');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15');
--- 38,41 ----
***************
*** 48,56 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_admin_style','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1'); 
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); 
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
--- 47,55 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_lang','english');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); 
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
***************
*** 64,80 ****
  
  -- 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, nothing special here.', 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 3, 3, 3);
  
- 
  -- Users
! INSERT INTO phpbb_users (user_id, user_active, username, user_password, user_autologin_key, user_level, user_timezone, user_dateformat, user_style, user_lang, user_viewemail, user_attachsig, user_allowhtml, user_allowbbcode, user_allowsmile, user_allowavatar, user_allow_pm, user_allow_viewonline, user_notify_pm, user_regdate, user_rank, user_avatar, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_aim, user_yim, user_msnm, user_posts, user_actkey, user_newpasswd, user_notify) VALUES (-1,1,'Anonymous','','','','','','','','','','',1,1,'','',1,'','','','','','','','','','','',NULL,'','','',60,'','','');
  
! -- username: admin password: admin (change this or remove it once everything is working!)
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES (2, 'Admin', 1, '', '21232f297a57a5a743894a0e4a801fc3', '', 'ad...@yo...', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, '', '', 0, 'd M Y h:i a', '', '', 0, 1);
  
  
  -- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '1', 'Site Admin', '-1', '-1', '1', '');
! 
  
  -- Groups
--- 63,77 ----
  
  -- 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
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', '', '', '', '', 0, 0);
  
! -- username: admin    password: admin (change this or remove it once everything is working!)
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', '', 'ad...@yo...', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);
  
  
  -- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, -1, 1, NULL);
  
  -- Groups
***************
*** 89,149 ****
  
  -- Demo Topic
! INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_last_post_id) VALUES (1, 'Welcome to phpBB 2', 2, date_part('EPOCH', TIMESTAMP 'now'), 0, 0, 1, 0, 0, 1);
  
  
  -- Demo Post
! INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, date_part('EPOCH', TIMESTAMP 'now'), '', '7F000001');
! INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, '', 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');
  
  
  -- Themes
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1,'subSilver','subSilver','','','E5E5E5','000000','006699','5584AA','FF9933','EDF2F2','EFEFEF','DEE3E7','c2cdd6','','','','CBD3D9','BCBCBC','1B7CAD','','','','AEBDC4','006699','FFFFFF','row1','row2','','Verdana,Arial,Helvetica,sans-serif','Verdana,Arial,Helvetica,sans-serif','courier','','','','004c75','004c75','004c75','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (2,'PSO [ Wheat ] ','PSO','','','FFFFFF','000000','002266','004411','','','','','','','','','001100','E5CCA5','D4A294','','','','EBE4D9','DAD1C4','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (3,'PSO [ Ocean ]','PSO','','','DFF5FF','000000','011001','2100cc','','','','','','','','','000000','A7C1CB','7897A8','','','','83D7CC','A0CCE0','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'','','','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (4,'PSO [ Blue ]','PSO','','','FFFFFF','000000','417FB9','4E6172','0000AA','','','','','','','','000000','90BAE2','5195D4','','','','cde3f2','daedFd','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (5,'PSO [ Cool Midnight ]','PSO', '','','444444','ECECEC','EDF2F2','DDEDED','FFFFFF','EDF2F2','','','','','','','000000','80707F','66555F','','','','60707D','667A80','','row1','row2','','Verdana,serif','Arial,Helvetica,sans-serif','courier',NULL,NULL,NULL,'ECECEC','ECECEC','ECECEC','','','');
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (6,'PSO [ Pastel Purple ]','PSO','','','FFFFFF','000000','445588','337744','','','','','','','','','CCCCDD','CCCCDD','DDDDEE','','','','EFEFEF','FEFEFE','','row1','row2','','Verdana,serif','Arial,Helvetica,sans-serif','courier',1,2,3,'','','0000EE','','','');
  
  
  -- Smilies
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '1', ':D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '2', ':-D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '3', ':grin:', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '4', ':)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '5', ':-)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '6', ':smile:', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '7', ':(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '8', ':-(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '9', ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '10', ':o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '11', ':-o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '12', ':eek:', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '13', ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '14', ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '15', ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '16', '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '17', '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '18', ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '19', ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '20', ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '21', ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '22', ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '23', ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '24', ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '25', ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '26', ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '27', ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '28', ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '29', ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '30', ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '31', ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '32', ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '33', ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '34', ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '35', ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '36', ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '37', ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '38', ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '39', ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '40', ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '41', ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
--- 86,176 ----
  
  -- Demo Topic
! INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_vote, topic_last_post_id) VALUES (1, 'Welcome to phpBB 2', 2, '972086460', 0, 0, 1, 0, 0, 0, 1);
  
  
  -- Demo Post
! INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, 972086460, NULL, '7F000001');
! INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, NULL, 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');
  
  
  -- Themes
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', NULL, NULL, 'E5E5E5', '000000', '006699', '5584AA', 'FF9933', 'EDF2F2', 'EFEFEF', 'DEE3E7', 'c2cdd6', NULL, NULL, NULL, 'CBD3D9', 'BCBCBC', '1B7CAD', NULL, NULL, NULL, 'AEBDC4', '006699', 'FFFFFF', 'row1', 'row2', NULL, 'Verdana, Arial, Helvetica, sans-serif', 'Verdana, Arial, Helvetica, sans-serif', 'courier', NULL, NULL, NULL, '004c75', '004c75', '004c75', NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (2, 'PSO [ Wheat ] ', 'PSO', NULL, NULL, 'FFFFFF', '000000', '002266', '004411', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '001100', 'E5CCA5', 'D4A294', NULL, NULL, NULL, 'EBE4D9', 'DAD1C4', NULL, 'row1', 'row2', NULL, 'verdana, serif', 'arial, helvetica', 'courier', 1, 2, 3, '000000', NULL, NULL, NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (3, 'PSO [ Ocean ]', 'PSO', NULL, NULL, 'DFF5FF', '000000', '011001', '2100cc', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '000000', 'A7C1CB', '7897A8', NULL, NULL, NULL, '83D7CC', 'A0CCE0', NULL, 'row1', 'row2', NULL, 'verdana, serif', 'arial, helvetica', 'courier', 1, 2, 3, NULL, NULL, NULL, NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (4, 'PSO [ Blue ]', 'PSO', NULL, NULL, 'FFFFFF', '000000', '417FB9', '4E6172', '0000AA', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '000000', '90BAE2', '5195D4', NULL, NULL, NULL, 'cde3f2', 'daedFd', NULL, 'row1', 'row2', NULL, 'verdana, serif', 'arial, helvetica', 'courier', 1, 2, 3, '000000', NULL, NULL, NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (5, 'PSO [ Cool Midnight ]', 'PSO', NULL, NULL, '444444', 'ECECEC', 'EDF2F2', 'DDEDED', 'FFFFFF', 'EDF2F2', NULL, NULL, NULL, NULL, NULL, NULL, '000000', '80707F', '66555F', NULL, NULL, NULL, '60707D', '667A80', NULL, 'row1', 'row2', NULL, 'Verdana, serif', 'Arial, Helvetica, sans-serif', 'courier', 1, 2, 3, 'ECECEC', 'ECECEC', 'ECECEC', NULL, NULL, NULL);
! INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (6, 'PSO [ Pastel Purple ]', 'PSO', NULL, NULL, 'FFFFFF', '000000', '445588', '337744', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'CCCCDD', 'CCCCDD', 'DDDDEE', NULL, NULL, NULL, 'EFEFEF', 'FEFEFE', NULL, 'row1', 'row2', NULL, 'Verdana, serif', 'Arial, Helvetica, sans-serif', 'courier', 1, 2, 3, NULL, NULL, '0000EE', NULL, NULL, NULL);
  
  
  -- Smilies
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 3, ':grin:', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 4, ':)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 5, ':-)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 6, ':smile:', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 7, ':(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
! 
! 
! -- wordlist
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 1, 'example', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 2, 'post', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 3, 'phpbb', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 4, 'installation', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 5, 'may', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 6, 'delete', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 7, 'topic', 0 );
! INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 8, 'forum', 0 );
! INSERT INTO phpbb_search_wor...
 
[truncated message content]

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.71,1.72

From: Paul S. O. <ps...@us...> - 2001-11-22 15:55:10

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

Modified Files:
	page_header.php 
Log Message:
More updates

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** page_header.php	2001/11/22 15:39:36	1.71
--- page_header.php	2001/11/22 15:55:07	1.72
***************
*** 230,234 ****
  	"FOLDER_NEW_IMG" => $images['folder_new'],
  	"FOLDER_HOT_IMG" => $images['folder_hot'],
! 	"FOLDER_HOT_NEW_IMG" => $images['folder_new_hot'],
  	"FOLDER_LOCKED_IMG" => $images['folder_locked'],
  	"FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],
--- 230,234 ----
  	"FOLDER_NEW_IMG" => $images['folder_new'],
  	"FOLDER_HOT_IMG" => $images['folder_hot'],
! 	"FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'],
  	"FOLDER_LOCKED_IMG" => $images['folder_locked'],
  	"FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],

[Phpbb-checkins] CVS: phpBB2/templates/PSO PSO.cfg,1.13,1.14

From: Paul S. O. <ps...@us...> - 2001-11-22 15:55:10

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

Modified Files:
	PSO.cfg 
Log Message:
More updates

Index: PSO.cfg
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/PSO.cfg,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** PSO.cfg	2001/11/22 15:45:54	1.13
--- PSO.cfg	2001/11/22 15:55:07	1.14
***************
*** 38,42 ****
  $images['folder_new'] = "images/folder_new.gif";
  $images['folder_hot'] = "images/folder_hot.gif";
! $images['folder_new_hot'] = "images/folder_new_hot.gif";
  $images['folder_locked'] = "images/folder_lock.gif";
  $images['folder_locked_new'] = "images/folder_lock_new.gif";
--- 38,42 ----
  $images['folder_new'] = "images/folder_new.gif";
  $images['folder_hot'] = "images/folder_hot.gif";
! $images['folder_hot_new'] = "images/folder_new_hot.gif";
  $images['folder_locked'] = "images/folder_lock.gif";
  $images['folder_locked_new'] = "images/folder_lock_new.gif";

[Phpbb-checkins] CVS: phpBB2/templates/PSO PSO.cfg,1.12,1.13

From: Paul S. O. <ps...@us...> - 2001-11-22 15:45:56

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

Modified Files:
	PSO.cfg 
Log Message:
More updates

Index: PSO.cfg
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/PSO.cfg,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** PSO.cfg	2001/10/01 23:22:18	1.12
--- PSO.cfg	2001/11/22 15:45:54	1.13
***************
*** 40,43 ****
--- 40,44 ----
  $images['folder_new_hot'] = "images/folder_new_hot.gif";
  $images['folder_locked'] = "images/folder_lock.gif";
+ $images['folder_locked_new'] = "images/folder_lock_new.gif";
  $images['folder_sticky'] = "images/folder_sticky.gif";
  $images['folder_sticky_new'] = "images/folder_sticky_new.gif";

[Phpbb-checkins] CVS: phpBB2/images folder_lock_new.gif,NONE,1.1

From: Paul S. O. <ps...@us...> - 2001-11-22 15:40:23

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

Added Files:
	folder_lock_new.gif 
Log Message:
New image for PSO ... must move these into the template directory at some point

--- NEW FILE ---
GIF89a

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.70,1.71

From: Paul S. O. <ps...@us...> - 2001-11-22 15:39:38

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

Modified Files:
	page_header.php 
Log Message:
Minor update to an icon image name

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** page_header.php	2001/11/21 16:00:04	1.70
--- page_header.php	2001/11/22 15:39:36	1.71
***************
*** 230,234 ****
  	"FOLDER_NEW_IMG" => $images['folder_new'],
  	"FOLDER_HOT_IMG" => $images['folder_hot'],
! 	"FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'],
  	"FOLDER_LOCKED_IMG" => $images['folder_locked'],
  	"FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],
--- 230,234 ----
  	"FOLDER_NEW_IMG" => $images['folder_new'],
  	"FOLDER_HOT_IMG" => $images['folder_hot'],
! 	"FOLDER_HOT_NEW_IMG" => $images['folder_new_hot'],
  	"FOLDER_LOCKED_IMG" => $images['folder_locked'],
  	"FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],

[Phpbb-checkins] CVS: phpBB2/templates/PSO privmsgs_popup.tpl,NONE,1.1 profile_add_body.tpl,1.19,1.20 profile_avatar_gallery.tpl,1.1,1.2 viewtopic_body.tpl,1.20,1.21 viewforum_body.tpl,1.22,1.23 overall_header.tpl,1.21,1.22

From: Paul S. O. <ps...@us...> - 2001-11-22 15:39:15

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

Modified Files:
	profile_add_body.tpl profile_avatar_gallery.tpl 
	viewtopic_body.tpl viewforum_body.tpl overall_header.tpl 
Added Files:
	privmsgs_popup.tpl 
Log Message:
More updates

--- NEW FILE ---

<script language="javascript" type="text/javascript">
<!--
function jump_to_inbox()
{
	opener.document.location.href = "{U_PRIVATEMSGS}";
	window.close();
}
//-->
</script>

<table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
	<tr>
		<td class="tablebg"><table width="100%" border="0" cellspacing="1" cellpadding="3">
			<tr>
				<td valign="top" class="row1" align="center"><br /><span class="gen">{L_MESSAGE}</span><br /><br /><span class="gensmall"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td>
			</tr>
		</table></td>
	</tr>
</table>

Index: profile_add_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/profile_add_body.tpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** profile_add_body.tpl	2001/09/09 23:22:02	1.19
--- profile_add_body.tpl	2001/11/22 15:39:11	1.20
***************
*** 2,10 ****
  <form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
  	<tr>
! 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
  	</tr>
  </table>
  
! <table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
  	<tr>
  		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
--- 2,10 ----
  <form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
  	<tr>
! 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
  	</tr>
  </table>
  
! <table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
  	<tr>
  		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
***************
*** 87,90 ****
--- 87,94 ----
  			</tr>
  			<tr>
+ 				<td class="row1"><span class="gen">{L_POPUP_ON_PRIVMSG}:</span><br /><span class="gensmall">{L_POPUP_ON_PRIVMSG_EXPLAIN}</span></td>
+ 				<td class="row2"><input type="radio" name="popup_pm" value="1" {POPUP_PM_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="popup_pm" value="0" {POPUP_PM_NO} /> <span class="gen">{L_NO}</span></td>
+ 			</tr>
+ 			<tr>
  				<td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td>
  				<td class="row2"><input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> <span class="gen">{L_NO}</span></td>
***************
*** 149,158 ****
  			<tr>
  				<td class="row1"><span class="gen">{L_AVATAR_GALLERY}:</span></td>
! 				<td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}" /></td>
  			</tr>
  			<!-- END avatargallery -->
  			<!-- END avatarblock -->
  			<tr>
! 			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></td>
  			</tr>
  		</table></td>
--- 153,162 ----
  			<tr>
  				<td class="row1"><span class="gen">{L_AVATAR_GALLERY}:</span></td>
! 				<td class="row2"><input class="liteoptiontable" type="submit" name="avatargallery" value="{L_SHOW_GALLERY}" /></td>
  			</tr>
  			<!-- END avatargallery -->
  			<!-- END avatarblock -->
  			<tr>
! 			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="liteoptiontable" type="reset" value="{L_RESET}" /></td>
  			</tr>
  		</table></td>

Index: profile_avatar_gallery.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/profile_avatar_gallery.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** profile_avatar_gallery.tpl	2001/11/20 02:20:24	1.1
--- profile_avatar_gallery.tpl	2001/11/22 15:39:11	1.2
***************
*** 1,37 ****
  
  <form action="{S_PROFILE_ACTION}" method="post">
- <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-   <tr> 
- 	<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
-   </tr>
- </table>
  
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
! 	<tr> 
! 	  <th class="thHead" colspan="{S_COLSPAN}" height="25" valign="middle">{L_AVATAR_GALLERY}</th>
! 	</tr>
! 	<tr> 
! 	  <td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_CATEGORY}:&nbsp;<select name="avatarcategory">{S_OPTIONS_CATEGORIES}</select>&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="avatargallery" /></span></td>
! 	</tr>
! 	<!-- BEGIN avatar_row -->
! 	<tr> 
! 	<!-- BEGIN avatar_column -->
! 		<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" /></td>
! 	<!-- END avatar_column -->
! 	</tr>
  	<tr>
! 	<!-- BEGIN avatar_option_column -->
! 		<td class="row2" align="center"><input type="radio" name="avatarselect" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
! 	<!-- END avatar_option_column -->
  	</tr>
  
! 	<!-- END avatar_row -->
! 	<tr> 
! 	  <td class="catBottom" colspan="{S_COLSPAN}" align="center" height="28">{S_HIDDEN_FIELDS} 
! 		<input type="submit" name="submitavatar" value="{L_SELECT_AVATAR}" class="mainoption" />
! 		&nbsp;&nbsp; 
! 		<input type="submit" name="cancelavatar" value="{L_RETURN_PROFILE}" class="liteoption" />
! 	  </td>
  	</tr>
!   </table>
! </form>
--- 1,36 ----
  
  <form action="{S_PROFILE_ACTION}" method="post">
  
! <table width="98%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr>
! 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
  	</tr>
+ </table>
  
! <table width="98%" cellspacing="0" cellpadding="0" border="0" align="center">
! 	<tr>
! 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
! 			<tr>
! 				<td class="cat" colspan="{S_COLSPAN}" align="center"><span class="cattitle">{L_AVATAR_GALLERY}</span></td>
! 			</tr>
! 			<tr>
! 				<th colspan="6">{L_CATEGORY}:&nbsp;<select name="avatarcategory">{S_OPTIONS_CATEGORIES}</select>&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="avatargallery" /></td>
! 			</tr>
! 			<!-- BEGIN avatar_row -->
! 			<tr> 
! 			<!-- BEGIN avatar_column -->
! 				<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" /></td>
! 			<!-- END avatar_column -->
! 			</tr>
! 			<tr>
! 			<!-- BEGIN avatar_option_column -->
! 				<td class="row2" align="center"><input type="radio" name="avatarselect" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
! 			<!-- END avatar_option_column -->
! 			</tr>
! 			<!-- END avatar_row -->
! 			<tr> 
! 				<td class="cat" colspan="{S_COLSPAN}" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submitavatar" value="{L_SELECT_AVATAR}" class="mainoptiontable" />&nbsp;&nbsp;<input type="submit" name="cancelavatar" value="{L_RETURN_PROFILE}" class="liteoptiontable" /></td>
! 			</tr>
! 		</table></td>
  	</tr>
! </table></form>

Index: viewtopic_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/viewtopic_body.tpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** viewtopic_body.tpl	2001/11/20 02:20:24	1.20
--- viewtopic_body.tpl	2001/11/22 15:39:11	1.21
***************
*** 33,39 ****
  		</table></td>
  	</tr>
- 	<tr>
- 		<td><img src="images/spacer.gif" height="4" /></td>
- 	</tr>
  </table>
  
--- 33,36 ----
***************
*** 76,89 ****
  		</table></td>
  	</tr>
- 	<tr>
- 		<td><img src="images/spacer.gif" height="2" /></td>
- 	</tr>
  </table>
  <!-- END postrow -->
  
  <table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
- 	<tr>
- 		<td><img src="images/spacer.gif" height="2" /></td>
- 	</tr>
  	<tr>
  		<td width="100%" class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
--- 73,80 ----

Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/viewforum_body.tpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** viewforum_body.tpl	2001/11/20 02:20:24	1.22
--- viewforum_body.tpl	2001/11/22 15:39:11	1.23
***************
*** 1,5 ****
  <form method="post" action="{S_POST_DAYS_ACTION}"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
  	<tr>
! 		<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> {FORUM_NAME}</span></td>
  		<td align="right" valign="bottom"  nowrap="nowrap"><span class="gensmall">{L_DISPLAY_TOPICS}:&nbsp;{S_SELECT_TOPIC_DAYS}&nbsp;<input type="submit" value="{L_GO}" /></span></td>
  	</tr>
--- 1,6 ----
+ 
  <form method="post" action="{S_POST_DAYS_ACTION}"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
  	<tr>
! 		<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a> -> {FORUM_NAME}</span></td>
  		<td align="right" valign="bottom"  nowrap="nowrap"><span class="gensmall">{L_DISPLAY_TOPICS}:&nbsp;{S_SELECT_TOPIC_DAYS}&nbsp;<input type="submit" value="{L_GO}" /></span></td>
  	</tr>
***************
*** 52,75 ****
  	</tr>
  </table></form>
  
! <table width="98%" cellspacing="2" border="0" align="center">
  	<tr>
! 		<td align="left" valign="top"><table cellspacing="0" border="0">
  			<tr>
! 				<td width="20" align="center"><img src="images/folder_new.gif" alt="{L_NEWPOSTS}" /></td>
! 				<td><span class="gensmall">{L_NEWPOSTS}</span></td>
  				<td>&nbsp;&nbsp;</td>
! 				<td width="20" align="center"><img src="images/folder.gif" alt="{L_NONEWPOSTS}" /></td>
! 				<td><span class="gensmall">{L_NONEWPOSTS}</span></td>
  				<td>&nbsp;&nbsp;</td>
! 				<td width="20" align="center"><img src="images/folder_lock.gif" alt="{L_FORUM_LOCKED}" /></td>
! 				<td><span class="gensmall">{L_TOPIC_IS_LOCKED}</span></td>
  			</tr>
  			<tr>
! 				<td width="20" align="center"><img src="images/folder_new_hot.gif" alt="{L_NEWPOSTS_HOT}" /></td>
! 				<td><span class="gensmall">{L_NEWPOSTS_HOT}</span></td>
  				<td>&nbsp;&nbsp;</td>
! 				<td width="20" align="center"><img src="images/folder_hot.gif" alt="{L_NONEWPOSTS_HOT}" /></td>
! 				<td><span class="gensmall">{L_NONEWPOSTS_HOT}</span></td>
  			</tr>
  			<tr>
--- 53,87 ----
  	</tr>
  </table></form>
+ 
  
! <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center">
  	<tr>
! 		<td align="left" valign="top"><table cellspacing="0" cellpadding="1" border="0">
  			<tr>
! 				<td width="20"><img src="{FOLDER_NEW_IMG}" alt="{L_NEW_POSTS}" /></td>
! 				<td><span class="gensmall">{L_NEW_POSTS}</span></td>
! 				<td>&nbsp;&nbsp;</td>
! 				<td width="20"><img src="{FOLDER_IMG}" alt="{L_NO_NEW_POSTS}" /></td>
! 				<td><span class="gensmall">{L_NO_NEW_POSTS}</span></td>
! 				<td>&nbsp;&nbsp;</td>
! 				<td width="20"><img src="{FOLDER_ANNOUNCE_IMG}" alt="{L_ANNOUNCEMENT}" /></td>
! 				<td><span class="gensmall">{L_ANNOUNCEMENT}</span></td>
! 			</tr>
! 			<tr> 
! 				<td width="20"><img src="{FOLDER_HOT_NEW_IMG}" alt="{L_NEW_POSTS_HOT}" /></td>
! 				<td><span class="gensmall">{L_NEW_POSTS_HOT}</span></td>
  				<td>&nbsp;&nbsp;</td>
! 				<td width="20"><img src="{FOLDER_HOT_IMG}" alt="{L_NO_NEW_POSTS_HOT}" /></td>
! 				<td><span class="gensmall">{L_NO_NEW_POSTS_HOT}</span></td>
  				<td>&nbsp;&nbsp;</td>
! 				<td width="20"><img src="{FOLDER_STICKY_IMG}" alt="{L_STICKY}" /></td>
! 				<td><span class="gensmall">{L_STICKY}</span></td>
  			</tr>
  			<tr>
! 				<td width="20"><img src="{FOLDER_LOCKED_NEW_IMG}" alt="{L_NEW_POSTS_TOPIC_LOCKED}" /></td>
! 				<td><span class="gensmall">{L_NEW_POSTS_LOCKED}</span></td>
  				<td>&nbsp;&nbsp;</td>
! 				<td width="20"><img src="{FOLDER_LOCKED_IMG}" alt="{L_NO_NEW_POSTS_TOPIC_LOCKED}" /></td>
! 				<td><span class="gensmall">{L_NO_NEW_POSTS_LOCKED}</span></td>
  			</tr>
  			<tr>

Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/overall_header.tpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** overall_header.tpl	2001/11/20 02:20:24	1.21
--- overall_header.tpl	2001/11/22 15:39:11	1.22
***************
*** 32,35 ****
--- 32,39 ----
  INPUT.text	{font-family:"Courier New",courier;font-size:8pt;}
  
+ INPUT.outsidetable {background-color:{T_TD_COLOR1};border:solid 1px;}
+ INPUT.mainoptiontable {background-color:{T_TD_COLOR1};border:groove 2px;font-weight:bold}
+ INPUT.liteoptiontable {background-color:{T_TD_COLOR1};border:groove 2px;}
+ 
  A.forumlinks {font-weight:bold}
  A {text-decoration:none}

[Phpbb-checkins] CVS: phpBB2 search.php,1.36,1.37

From: Paul S. O. <ps...@us...> - 2001-11-22 02:02:14

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

Modified Files:
	search.php 
Log Message:
Fix for display of newest image icon when one doesn't exist

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** search.php	2001/11/22 01:00:14	1.36
--- search.php	2001/11/22 02:02:11	1.37
***************
*** 1081,1085 ****
  						if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
  						{
! 							if( $HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time'] ) 
  							{
  								$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";
--- 1081,1085 ----
  						if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
  						{
! 							if( $HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time']  && $searchset[$i]['post_time'] > $userdata['session_last_visit'] ) 
  							{
  								$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";

[Phpbb-checkins] CVS: phpBB2 profile.php,1.138,1.139

From: James A. <th...@us...> - 2001-11-22 01:13:55

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

Modified Files:
	profile.php 
Log Message:
Missing comma in proflie, thus registration SQL was b0rked...I like that word :)


Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -r1.138 -r1.139
*** profile.php	2001/11/21 13:02:36	1.138
--- profile.php	2001/11/22 01:13:49	1.139
***************
*** 1058,1062 ****
  					//
  					$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! 						VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
  
  					if( $board_config['require_activation'] ==USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa == 1)
--- 1058,1062 ----
  					//
  					$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! 						VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
  
  					if( $board_config['require_activation'] ==USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa == 1)

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.36,1.37

From: James A. <th...@us...> - 2001-11-22 01:04:05

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

Modified Files:
	sessions.php 
Log Message:
Fixed bug #484243 typo in sessions.php


Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** sessions.php	2001/10/16 10:35:24	1.36
--- sessions.php	2001/11/22 01:04:01	1.37
***************
*** 319,323 ****
  
  	$result_id = session_begin($user_id, $user_ip, $thispage_id, $session_length, $login, $autologin);
! 	if(!$result)
  	{
  		message_die(CRITICAL_ERROR, "Error creating user session : session_pagestart", __LINE__, __FILE__, $sql);
--- 319,323 ----
  
  	$result_id = session_begin($user_id, $user_ip, $thispage_id, $session_length, $login, $autologin);
! 	if(!$result_id)
  	{
  		message_die(CRITICAL_ERROR, "Error creating user session : session_pagestart", __LINE__, __FILE__, $sql);

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

From: Paul S. O. <ps...@us...> - 2001-11-22 01:00:18

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

Modified Files:
	search.php 
Log Message:
Search re-write was erm, how can I say this, erm, brown, soft and smelly ... putting old one with required updates back, will do more work soon

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** search.php	2001/11/20 23:45:27	1.35
--- search.php	2001/11/22 01:00:14	1.36
***************
*** 89,92 ****
--- 89,160 ----
  	return $split_entries[1];
  }
+ 
+ function arrayintersect($array1, $array2) 
+ { 
+ 	//
+ 	// make sure arguments are actually arrays
+ 	//
+ 	if( !is_array($array1) || !is_array($array2) )
+ 	{
+ 		return false; 
+ 	}
+ 
+ 	if( sizeof($array2) > sizeof($array1) ) 
+ 	{ 
+ 		$temp = $array1; 
+ 		$array1 = $array2; 
+ 		$array2 = $temp; 
+ 		
+ 		unset($temp); 
+ 	} 
+ 
+ 	sort($array1); 
+ 	rsort($array2); 
+ 
+ 	// the greatest element in array2 
+ 	$eg2 = $array2[0]; 
+ 
+ 	for($i = 0; $i < sizeof($array1); $i++) 
+ 	{ 
+ 		$e1 = $array1[$i];
+ 
+ 		for($j = 0; $j < sizeof($array2); $j++) 
+ 		{ 
+ 			$e2 = $array2[$j];
+ 
+ 			if( $e1 > $e2 ) 
+ 			{ 
+ 				//
+ 				// we have passed the match 
+ 				//
+ 				if( $e2 == $eg2 )
+ 				{
+ 					break(2); 
+ 				}
+ 				else
+ 				{
+ 					break; 
+ 				}
+ 			} 
+ 			else if( $e1 == $e2 ) 
+ 			{ 
+ 				//
+ 				// we found a match 
+ 				//
+ 				$retArray[] = $e1; 
+ 
+ 				break; 
+ 			} 
+ 		} 
+ 	} 
+ 	return $retArray; 
+ }
+ 
+ function inarray($needle, $haystack) 
+ { 
+ 	for($i = 0; $i < count($haystack) && $haystack[$i] != $needle; $i++); 
+ 
+ 	return ( $i != count($haystack) ); 
+ }
  //
  // End of functions defns
***************
*** 285,306 ****
  		$split_search = split_words($cleaned_search);
  
! 		$current_match_type = "";
! 		$word_count = 0;
! 		$word_store = array();
! 		$post_id_match_list = array();
  
! 		for($i = 0; $i < min(count($split_search), 10); $i++)
  		{
! 			$word_match = str_replace("*", "%", trim($split_search[$i]));
! 
! 			if( $word_match == "and" )
  			{
  				$current_match_type = "and";
  			}
! 			else if( $word_match == "or" )
  			{
  				$current_match_type = "or";
  			}
! 			else if( $word_match == "not" )
  			{
  				$current_match_type = "not";
--- 353,370 ----
  		$split_search = split_words($cleaned_search);
  
! 		$word_match = array();
! 		$current_match_type = "and";
  
! 		for($i = 0; $i < count($split_search); $i++)
  		{
! 			if( $split_search[$i] == "and" )
  			{
  				$current_match_type = "and";
  			}
! 			else if( $split_search[$i] == "or" )
  			{
  				$current_match_type = "or";
  			}
! 			else if( $split_search[$i] == "not" )
  			{
  				$current_match_type = "not";
***************
*** 308,404 ****
  			else
  			{
! 				if( $current_match_type == "" )
  				{
  					$current_match_type = "and";
  				}
  
! 				if( $word_match != "" )
  				{
! 					$word_store[] = $word_match;
  
! 					$sql = "SELECT m.post_id   
! 						FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m 
! 						WHERE w.word_text LIKE '$word_match' 
! 							AND m.word_id = w.word_id 
! 						ORDER BY m.post_id DESC";
! 					$result = $db->sql_query($sql); 
! 					if( !$result )
! 					{
! 						message_die(GENERAL_ERROR, "Couldn't matched posts", "", __LINE__, __FILE__, $sql);
! 					}
  
  					if( !$word_count )
  					{
! 						while( $row = $db->sql_fetchrow($result) )
! 						{
! 							$post_id_match_list[] = $row['post_id'];
! 						}
  					}
! 					else
  					{
! 						if( $current_match_type == "or" )
! 						{
! 							while( $row = $db->sql_fetchrow($result) )
! 							{
! 								$post_id_match_list[] = $row['post_id'];
! 							}
! 						}
! 						else if( $current_match_type == "and" )
  						{
! 							$rowset = $db->sql_fetchrowset($result);
! 
! 							for($j = 0; $j < count($post_id_match_list); $j++)
! 							{
! 								$and_match = false;
! 								for($k = 0; $k < count($rowset); $k++)
! 								{
! 									if( $post_id_match_list[$j] == $rowset[$k]['post_id'] )
! 									{
! 										$and_match = true;
! 									}
! 								}
! 
! 								if( !$and_match )
! 								{
! 									$post_id_match_list[$j] = 0;
! 								}
! 							}
  						}
! 						else if( $current_match_type == "not" )
  						{
! 							$rowset = $db->sql_fetchrowset($result);
! 
! 							for($j = 0; $j < count($post_id_match_list); $j++)
! 							{
! 								$not_match = false;
! 								for($k = 0; $k < count($rowset); $k++)
! 								{
! 									if( $post_id_match_list[$j] == $rowset[$k]['post_id'] )
! 									{
! 										$not_match = true;
! 									}
! 								}
! 
! 								if( $not_match )
! 								{
! 									$post_id_match_list[$j] = 0;
! 								}
! 							}
  						}
  					}
  
! 					$word_count++;
  
  				}
! 
! 				$current_match_type = "";
  			}
  		}
  
  		$total_posts = 0;
  		$sql_post_id_in = "";
! 		for($i = 0; $i < count($post_id_match_list); $i++)
  		{
! 			if( $post_id_match_list[$i] )
  			{
  				if( $sql_post_id_in != "" )
--- 372,467 ----
  			else
  			{
! 				if( !empty($search_all_terms) )
  				{
  					$current_match_type = "and";
  				}
+ 
+ 				$word_match[$current_match_type][] = $split_search[$i];
+ 			}
+ 		}
+ 
+ 		@reset($word_match);
+ 
+ 		$word_count = 0;
+ 		$result_list = array();
+ 
+ 		while( list($match_type, $match_word_list) = each($word_match) )
+ 		{
+ 			for($i = 0; $i < count($match_word_list); $i++ )
+ 			{
+ 				$match_word = str_replace("*", "%", $match_word_list[$i]);
  
! 				$sql = "SELECT m.post_id  
! 					FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m 
! 					WHERE w.word_text LIKE '$match_word' 
! 						AND m.word_id = w.word_id 
! 					ORDER BY m.post_id";
! 				$result = $db->sql_query($sql); 
! 				if( !$result )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't matched posts", "", __LINE__, __FILE__, $sql);
! 				}
  
! 				$row = array();
! 
! 				while( $temp_row = $db->sql_fetchrow($result) )
! 				{
! 					$row['' . $temp_row['post_id'] . ''] = 1;
! 				}
! 
! 				@reset($row);
  
+ 				while( list($post_id, $match_count) = each($row) )
+ 				{
  					if( !$word_count )
  					{
! 						$result_list['' . $post_id . ''] = $match_count;
  					}
! 					else if( $match_type == "and" )
  					{
! 						$result_list['' . $post_id . ''] = ( $result_list['' . $post_id . ''] ) ? $result_list['' . $post_id . ''] + intval($match_count) : 0;
! 					}
! 					else if( $match_type == "or" )
! 					{
! 						if(  $result_list['' . $post_id . ''] )
  						{
! 							$result_list['' . $post_id . ''] += intval($match_count);
  						}
! 						else
  						{
! 							$result_list['' . $post_id . ''] = 0;
! 							$result_list['' . $post_id . ''] += intval($match_count);
  						}
  					}
+ 					else if( $match_type == "not" )
+ 					{
+ 						$result_list['' . $post_id . ''] = 0;
+ 					}
+ 				}
  
! 				if( $match_type == "and" && $word_count )
! 				{
! 					@reset($row);
! 					@reset($result_list);
  
+ 					while( list($post_id, $match_count) = each($result_list) )
+ 					{
+ 						if( !$row['' . $post_id . ''] )
+ 						{
+ 							$result_list['' . $post_id . ''] = 0;
+ 						}
+ 					}
  				}
! 				$word_count++;
  			}
  		}
  
+ 		@reset($result_list);
+ 
  		$total_posts = 0;
  		$sql_post_id_in = "";
! 		while( list($post_id, $matches) = each($result_list) )
  		{
! 			if( $matches )
  			{
  				if( $sql_post_id_in != "" )
***************
*** 406,414 ****
  					$sql_post_id_in .= ", ";
  				}
! 				$sql_post_id_in .= $post_id_match_list[$i];
  
  				$total_posts++;
  			}
! 		}		
  
  		
--- 469,477 ----
  					$sql_post_id_in .= ", ";
  				}
! 				$sql_post_id_in .= $post_id;
  
  				$total_posts++;
  			}
! 		}

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

From: James A. <th...@us...> - 2001-11-22 00:57:00

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

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


Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** modcp.php	2001/11/14 20:21:01	1.45
--- modcp.php	2001/11/22 00:56:55	1.46
***************
*** 749,753 ****
  				$sql = "UPDATE " . POSTS_TABLE . "
  					SET topic_id = $new_topic_id
! 					WHERE post_time > $post_time
  						AND topic_id = $topic_id";
  			}
--- 749,753 ----
  				$sql = "UPDATE " . POSTS_TABLE . "
  					SET topic_id = $new_topic_id
! 					WHERE post_time >= $post_time
  						AND topic_id = $topic_id";
  			}
***************
*** 766,770 ****
  			);
  
! 			$message = $lang['Topic_split'] . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
  			message_die(GENERAL_MESSAGE, $message);
  		}
--- 766,770 ----
  			);
  
! 			$message = $lang['Topic_split'] . " " . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
  			message_die(GENERAL_MESSAGE, $message);
  		}

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

From: Paul S. O. <ps...@us...> - 2001-11-21 23:08:13

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

Modified Files:
	posting_body.tpl 
Log Message:
Updated smilies + fixes for insertion of smilie at caret (IE/PC only) + Mac BBCode buttons ... perhaps, Tom

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** posting_body.tpl	2001/11/18 14:01:35	1.9
--- posting_body.tpl	2001/11/21 23:08:10	1.10
***************
*** 11,14 ****
--- 11,34 ----
  // www.subBlue.com
  
+ 
+ // Startup variables
+ var imageTag = false;
+ var theSelection = false;
+ 
+ 
+ // Check for Browser & Platform for PC & IE specific bits
+ // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
+ var clientPC = navigator.userAgent.toLowerCase(); // Get client info
+ var clientVer = parseInt(navigator.appVersion); // Get browser version
+ 
+ var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1));
+ var is_nav  = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1)
+                 && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1)
+                 && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
+ 
+ var is_win   = ((clientPC.indexOf("win")!=-1) || (agt.indexOf("16bit")!=-1));
+ var is_mac    = (clientPC.indexOf("mac")!=-1);
+ 
+ 
  // Helpline messages
  b_help = "Bold text: [b]text[/b]  (alt+b)";
***************
*** 61,69 ****
  
  
! function checkForm(formObj) {
  
  	formErrors = false;    
  
! 	if (formObj.message.value.length < 2) {
  		formErrors = "You must enter a message!";
  	}
--- 81,89 ----
  
  
! function checkForm() {
  
  	formErrors = false;    
  
! 	if (document.post.message.value.length < 2) {
  		formErrors = "You must enter a message!";
  	}
***************
*** 73,77 ****
  		return false;
  	} else {
! 		bbstyle(formObj, -1);
  		//formObj.preview.disabled = true;
  		//formObj.submit.disabled = true;
--- 93,97 ----
  		return false;
  	} else {
! 		bbstyle(-1);
  		//formObj.preview.disabled = true;
  		//formObj.submit.disabled = true;
***************
*** 79,116 ****
  	}
  }
- 
- 
- function emoticon(theSmilie) {
- 	if ((parseInt(navigator.appVersion) >= 4) && (navigator.appName == "Microsoft Internet Explorer"))
- 		theSelection = document.selection.createRange().text; // Get text selection
- 
- 	if (theSelection) {
- 		// Add tags around selection
- 		document.selection.createRange().text = theSelection + theSmilie + ' ';
- 		formObj.message.focus();
- 		theSelection = '';
- 		return;
- 	}
  
! 		
! 	document.post.message.value += ' ' + theSmilie + ' ';
  	document.post.message.focus();
  }
  
  
! function bbfontstyle(formObj, bbopen, bbclose) {
! 	if ((parseInt(navigator.appVersion) >= 4) && (navigator.appName == "Microsoft Internet Explorer")) {
  		theSelection = document.selection.createRange().text;
  		if (!theSelection) {
! 			formObj.message.value += bbopen + bbclose;
! 			formObj.message.focus();
  			return;
  		}
  		document.selection.createRange().text = bbopen + theSelection + bbclose;
! 		formObj.message.focus();
  		return;
  	} else {
! 		formObj.message.value += bbopen + bbclose;
! 		formObj.message.focus();
  		return;
  	}
--- 99,130 ----
  	}
  }
  
! function emoticon(text) {
! 	text = ' ' + text + ' ';
! 	if (document.post.message.createTextRange && document.post.message.caretPos) {
! 		var caretPos = document.post.message.caretPos;
! 		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text;
! 		document.post.message.focus();
! 	} else {
! 	document.post.message.value  += text;
  	document.post.message.focus();
+ 	}
  }
  
  
! function bbfontstyle(bbopen, bbclose) {
! 	if ((clientVer >= 4) && is_ie && is_win) {
  		theSelection = document.selection.createRange().text;
  		if (!theSelection) {
! 			document.post.message.value += bbopen + bbclose;
! 			document.post.message.focus();
  			return;
  		}
  		document.selection.createRange().text = bbopen + theSelection + bbclose;
! 		document.post.message.focus();
  		return;
  	} else {
! 		document.post.message.value += bbopen + bbclose;
! 		document.post.message.focus();
  		return;
  	}
***************
*** 118,122 ****
  
  
! function bbstyle(formObj, bbnumber) {
  
  	donotinsert = false;
--- 132,136 ----
  
  
! function bbstyle(bbnumber) {
  
  	donotinsert = false;
***************
*** 127,139 ****
  		while (bbcode[0]) {
  			butnumber = arraypop(bbcode) - 1;
! 			formObj.message.value += bbtags[butnumber + 1];
! 			buttext = eval('formObj.addbbcode' + butnumber + '.value');
! 			eval('formObj.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
  		}
! 		formObj.message.focus();
  		return;
  	}
  
! 	if ((parseInt(navigator.appVersion) >= 4) && (navigator.appName == "Microsoft Internet Explorer"))
  		theSelection = document.selection.createRange().text; // Get text selection
  		
--- 141,153 ----
  		while (bbcode[0]) {
  			butnumber = arraypop(bbcode) - 1;
! 			document.post.message.value += bbtags[butnumber + 1];
! 			buttext = eval('document.post.addbbcode' + butnumber + '.value');
! 			eval('document.post.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
  		}
! 		document.post.message.focus();
  		return;
  	}
  
! 	if ((clientVer >= 4) && is_ie && is_win)
  		theSelection = document.selection.createRange().text; // Get text selection
  		
***************
*** 141,145 ****
  		// Add tags around selection
  		document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1];
! 		formObj.message.focus();
  		theSelection = '';
  		return;
--- 155,159 ----
  		// Add tags around selection
  		document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1];
! 		document.post.message.focus();
  		theSelection = '';
  		return;
***************
*** 157,182 ****
  		while (bbcode[bblast]) {
  				butnumber = arraypop(bbcode) - 1;
! 				formObj.message.value += bbtags[butnumber + 1];
! 				buttext = eval('formObj.addbbcode' + butnumber + '.value');
! 				eval('formObj.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
  				imageTag = false;
  			}
! 			formObj.message.focus();
  			return;
  	} else { // Open tags
  	
  		if (imageTag && (bbnumber != 14)) {		// Close image tag before adding another
! 			formObj.message.value += bbtags[15];
  			lastValue = arraypop(bbcode) - 1;	// Remove the close image tag from the list
! 			formObj.addbbcode14.value = "Img";	// Return button back to normal state
  			imageTag = false;
  		}
  		
  		// Open tag
! 		formObj.message.value += bbtags[bbnumber];
  		if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag
  		arraypush(bbcode,bbnumber+1);
! 		eval('formObj.addbbcode'+bbnumber+'.value += "*"');
! 		formObj.message.focus();
  		return;
  	}
--- 171,196 ----
  		while (bbcode[bblast]) {
  				butnumber = arraypop(bbcode) - 1;
! 				document.post.message.value += bbtags[butnumber + 1];
! 				buttext = eval('document.post.addbbcode' + butnumber + '.value');
! 				eval('document.post.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
  				imageTag = false;
  			}
! 			document.post.message.focus();
  			return;
  	} else { // Open tags
  	
  		if (imageTag && (bbnumber != 14)) {		// Close image tag before adding another
! 			document.post.message.value += bbtags[15];
  			lastValue = arraypop(bbcode) - 1;	// Remove the close image tag from the list
! 			document.post.addbbcode14.value = "Img";	// Return button back to normal state
  			imageTag = false;
  		}
  		
  		// Open tag
! 		document.post.message.value += bbtags[bbnumber];
  		if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag
  		arraypush(bbcode,bbnumber+1);
! 		eval('document.post.addbbcode'+bbnumber+'.value += "*"');
! 		document.post.message.focus();
  		return;
  	}
***************
*** 184,187 ****
--- 198,207 ----
  }
  
+ // Insert at Claret position. Code from
+ // http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
+ function storeCaret(textEl) {
+ 	if (textEl.createTextRange) textEl.caretPos = document.selection.createRange().duplicate();
+ }
+ 
  //-->
  </script>
***************
*** 193,197 ****
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> 
  		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
  	</tr>
--- 213,217 ----
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a> 
  		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
  	</tr>
***************
*** 247,251 ****
  				  <td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0" alt="Sad" /></a></td>
  				  <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0" alt="Uncertain" /></a></td>
! 				  <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0" alt="Surprise" /></a></td>
  				</tr>
  				<tr align="center" valign="middle"> 
--- 267,271 ----
  				  <td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0" alt="Sad" /></a></td>
  				  <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0" alt="Uncertain" /></a></td>
! 				  <td><a href="javascript:emoticon(':eek:')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0" alt="Surprise" /></a></td>
  				</tr>
  				<tr align="center" valign="middle"> 
***************
*** 276,304 ****
  		  <tr align="center" valign="middle"> 
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(this.form,0)" onMouseOver="helpline('b')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(this.form,2)" onMouseOver="helpline('i')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(this.form,4)" onMouseOver="helpline('u')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(this.form,6)" onMouseOver="helpline('q')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(this.form,8)" onMouseOver="helpline('c')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(this.form,10)" onMouseOver="helpline('l')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(this.form,12)" onMouseOver="helpline('o')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onClick="bbstyle(this.form,14)" onMouseOver="helpline('p')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(this.form,16)" onMouseOver="helpline('w')" />
  			  </span></td>
  		  </tr>
--- 296,324 ----
  		  <tr align="center" valign="middle"> 
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" onMouseOver="helpline('c')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" onMouseOver="helpline('o')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onClick="bbstyle(14)" onMouseOver="helpline('p')" />
  			  </span></td>
  			<td><span class="genmed"> 
! 			  <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" />
  			  </span></td>
  		  </tr>
***************
*** 308,312 ****
  				<tr> 
  				  <td><span class="genmed"> &nbsp;Font color: 
! 					<select name="addbbcode18" onChange="bbfontstyle(this.form, '[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')">
  					  <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">Default</option>
  					  <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">Dark 
--- 328,332 ----
  				<tr> 
  				  <td><span class="genmed"> &nbsp;Font color: 
! 					<select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')">
  					  <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">Default</option>
  					  <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">Dark 
***************
*** 328,332 ****
  					</select>
  					&nbsp;Font size: 
! 					<select name="addbbcode20" onChange="bbfontstyle(this.form, '[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
  					  <option value="9" class="genmed">Tiny</option>
  					  <option value="10" class="genmed">Small</option>
--- 348,352 ----
  					</select>
  					&nbsp;Font size: 
! 					<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
  					  <option value="9" class="genmed">Tiny</option>
  					  <option value="10" class="genmed">Small</option>
***************
*** 336,340 ****
  					</select>
  					</span></td>
! 				  <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(document.post,-1)" class="genmed" onMouseOver="helpline('a')">Close 
  					Tags</a></span></td>
  				</tr>
--- 356,360 ----
  					</select>
  					</span></td>
! 				  <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">Close 
  					Tags</a></span></td>
  				</tr>
***************
*** 349,353 ****
  		  <tr> 
  			<td colspan="9"><span class="gen"> 
! 			  <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post">{MESSAGE}</textarea>
  			  </span></td>
  		  </tr>
--- 369,373 ----
  		  <tr> 
  			<td colspan="9"><span class="gen"> 
! 			  <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{MESSAGE}</textarea>
  			  </span></td>
  		  </tr>

[Phpbb-checkins] CVS: phpBB2/images/smiles icon_razz.gif,1.4,1.5 icon_surprised.gif,1.3,1.4

From: Paul S. O. <ps...@us...> - 2001-11-21 23:08:13

Update of /cvsroot/phpbb/phpBB2/images/smiles
In directory usw-pr-cvs1:/tmp/cvs-serv26138/images/smiles

Modified Files:
	icon_razz.gif icon_surprised.gif 
Log Message:
Updated smilies + fixes for insertion of smilie at caret (IE/PC only) + Mac BBCode buttons ... perhaps, Tom

Index: icon_razz.gif
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/images/smiles/icon_razz.gif,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
Binary files /tmp/cvsbcLiVN and /tmp/cvsCHG7Er differ

Index: icon_surprised.gif
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/images/smiles/icon_surprised.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Binary files /tmp/cvsLhZGcN and /tmp/cvsyvaBdq differ

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

From: Paul S. O. <ps...@us...> - 2001-11-21 16:54:16

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

Modified Files:
	index.php 
Log Message:
Moved avatar dir size lang generation into avatar dir size conditional

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** index.php	2001/11/21 03:10:10	1.25
--- index.php	2001/11/21 16:54:13	1.26
***************
*** 150,153 ****
--- 150,172 ----
  		}
  		@closedir($avatar_dir);
+ 
+ 		//
+ 		// This bit of code translates the avatar directory size into human readable format
+ 		// Borrowed the code from the PHP.net annoted manual, origanally written by:
+ 		// Jesse (je...@je...)
+ 		//
+ 		if($avatar_dir_size >= 1048576)
+ 		{
+ 			$avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB";
+ 		}
+ 		else if($avatar_dir_size >= 1024)
+ 		{
+ 			$avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB";
+ 		}
+ 		else
+ 		{
+ 			$avatar_dir_size = $avatar_dir_size . " Bytes";
+ 		}
+ 
  	}
  	else
***************
*** 155,176 ****
  		// Couldn't open Avatar dir.
  		$avatar_dir_size = $lang['Not_available'];
- 	}
- 
- 	//
- 	// This bit of code translates the avatar directory size into human readable format
- 	// Borrowed the code from the PHP.net annoted manual, origanally written by:
- 	// Jesse (je...@je...)
- 	//
- 	if($avatar_dir_size >= 1048576)
- 	{
- 		$avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB";
- 	}
- 	else if($avatar_dir_size >= 1024)
- 	{
- 		$avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB";
- 	}
- 	else
- 	{
- 		$avatar_dir_size = $avatar_dir_size . " Bytes";
  	}
  
--- 174,177 ----

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.82,1.83

From: Paul S. O. <ps...@us...> - 2001-11-21 16:27:46

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

Modified Files:
	functions.php 
Log Message:
Order of username in username search was missing

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** functions.php	2001/11/19 14:12:08	1.82
--- functions.php	2001/11/21 16:27:43	1.83
***************
*** 887,891 ****
  		$sql = "SELECT username 
  			FROM " . USERS_TABLE . " 
! 			WHERE username LIKE '$username_search'";
  		if( !$result = $db->sql_query($sql) )
  		{
--- 887,892 ----
  		$sql = "SELECT username 
  			FROM " . USERS_TABLE . " 
! 			WHERE username LIKE '$username_search' 
! 			ORDER BY username";
  		if( !$result = $db->sql_query($sql) )
  		{

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin group_edit_body.tpl,1.7,1.8

From: Paul S. O. <ps...@us...> - 2001-11-21 16:20:44

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

Modified Files:
	group_edit_body.tpl 
Log Message:
Minor change to use username selector

Index: group_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/group_edit_body.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** group_edit_body.tpl	2001/11/21 03:10:10	1.7
--- group_edit_body.tpl	2001/11/21 16:20:40	1.8
***************
*** 2,6 ****
  <h1>{L_GROUP_TITLE}</h1>
  
! <form action="{S_GROUP_ACTION}" method="post"><table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center">
  	<tr> 
  	  <th class="thHead" colspan="2">{L_GROUP_EDIT_DELETE}</th>
--- 2,6 ----
  <h1>{L_GROUP_TITLE}</h1>
  
! <form action="{S_GROUP_ACTION}" method="post" name="post"><table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center">
  	<tr> 
  	  <th class="thHead" colspan="2">{L_GROUP_EDIT_DELETE}</th>
***************
*** 23,27 ****
  	<tr> 
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
! 	  <td class="row2" width="62%">{S_SELECT_MODERATORS}</td>
  	</tr>
  
--- 23,27 ----
  	<tr> 
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
! 	  <td class="row2" width="62%"><input type="text" class="post" name="username" maxlength="50" size="20" value="{GROUP_MODERATOR}" /> &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;" /></td>
  	</tr>

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

From: Paul S. O. <ps...@us...> - 2001-11-21 16:20:43

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

Modified Files:
	admin_groups.php 
Log Message:
Minor change to use username selector

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** admin_groups.php	2001/11/21 03:10:09	1.15
--- admin_groups.php	2001/11/21 16:20:40	1.16
***************
*** 33,37 ****
  //
  $phpbb_root_dir = "./../";
! $no_page_header = TRUE;
  require('pagestart.inc');
  
--- 33,37 ----
  //
  $phpbb_root_dir = "./../";
! 
  require('pagestart.inc');
  
***************
*** 50,55 ****
  	// Ok they are editing a group or creating a new group
  	//
- 	include('page_header_admin.' . $phpEx);
- 
  	$template->set_filenames(array(
  		"body" => "admin/group_edit_body.tpl")
--- 50,53 ----
***************
*** 69,76 ****
--- 67,76 ----
  			message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
  		}
+ 
  		if( !$db->sql_numrows($result) )
  		{
  			message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
  		}
+ 
  		$group_info = $db->sql_fetchrow($result);
  
***************
*** 106,116 ****
  	$user_list = $db->sql_fetchrowset($u_result);
  
- 	$select_list = "<select name=\"group_moderator\">";
  	for($i = 0; $i < count($user_list); $i++)
  	{
! 		$selected = ( $user_list[$i]['user_id'] == $group_info['group_moderator'] ) ? "selected=\"selected\"" : "";
! 		$select_list .= "<option value=\"" . $user_list[$i]['user_id'] . "\"$selected>" . $user_list[$i]['username'] . "</option>";
  	}
- 	$select_list .= "</select>";
  
  	$group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "";
--- 106,116 ----
  	$user_list = $db->sql_fetchrowset($u_result);
  
  	for($i = 0; $i < count($user_list); $i++)
  	{
! 		if( $user_list[$i]['user_id'] == $group_info['group_moderator'] ) 
! 		{
! 			$group_moderator = $user_list[$i]['username'];
! 		}
  	}
  
  	$group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "";
***************
*** 118,128 ****
  	$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
  
- 
- 
  	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
  
  	$template->assign_vars(array(
  		"GROUP_NAME" => $group_info['group_name'],
! 		"GROUP_DESCRIPTION" => $group_info['group_description'],
  
  		"L_GROUP_TITLE" => $lang['Group_administration'],
--- 118,127 ----
  	$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
  
  	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
  
  	$template->assign_vars(array(
  		"GROUP_NAME" => $group_info['group_name'],
! 		"GROUP_DESCRIPTION" => $group_info['group_description'], 
! 		"GROUP_MODERATOR" => $group_moderator, 
  
  		"L_GROUP_TITLE" => $lang['Group_administration'],
***************
*** 130,134 ****
  		"L_GROUP_NAME" => $lang['group_name'],
  		"L_GROUP_DESCRIPTION" => $lang['group_description'],
! 		"L_GROUP_MODERATOR" => $lang['group_moderator'],
  		"L_GROUP_STATUS" => $lang['group_status'],
  		"L_GROUP_OPEN" => $lang['group_open'],
--- 129,134 ----
  		"L_GROUP_NAME" => $lang['group_name'],
  		"L_GROUP_DESCRIPTION" => $lang['group_description'],
! 		"L_GROUP_MODERATOR" => $lang['group_moderator'], 
! 		"L_FIND_USERNAME" => $lang['Find_username'], 
  		"L_GROUP_STATUS" => $lang['group_status'],
  		"L_GROUP_OPEN" => $lang['group_open'],
***************
*** 143,147 ****
  		"L_YES" => $lang['Yes'],
  
! 		"S_SELECT_MODERATORS" => $select_list,
  		"S_GROUP_OPEN_TYPE" => GROUP_OPEN,
  		"S_GROUP_CLOSED_TYPE" => GROUP_CLOSED,
--- 143,148 ----
  		"L_YES" => $lang['Yes'],
  
! 		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 
! 
  		"S_GROUP_OPEN_TYPE" => GROUP_OPEN,
  		"S_GROUP_CLOSED_TYPE" => GROUP_CLOSED,
***************
*** 170,182 ****
  			message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
  		}
  
! 		message_die(GENERAL_MESSAGE, $lang['Deleted_group']);
  	}
  	else
  	{
! 		$group_type = isset($HTTP_POST_VARS['group_type']) ? trim($HTTP_POST_VARS['group_type']) : "";
  		$group_name = isset($HTTP_POST_VARS['group_name']) ? trim($HTTP_POST_VARS['group_name']) : "";
  		$group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : "";
! 		$group_moderator = isset($HTTP_POST_VARS['group_moderator']) ? intval($HTTP_POST_VARS['group_moderator']) : "";
  		$delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? intval($HTTP_POST_VARS['delete_old_moderator']) : "";
  
--- 171,185 ----
  			message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
  		}
+ 
+ 		$message = $lang['Deleted_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
! 		message_die(GENERAL_MESSAGE, $message);
  	}
  	else
  	{
! 		$group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN;
  		$group_name = isset($HTTP_POST_VARS['group_name']) ? trim($HTTP_POST_VARS['group_name']) : "";
  		$group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : "";
! 		$group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : "";
  		$delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? intval($HTTP_POST_VARS['delete_old_moderator']) : "";
  
***************
*** 189,197 ****
  			message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
  		}
! 		else if( $group_type == "" )
  		{
! 			message_die(GENERAL_MESSAGE, $lang['No_group_mode']);
  		}
! 		
  		if( $mode == "editgroup" )
  		{
--- 192,204 ----
  			message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
  		}
! 		
! 		$this_userdata = get_userdata($group_moderator);
! 		$group_moderator = $this_userdata['user_id'];
! 
! 		if( !$group_moderator )
  		{
! 			message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
  		}
! 				
  		if( $mode == "editgroup" )
  		{
***************
*** 235,245 ****
  				message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
  			}
- 			
- 			$template->assign_vars(array(
- 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_groups.$phpEx") . '">')
- 			);
  	
! 			$message = $lang['Updated_group'];
! 			$message .= "<br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>");
  			message_die(GENERAL_MESSAGE, $message);
  		}
--- 242,248 ----
  				message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
  			}
  	
! 			$message = $lang['Updated_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
! 
  			message_die(GENERAL_MESSAGE, $message);
  		}
***************
*** 262,272 ****
  				message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
  			}
- 
- 			$template->assign_vars(array(
- 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_groups.$phpEx") . '">')
- 			);
  			
! 			$message = $lang['Added_new_group'];
! 			$message .= "<br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>");
  			message_die(GENERAL_MESSAGE, $message);
  
--- 265,271 ----
  				message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
  			}
  			
! 			$message = $lang['Added_new_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
! 
  			message_die(GENERAL_MESSAGE, $message);
  
***************
*** 280,285 ****
  else
  {
- 	include('page_header_admin.' . $phpEx);
- 	
  	$sql = "SELECT group_id, group_name
  		FROM " . GROUPS_TABLE . "
--- 279,282 ----

7 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 608 609 610 611 612 .. 629 > >> (Page 610 of 629)