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

[Phpbb-checkins] CVS: phpBB2/db/schemas ms_access_primer.zip,1.11,1.12 mssql_schema.sql,1.20,1.21 mysql_schema.sql,1.15,1.16 postgres_schema.sql,1.17,1.18

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

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

Modified Files:
	ms_access_primer.zip mssql_schema.sql mysql_schema.sql 
	postgres_schema.sql 
Log Message:
Remove auto increment/IDENTITY/autonumber/sequence from forum_id in _forums, this is set by the admin_forums app itself.

Index: ms_access_primer.zip
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/ms_access_primer.zip,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
Binary files /tmp/cvsMi0Fvf and /tmp/cvs65dNEm differ

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** mssql_schema.sql	11 Feb 2002 00:08:14 -0000	1.20
--- mssql_schema.sql	11 Feb 2002 13:11:36 -0000	1.21
***************
*** 64,68 ****
  
  CREATE TABLE [phpbb_forums] (
! 	[forum_id] [int] IDENTITY (1, 1) NOT NULL ,
  	[cat_id] [int] NOT NULL ,
  	[forum_name] [varchar] (100) NOT NULL ,
--- 64,68 ----
  
  CREATE TABLE [phpbb_forums] (
! 	[forum_id] [int] NOT NULL ,
  	[cat_id] [int] NOT NULL ,
  	[forum_name] [varchar] (100) NOT NULL ,

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mysql_schema.sql	2 Feb 2002 18:10:53 -0000	1.15
--- mysql_schema.sql	11 Feb 2002 13:11:36 -0000	1.16
***************
*** 122,126 ****
  #
  CREATE TABLE phpbb_forums (
!    forum_id smallint(5) UNSIGNED NOT NULL auto_increment,
     cat_id mediumint(8) UNSIGNED NOT NULL,
     forum_name varchar(150),
--- 122,126 ----
  #
  CREATE TABLE phpbb_forums (
!    forum_id smallint(5) UNSIGNED NOT NULL,
     cat_id mediumint(8) UNSIGNED NOT NULL,
     forum_name varchar(150),

Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** postgres_schema.sql	2 Feb 2002 18:10:53 -0000	1.17
--- postgres_schema.sql	11 Feb 2002 13:11:36 -0000	1.18
***************
*** 9,13 ****
  CREATE SEQUENCE phpbb_categories_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1;
  CREATE SEQUENCE phpbb_disallow_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1;
- CREATE SEQUENCE phpbb_forums_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1;
  CREATE SEQUENCE phpbb_posts_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1;
  CREATE SEQUENCE phpbb_privmsgs_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1;
--- 9,12 ----
***************
*** 107,111 ****
  -------------------------------------------------------- */
  CREATE TABLE phpbb_forums (
!    forum_id int4 DEFAULT nextval('phpbb_forums_id_seq'::text) NOT NULL,
     cat_id int4,
     forum_name varchar(150),
--- 106,110 ----
  -------------------------------------------------------- */
  CREATE TABLE phpbb_forums (
!    forum_id int4 DEFAULT '0' NOT NULL,
     cat_id int4,
     forum_name varchar(150),

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

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

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

Modified Files:
	upgrade.php 
Log Message:
Prevent upgrade being run standalone from install if PHPBB_INSTALLED present in config.

Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** upgrade.php	31 Jan 2002 23:19:00 -0000	1.19
--- upgrade.php	11 Feb 2002 13:05:08 -0000	1.20
***************
*** 30,33 ****
--- 30,39 ----
  	include('includes/constants.'.$phpEx);
  	include('includes/functions.'.$phpEx);
+ 
+ 	if( defined("PHPBB_INSTALLED") )
+ 	{
+ 		header("Location: index.$phpEx");
+ 		exit;
+ 	}
  }
  

[Phpbb-checkins] CVS: phpBB2/templates/subSilver viewtopic_body.tpl,1.24,1.25

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

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

Modified Files:
	viewtopic_body.tpl 
Log Message:
Altered U_TOPIC to U_VIEW_TOPIC inline with other vars

Index: viewtopic_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewtopic_body.tpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** viewtopic_body.tpl	6 Jan 2002 00:51:47 -0000	1.24
--- viewtopic_body.tpl	11 Feb 2002 13:00:57 -0000	1.25
***************
*** 2,6 ****
  <table width="100%" cellspacing="2" cellpadding="2" border="0">
    <tr> 
! 	<td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{U_TOPIC}">{TOPIC_TITLE}</a><br />
  	  <span class="gensmall"><b>{PAGINATION}</b><br />
  	  &nbsp; </span></td>
--- 2,6 ----
  <table width="100%" cellspacing="2" cellpadding="2" border="0">
    <tr> 
! 	<td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><br />
  	  <span class="gensmall"><b>{PAGINATION}</b><br />
  	  &nbsp; </span></td>

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

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

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

Modified Files:
	viewtopic.php 
Log Message:
No idea if this is as desired but 'topic link' now points to the current page

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -r1.175 -r1.176
*** viewtopic.php	11 Feb 2002 02:18:33 -0000	1.175
--- viewtopic.php	11 Feb 2002 13:00:08 -0000	1.176
***************
*** 655,658 ****
--- 655,659 ----
  	"S_WATCH_TOPIC" => $s_watching_topic,
  
+ 	"U_VIEW_TOPIC" => append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&start=$start&postdays=$post_days&postorder=$post_order&highlight=" . $HTTP_GET_VARS['highlight']), 
  	"U_VIEW_FORUM" => $view_forum_url,
  	"U_VIEW_OLDER_TOPIC" => $view_prev_topic_url,

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images/lang_turkish icon_icq_add.gif,NONE,1.1 icon_add_icq.gif,1.1,NONE

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

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

Added Files:
	icon_icq_add.gif 
Removed Files:
	icon_add_icq.gif 
Log Message:
Re-named add_icq to icq_add

--- NEW FILE ---
GIF89a;
£ÄÕFõFÿÿÿÿÿ±R–¸ééé½½»=…©îîîlšÉÄÉ
#&2!/j	Ž‘’“	+
<„#
-
”¥¦'¨©'¬h
4%4#`Œ’8±	
(PÈ á
|T¤ò¼Ú“¯ç¾
>§øýك
4´VγùÞçÔÃÿö 
¦	8lHpÀ¾½{÷0ÚØO¿¾ýûøëë0ÏGÿÿ
--- icon_add_icq.gif DELETED ---

[Phpbb-checkins] CVS: phpBB2/db postgres7.php,1.17,1.18

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

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

Modified Files:
	postgres7.php 
Log Message:
Fix bugs #515461 and #515460, limit and nextid issues.

Index: postgres7.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/postgres7.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** postgres7.php	28 Jan 2002 17:24:45 -0000	1.17
--- postgres7.php	11 Feb 2002 12:46:18 -0000	1.18
***************
*** 124,128 ****
  			$this->num_queries++;
  
! 			$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2, \\1", $query);
  
  			if( $transaction == BEGIN_TRANSACTION )
--- 124,128 ----
  			$this->num_queries++;
  
! 			$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query);
  
  			if( $transaction == BEGIN_TRANSACTION )
***************
*** 343,348 ****
  			if( preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) )
  			{
! 				$query = "SELECT last_value
! 					FROM " . $tablename[1] . "_id_seq";
  				$temp_q_id =  @pg_exec($this->db_connect_id, $query);
  				if( !$temp_q_id )
--- 343,347 ----
  			if( preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) )
  			{
! 				$query = "SELECT currval('" . $tablename[1] . "_id_seq') AS last_value";
  				$temp_q_id =  @pg_exec($this->db_connect_id, $query);
  				if( !$temp_q_id )

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.51,1.52

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

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

Modified Files:
	sessions.php 
Log Message:
Fix bug #515510 prevent autologin of inactive users

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** sessions.php	28 Jan 2002 17:57:55 -0000	1.51
--- sessions.php	11 Feb 2002 12:42:23 -0000	1.52
***************
*** 67,71 ****
  		// + the user_lastvisit ... damn damn damn damn and blast
  		//
! 		$sql = "SELECT user_password, user_session_time, user_email    
  			FROM " . USERS_TABLE . " 
  			WHERE user_id = $user_id";
--- 67,71 ----
  		// + the user_lastvisit ... damn damn damn damn and blast
  		//
! 		$sql = "SELECT user_password, user_session_time, user_email, user_active    
  			FROM " . USERS_TABLE . " 
  			WHERE user_id = $user_id";
***************
*** 82,86 ****
  		if( $auto_create )
  		{
! 			if( isset($sessiondata['autologinid']) )
  			{
  				// We have to login automagically
--- 82,86 ----
  		if( $auto_create )
  		{
! 			if( isset($sessiondata['autologinid']) && $row['user_active'] )
  			{
  				// We have to login automagically

[Phpbb-checkins] CVS: phpBB2/admin admin_forum_prune.php,1.17,1.18

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

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

Modified Files:
	admin_forum_prune.php 
Log Message:
Re-arrange a few bits here and there, hopefully remove continuing issues with list array useage

Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** admin_forum_prune.php	28 Jan 2002 02:36:21 -0000	1.17
--- admin_forum_prune.php	11 Feb 2002 12:34:39 -0000	1.18
***************
*** 20,36 ****
   ***************************************************************************/
  
- /***************************************************************************
- *	This file is for the setup of the auto_pruning and also will allow for
- *	immediate forum pruning as well.
- ***************************************************************************/
- //
- // 	Warning: Parts of this code were shamelessly stolen verbatim from Paul's
- //	work on the Auth admin stuff :) JLH
- //
- 
- //
- //First we through in the modules stuff :)
- //
- 
  if( !empty($setmodules) )
  {
--- 20,23 ----
***************
*** 78,84 ****
  	$forum_sql
  	ORDER BY c.cat_order ASC, f.forum_order ASC";
! $f_result = $db->sql_query($sql);
  
! $forum_rows = $db->sql_fetchrowset($f_result);
  
  //
--- 65,78 ----
  	$forum_sql
  	ORDER BY c.cat_order ASC, f.forum_order ASC";
! if( !($result = $db->sql_query($sql)) )
! {
! 	message_die(GENERAL_ERROR, "Couldn't obtain list of forums for pruning", "", __LINE__, __FILE__, $sql);
! }
  
! $forum_rows = array();
! while( $row = $db->sql_fetchrow($result) )
! {
! 	$forum_rows[] = $row;
! }
  
  //
***************
*** 90,95 ****
  
  	// Convert days to seconds for timestamp functions...
! 	$prunesecs = $prunedays * 1440 * 60;
! 	$prunedate = time() - $prunesecs;
  
  	$template->set_filenames(array(
--- 84,88 ----
  
  	// Convert days to seconds for timestamp functions...
! 	$prunedate = time() - ( $prunedays * 86400 );
  
  	$template->set_filenames(array(
***************
*** 97,117 ****
  	);
  
! 	$i = 0;
! 
! 	reset($forum_rows);
! 	while(list(, $forum_data) = each ($forum_rows))
  	{
! 		$p_result = prune($forum_data['forum_id'], $prunedate);
! 		sync("forum", $forum_data['forum_id']);
  	
  		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  	
- 		$i++;
- 	
  		$template->assign_block_vars("prune_results", array(
  			"ROW_COLOR" => "#" . $row_color, 
  			"ROW_CLASS" => $row_class, 
! 			"FORUM_NAME" => $forum_data['forum_name'],
  			"FORUM_TOPICS" => $p_result['topics'],
  			"FORUM_POSTS" => $p_result['posts'])
--- 90,105 ----
  	);
  
! 	for($i = 0; $i < count($forum_rows); $i++)
  	{
! 		$p_result = prune($forum_rows[$i]['forum_id'], $prunedate);
! 		sync('forum', $forum_rows[$i]['forum_id']);
  	
  		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  	
  		$template->assign_block_vars("prune_results", array(
  			"ROW_COLOR" => "#" . $row_color, 
  			"ROW_CLASS" => $row_class, 
! 			"FORUM_NAME" => $forum_rows[$i]['forum_name'],
  			"FORUM_TOPICS" => $p_result['topics'],
  			"FORUM_POSTS" => $p_result['posts'])
***************
*** 119,124 ****
  	}
  
- 
  	$template->assign_vars(array(
  		"L_FORUM" => $lang['Forum'],
  		"L_TOPICS_PRUNED" => $lang['Topics_pruned'],
--- 107,112 ----
  	}
  
  	$template->assign_vars(array(
+ 		"L_FORUM_PRUNE" => $lang['Forum_Prune'],
  		"L_FORUM" => $lang['Forum'],
  		"L_TOPICS_PRUNED" => $lang['Topics_pruned'],
***************
*** 142,153 ****
  		);
  
! 		$select_list = "<select name=\"" . POST_FORUM_URL . "\">\n";
! 		$select_list .= "<option value=\"-1\">" . $lang['All_Forums'] . "</option>\n";
  
  		for($i = 0; $i < count($forum_rows); $i++)
  		{
! 			$select_list .= "<option value=\"" . $forum_rows[$i]['forum_id'] . "\">" . $forum_rows[$i]['forum_name'] . "</option>\n";
  		}
! 		$select_list .= "</select>\n";
  
  		//
--- 130,141 ----
  		);
  
! 		$select_list = '<select name="' . POST_FORUM_URL . '">';
! 		$select_list .= '<option value="-1">' . $lang['All_Forums'] . '</option>';
  
  		for($i = 0; $i < count($forum_rows); $i++)
  		{
! 			$select_list .= '<option value="' . $forum_rows[$i]['forum_id'] . '">' . $forum_rows[$i]['forum_name'] . '</option>';
  		}
! 		$select_list .= '</select>';
  
  		//
***************
*** 177,183 ****
  
  		$prune_data = $lang['Prune_topics_not_posted'] . " "; 
! 		$prune_data .= "<input type=\"text\" name=\"prunedays\" size=\"4\"> " . $lang['Days'];
  
! 		$hidden_input = "<input type=\"hidden\" name=\"" . POST_FORUM_URL . "\" value=\"$forum_id\">";
  
  		//
--- 165,171 ----
  
  		$prune_data = $lang['Prune_topics_not_posted'] . " "; 
! 		$prune_data .= '<input type="text" name="prunedays" size="4"> ' . $lang['Days'];
  
! 		$hidden_input = '<input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">';
  
  		//
***************
*** 204,206 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
--- 192,194 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file

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

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

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

Modified Files:
	update_to_RC3.php 
Log Message:
erm, commented out RC2 updates ... haven't yet implemented an "existing update" check ... doh ... I will now bang my head against the wall, will someone please call an ambulance in advance, thank you

Index: update_to_RC3.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_to_RC3.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** update_to_RC3.php	11 Feb 2002 02:15:05 -0000	1.7
--- update_to_RC3.php	11 Feb 2002 02:27:27 -0000	1.8
***************
*** 13,17 ****
  	case 'mysql':
  	case 'mysql4':
! 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
  			ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, 
  			ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, 
--- 13,17 ----
  	case 'mysql':
  	case 'mysql4':
! /*		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
  			ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, 
  			ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, 
***************
*** 24,28 ****
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
! 			
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . "  
  			ADD COLUMN topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, 
--- 24,28 ----
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
! */			
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . "  
  			ADD COLUMN topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, 
***************
*** 45,49 ****
  
  	case 'postgresql':
! 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
  			ADD COLUMN user_session_time int4";
  		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
--- 45,49 ----
  
  	case 'postgresql':
! /*		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
  			ADD COLUMN user_session_time int4";
  		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
***************
*** 58,62 ****
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
! 			
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
  			ADD COLUMN topic_first_post_id int4";
--- 58,62 ----
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
! */				
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
  			ADD COLUMN topic_first_post_id int4";
***************
*** 92,96 ****
  	case 'mssql-odbc':
  	case 'mssql':
! 		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
  			user_session_time int NOT NULL, 
  			user_session_page smallint NOT NULL, 
--- 92,96 ----
  	case 'mssql-odbc':
  	case 'mssql':
! /*		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
  			user_session_time int NOT NULL, 
  			user_session_page smallint NOT NULL, 
***************
*** 102,106 ****
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
! 
  		$sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics";
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
--- 102,106 ----
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
! */	
  		$sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics";
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
***************
*** 126,130 ****
  
  	case 'msaccess':
! 		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
  			user_session_time int NOT NULL, 
  			user_session_page smallint NOT NULL";
--- 126,130 ----
  
  	case 'msaccess':
! /*		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
  			user_session_time int NOT NULL, 
  			user_session_page smallint NOT NULL";
***************
*** 134,138 ****
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
! 
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
  			topic_first_post_id int NOT NULL";
--- 134,138 ----
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
! */	
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
  			topic_first_post_id int NOT NULL";

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.127,1.128 viewtopic.php,1.174,1.175

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

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

Modified Files:
	viewforum.php viewtopic.php 
Log Message:
Repeat after me "Paul is a moron"

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -r1.127 -r1.128
*** viewforum.php	11 Feb 2002 02:16:27 -0000	1.127
--- viewforum.php	11 Feb 2002 02:18:33 -0000	1.128
***************
*** 103,107 ****
  	{
  		$redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" );
! 		header("Location: " . append_sid("posting.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
  	}
  	//
--- 103,107 ----
  	{
  		$redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" );
! 		header("Location: " . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
  	}
  	//

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -r1.174 -r1.175
*** viewtopic.php	11 Feb 2002 02:16:28 -0000	1.174
--- viewtopic.php	11 Feb 2002 02:18:33 -0000	1.175
***************
*** 194,198 ****
  		$redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id"; 
  		$redirect .= ( isset($start) ) ? "&start=$start" : "";
! 		header("Location: " . append_sid("posting.$phpEx?redirect=viewtopic.$phpEx&$redirect", true));
  	}
  
--- 194,198 ----
  		$redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id"; 
  		$redirect .= ( isset($start) ) ? "&start=$start" : "";
! 		header("Location: " . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&$redirect", true));
  	}
  

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.126,1.127 viewtopic.php,1.173,1.174

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

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

Modified Files:
	viewforum.php viewtopic.php 
Log Message:
Add a login redirect for users not logged in who attempt to visit  restricted forums ... also shows a forum/post doesn't exist for hidden forums/topics/posts if user is logged in but not authed to view them

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -r1.126 -r1.127
*** viewforum.php	8 Feb 2002 01:30:59 -0000	1.126
--- viewforum.php	11 Feb 2002 02:16:27 -0000	1.127
***************
*** 78,86 ****
  // the user.
  //
! if( !$total_rows = $db->sql_numrows($result) )
  {
  	message_die(GENERAL_MESSAGE, 'Forum_not_exist');
  }
- $forum_row = $db->sql_fetchrow($result);
  
  //
--- 78,85 ----
  // the user.
  //
! if( !($forum_row = $db->sql_fetchrow($result)) )
  {
  	message_die(GENERAL_MESSAGE, 'Forum_not_exist');
  }
  
  //
***************
*** 101,108 ****
  if( !$is_auth['auth_read'] || !$is_auth['auth_view'] )
  {
  	//
  	// The user is not authed to read this forum ...
  	//
! 	$message = sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']);
  
  	message_die(GENERAL_MESSAGE, $message);
--- 100,112 ----
  if( !$is_auth['auth_read'] || !$is_auth['auth_view'] )
  {
+ 	if ( !$userdata['session_logged_in'] )
+ 	{
+ 		$redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" );
+ 		header("Location: " . append_sid("posting.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
+ 	}
  	//
  	// The user is not authed to read this forum ...
  	//
! 	$message = ( !$is_auth['auth_view'] ) ? $lang['Forum_not_exist'] : sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']);
  
  	message_die(GENERAL_MESSAGE, $message);

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -r1.173 -r1.174
*** viewtopic.php	8 Feb 2002 21:02:54 -0000	1.173
--- viewtopic.php	11 Feb 2002 02:16:28 -0000	1.174
***************
*** 161,174 ****
  		AND f.forum_id = t.forum_id
  		$order_sql";
! if( !$result = $db->sql_query($sql) )
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
  }
  
! if( !$total_rows = $db->sql_numrows($result) )
  {
! 	message_die(GENERAL_MESSAGE,  'Topic_post_not_exist', "", __LINE__, __FILE__, $sql);
  }
- $forum_row = $db->sql_fetchrow($result);
  
  $forum_id = $forum_row['forum_id'];
--- 161,173 ----
  		AND f.forum_id = t.forum_id
  		$order_sql";
! if( !($result = $db->sql_query($sql)) )
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
  }
  
! if( !($forum_row = $db->sql_fetchrow($result)) )
  {
! 	message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
  }
  
  $forum_id = $forum_row['forum_id'];
***************
*** 183,196 ****
  //
  
- $forum_name = $forum_row['forum_name'];
- $topic_title = $forum_row['topic_title'];
- $topic_id = $forum_row['topic_id'];
- $topic_time = $forum_row['topic_time'];
- 
- if(!empty($post_id))
- {
- 	$start = floor(($forum_row['prev_posts'] - 1) / $board_config['posts_per_page']) * $board_config['posts_per_page'];
- }
- 
  //
  // Start auth check
--- 182,185 ----
***************
*** 201,208 ****
  if( !$is_auth['auth_view'] || !$is_auth['auth_read'] )
  {
! 	//
! 	// The user is not authed to read this forum ...
! 	//
! 	$message = sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']);
  
  	message_die(GENERAL_MESSAGE, $message);
--- 190,201 ----
  if( !$is_auth['auth_view'] || !$is_auth['auth_read'] )
  {
! 	if ( !$userdata['session_logged_in'] )
! 	{
! 		$redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id"; 
! 		$redirect .= ( isset($start) ) ? "&start=$start" : "";
! 		header("Location: " . append_sid("posting.$phpEx?redirect=viewtopic.$phpEx&$redirect", true));
! 	}
! 
! 	$message = ( !$is_auth['auth_view'] ) ? $lang['Topic_post_not_exist'] : sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']);
  
  	message_die(GENERAL_MESSAGE, $message);
***************
*** 211,214 ****
--- 204,217 ----
  // End auth check
  //
+ 
+ $forum_name = $forum_row['forum_name'];
+ $topic_title = $forum_row['topic_title'];
+ $topic_id = $forum_row['topic_id'];
+ $topic_time = $forum_row['topic_time'];
+ 
+ if ( !empty($post_id) )
+ {
+ 	$start = floor(($forum_row['prev_posts'] - 1) / $board_config['posts_per_page']) * $board_config['posts_per_page'];
+ }
  
  //

[Phpbb-checkins] CVS: phpBB2 update_to_RC3.php,1.6,1.7

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

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

Modified Files:
	update_to_RC3.php 
Log Message:
This version has the added bonus of probably working ... notice I said probably ...

Index: update_to_RC3.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_to_RC3.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** update_to_RC3.php	11 Feb 2002 00:30:01 -0000	1.6
--- update_to_RC3.php	11 Feb 2002 02:15:05 -0000	1.7
***************
*** 29,45 ****
  			ADD INDEX (topic_first_post_id)";
  
! 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD
! 			tr_class1_name varchar(50) NULL, 
! 			tr_class2_name varchar(50) NULL, 
! 			tr_class3_name varchar(50) NULL, 
! 			th_class1_name varchar(50) NULL, 
! 			th_class2_name varchar(50) NULL, 
! 			th_class3_name varchar(50) NULL, 
! 			td_class1_name varchar(50) NULL, 
! 			td_class2_name varchar(50) NULL, 
! 			td_class3_name varchar(50) NULL, 
! 			span_class1_name varchar(50) NULL, 
! 			span_class2_name varchar(50) NULL, 
! 			span_class3_name varchar(50) NULL";		
  		break;
  
--- 29,45 ----
  			ADD INDEX (topic_first_post_id)";
  
! 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
! 			ADD COLUMN tr_class1_name varchar(50) NULL, 
! 			ADD COLUMN tr_class2_name varchar(50) NULL, 
! 			ADD COLUMN tr_class3_name varchar(50) NULL, 
! 			ADD COLUMN th_class1_name varchar(50) NULL, 
! 			ADD COLUMN th_class2_name varchar(50) NULL, 
! 			ADD COLUMN th_class3_name varchar(50) NULL, 
! 			ADD COLUMN td_class1_name varchar(50) NULL, 
! 			ADD COLUMN td_class2_name varchar(50) NULL, 
! 			ADD COLUMN td_class3_name varchar(50) NULL, 
! 			ADD COLUMN span_class1_name varchar(50) NULL, 
! 			ADD COLUMN span_class2_name varchar(50) NULL, 
! 			ADD COLUMN span_class3_name varchar(50) NULL";
  		break;
  
***************
*** 63,66 ****
--- 63,91 ----
  		$sql[] = "CREATE INDEX topic_first_post_id_" . $table_prefix . "topics_index 
  			ON " . TOPICS_TABLE . " (topic_first_post_id)";
+ 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN tr_class1_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN tr_class2_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN tr_class3_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN th_class1_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN th_class2_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN th_class3_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN td_class1_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN td_class2_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN td_class3_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN span_class1_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN span_class2_name varchar(50) NULL"; 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " 
+ 			ADD COLUMN span_class3_name varchar(50) NULL";
  		break;
  
***************
*** 77,80 ****
--- 102,106 ----
  			SET head_stylesheet = 'subSilver.css' 
  			WHERE template_name = 'subSilver'";
+ 
  		$sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics";
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
***************
*** 83,86 ****
--- 109,113 ----
  		$sql[] = "CREATE  INDEX [IX_" . $table_prefix . "topics] 
  			ON [" . TOPICS_TABLE . "]([forum_id], [topic_type], [topic_first_post_id], [topic_last_post_id]) ON [PRIMARY]";
+ 
  		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD
  			tr_class1_name varchar(50) NULL, 
***************
*** 126,130 ****
  			span_class2_name varchar(50) NULL, 
  			span_class3_name varchar(50) NULL";
- 
  		break;
  
--- 153,156 ----

[Phpbb-checkins] CVS: phpBB2 update_to_RC3.php,1.5,1.6

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

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

Modified Files:
	update_to_RC3.php 
Log Message:
Few more updates to fix bugs and improve update in general ... DON'T run this if you've already run it, msaccess users should run this ONLY if they've not updated their primer DB since RC-2 was released

Index: update_to_RC3.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_to_RC3.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** update_to_RC3.php	2 Feb 2002 18:57:54 -0000	1.5
--- update_to_RC3.php	11 Feb 2002 00:30:01 -0000	1.6
***************
*** 13,22 ****
--- 13,62 ----
  	case 'mysql':
  	case 'mysql4':
+ 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
+ 			ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, 
+ 			ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, 
+ 			ADD INDEX (user_session_time)";
+ 		$sql[] = "ALTER TABLE " . SEARCH_TABLE . " 
+ 			MODIFY search_id int(11) NOT NULL";
+ 		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
+ 			MODIFY topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL";
+ 		$sql[] = "UPDATE " . THEMES_TABLE . " 
+ 			SET head_stylesheet = 'subSilver.css' 
+ 			WHERE template_name = 'subSilver'";
+ 			
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . "  
  			ADD COLUMN topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, 
  			ADD INDEX (topic_first_post_id)";
+ 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD
+ 			tr_class1_name varchar(50) NULL, 
+ 			tr_class2_name varchar(50) NULL, 
+ 			tr_class3_name varchar(50) NULL, 
+ 			th_class1_name varchar(50) NULL, 
+ 			th_class2_name varchar(50) NULL, 
+ 			th_class3_name varchar(50) NULL, 
+ 			td_class1_name varchar(50) NULL, 
+ 			td_class2_name varchar(50) NULL, 
+ 			td_class3_name varchar(50) NULL, 
+ 			span_class1_name varchar(50) NULL, 
+ 			span_class2_name varchar(50) NULL, 
+ 			span_class3_name varchar(50) NULL";		
  		break;
  
  	case 'postgresql':
+ 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
+ 			ADD COLUMN user_session_time int4";
+ 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
+ 			ADD COLUMN user_session_page int2";
+ 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
+ 			ALTER COLUMN user_session_time SET DEFAULT '0'";
+ 		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
+ 			ALTER COLUMN user_session_page SET DEFAULT '0'";
+ 		$sql[] = "CREATE INDEX user_session_time_" . $table_prefix . "users_index 
+ 			ON " . USERS_TABLE . " (user_session_time)";
+ 		$sql[] = "UPDATE " . THEMES_TABLE . " 
+ 			SET head_stylesheet = 'subSilver.css' 
+ 			WHERE template_name = 'subSilver'";
+ 			
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " 
  			ADD COLUMN topic_first_post_id int4";
***************
*** 27,42 ****
  	case 'mssql-odbc':
  	case 'mssql':
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
  			topic_first_post_id int NOT NULL, 
  			CONSTRAINT [DF_" . $table_prefix . "topics_topic_first_post_id] DEFAULT (0) FOR [topic_first_post_id]";
! 		$sql[] = "CREATE INDEX [IX_" . $table_prefix . "topics] 
! 			ON [" . TOPICS_TABLE . "]([topic_first_post_id]) ON [PRIMARY]";
  		break;
  
  	case 'msaccess':
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
  			topic_first_post_id int NOT NULL";
  		$sql[] = "CREATE INDEX topic_first_post_id 
  			ON " . TOPICS_TABLE . " (topic_first_post_id)";
  		break;
  
--- 67,130 ----
  	case 'mssql-odbc':
  	case 'mssql':
+ 		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
+ 			user_session_time int NOT NULL, 
+ 			user_session_page smallint NOT NULL, 
+ 			CONSTRAINT [DF_" . $table_prefix . "users_user_session_time] DEFAULT (0) FOR [user_session_time],
+ 			CONSTRAINT [DF_" . $table_prefix . "users_user_session_page] DEFAULT (0) FOR [user_session_page]";
+ 		$sql[] = "CREATE INDEX [IX_" . $table_prefix . "users] 
+ 			ON [" . USERS_TABLE . "]([user_session_time]) ON [PRIMARY]";
+ 		$sql[] = "UPDATE " . THEMES_TABLE . " 
+ 			SET head_stylesheet = 'subSilver.css' 
+ 			WHERE template_name = 'subSilver'";
+ 		$sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics";
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
  			topic_first_post_id int NOT NULL, 
  			CONSTRAINT [DF_" . $table_prefix . "topics_topic_first_post_id] DEFAULT (0) FOR [topic_first_post_id]";
! 		$sql[] = "CREATE  INDEX [IX_" . $table_prefix . "topics] 
! 			ON [" . TOPICS_TABLE . "]([forum_id], [topic_type], [topic_first_post_id], [topic_last_post_id]) ON [PRIMARY]";
! 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD
! 			tr_class1_name varchar(50) NULL, 
! 			tr_class2_name varchar(50) NULL, 
! 			tr_class3_name varchar(50) NULL, 
! 			th_class1_name varchar(50) NULL, 
! 			th_class2_name varchar(50) NULL, 
! 			th_class3_name varchar(50) NULL, 
! 			td_class1_name varchar(50) NULL, 
! 			td_class2_name varchar(50) NULL, 
! 			td_class3_name varchar(50) NULL, 
! 			span_class1_name varchar(50) NULL, 
! 			span_class2_name varchar(50) NULL, 
! 			span_class3_name varchar(50) NULL";
  		break;
  
  	case 'msaccess':
+ 		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
+ 			user_session_time int NOT NULL, 
+ 			user_session_page smallint NOT NULL";
+ 		$sql[] = "CREATE INDEX user_session_time 
+ 			ON " . USERS_TABLE . " (user_session_time)";
+ 		$sql[] = "UPDATE " . THEMES_TABLE . " 
+ 			SET head_stylesheet = 'subSilver.css' 
+ 			WHERE template_name = 'subSilver'";
+ 
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
  			topic_first_post_id int NOT NULL";
  		$sql[] = "CREATE INDEX topic_first_post_id 
  			ON " . TOPICS_TABLE . " (topic_first_post_id)";
+ 
+ 		$sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD
+ 			tr_class1_name varchar(50) NULL, 
+ 			tr_class2_name varchar(50) NULL, 
+ 			tr_class3_name varchar(50) NULL, 
+ 			th_class1_name varchar(50) NULL, 
+ 			th_class2_name varchar(50) NULL, 
+ 			th_class3_name varchar(50) NULL, 
+ 			td_class1_name varchar(50) NULL, 
+ 			td_class2_name varchar(50) NULL, 
+ 			td_class3_name varchar(50) NULL, 
+ 			span_class1_name varchar(50) NULL, 
+ 			span_class2_name varchar(50) NULL, 
+ 			span_class3_name varchar(50) NULL";
+ 
  		break;
  
***************
*** 86,90 ****
  
  		$sql = "UPDATE " . THEMES_TABLE . " 
! 			SET head_stylesheet = '', body_background = '', body_bgcolor = 'E5E5E5', body_text = '000000', body_link = '006699', body_vlink = '5493B4', body_alink = '', body_hlink = 'DD6900', tr_color1 = 'EFEFEF', tr_color2 = 'DEE3E7', tr_color3 = 'D1D7DC', tr_class1 = '', tr_class2 = '', tr_class3 = '', th_color1 = '98AAB1', th_color2 = '006699', th_color3 = 'FFFFFF', th_class1 = 'cellpic1.gif', th_class2 = 'cellpic3.gif', th_class3 = 'cellpic2.jpg', td_color1 = 'FAFAFA', td_color2 = 'FFFFFF', td_color3 = '', td_class1 = 'row1', td_class2 = 'row2', td_class3 = '', fontface1 = 'Verdana, Arial, Helvetica, sans-serif', fontface2 = 'Trebuchet MS', fontface3 = 'Courier, \'Courier New\', sans-serif', fontsize1 = 10, fontsize2 = 11, fontsize3 = 12, fontcolor1 = '444444', fontcolor2 = '006600', fontcolor3 = 'FFA34F', span_class1 = '', span_class2 = '', span_class3 = ''
  			WHERE themes_id = $theme_id";
  		if ( !($result = $db->sql_query($sql)) )
--- 174,178 ----
  
  		$sql = "UPDATE " . THEMES_TABLE . " 
! 			SET head_stylesheet = '', body_background = '', body_bgcolor = 'E5E5E5', body_text = '000000', body_link = '006699', body_vlink = '5493B4', body_alink = '', body_hlink = 'DD6900', tr_color1 = 'EFEFEF', tr_color2 = 'DEE3E7', tr_color3 = 'D1D7DC', tr_class1 = '', tr_class2 = '', tr_class3 = '', th_color1 = '98AAB1', th_color2 = '006699', th_color3 = 'FFFFFF', th_class1 = 'cellpic1.gif', th_class2 = 'cellpic3.gif', th_class3 = 'cellpic2.jpg', td_color1 = 'FAFAFA', td_color2 = 'FFFFFF', td_color3 = '', td_class1 = 'row1', td_class2 = 'row2', td_class3 = '', fontface1 = 'Verdana, Arial, Helvetica, sans-serif', fontface2 = 'Trebuchet MS', fontface3 = 'Courier, ''Courier New'', sans-serif', fontsize1 = 10, fontsize2 = 11, fontsize3 = 12, fontcolor1 = '444444', fontcolor2 = '006600', fontcolor3 = 'FFA34F', span_class1 = '', span_class2 = '', span_class3 = ''
  			WHERE themes_id = $theme_id";
  		if ( !($result = $db->sql_query($sql)) )
***************
*** 101,108 ****
  	}
  
! 	$sql = "SELECT post_id, topic_id  
! 		FROM " . POSTS_TABLE . " 
! 		GROUP BY topic_id ASC
! 		ORDER BY post_id ASC";
  	if ( !($result = $db->sql_query($sql)) )
  	{
--- 189,196 ----
  	}
  
! 	$sql = "SELECT MIN(post_id) AS first_post_id, topic_id
! 		FROM " . POSTS_TABLE . "
! 		GROUP BY topic_id
! 		ORDER BY topic_id ASC";
  	if ( !($result = $db->sql_query($sql)) )
  	{
***************
*** 114,118 ****
  		do
  		{
! 			$post_id = $row['post_id'];
  			$topic_id = $row['topic_id'];
  
--- 202,206 ----
  		do
  		{
! 			$post_id = $row['first_post_id'];
  			$topic_id = $row['topic_id'];
  

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

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

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

Modified Files:
	search.php 
Log Message:
Speed up insertion of new words in mssql and mysql ... lets see what this breaks since the new post/posting isn't commited yet :)

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/search.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** search.php	28 Jan 2002 18:47:31 -0000	1.5
--- search.php	11 Feb 2002 00:28:17 -0000	1.6
***************
*** 20,23 ****
--- 20,42 ----
   ***************************************************************************/
  
+ //
+ // This charset data is borrowed from mnoGoSearch 1.x (http://www.mnogosearch.com/ )
+ //
+ $charset_all = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+ 
+ $charset = array();
+ $charset['usacii'] = array();
+ $charset['iso88591'] = array(0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xDF, 0); /* Western European */
+ $charset['iso88592'] = array(193, 195, 194, 196, 161, 198, 200, 199, 207, 201, 204, 203, 202, 208, 205, 206, 197, 165, 163, 209, 210, 211, 212, 214, 213, 192, 216, 166, 169, 170, 171, 222, 218, 220, 219, 217, 221, 175, 172, 174, 223, 225, 227, 226, 228, 177, 230, 232, 231, 239, 233, 236, 235, 234, 240, 237, 238, 229, 181, 179, 241, 242, 243, 244, 246, 245, 224, 248, 182, 185, 186, 187, 254, 250, 252, 251, 249, 253, 191, 188, 190, 223, 0); /* Central European */
+ $charset['iso88594'] = array(); /* Baltic */
+ $charset['iso88595'] = array(0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xA1, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xF1, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0); /* Cyrillic */
+ $charset['iso88596'] = array(); /* Arabic */
+ $charset['iso88597'] = array(0xc1, 0xb6, 0xdc, 0xc2, 0xc3, 0xc4, 0xc5, 0xb8, 0xdd, 0xc6, 0xc7, 0xb9, 0xde, 0xc8, 0xc9, 0xba, 0xda, 0xdf, 0xc0, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xbc, 0xfc, 0xd0, 0xd1, 0xd3, 0xf2, 0xd4, 0xd5, 0xbe, 0xdb, 0xfd, 0xfb, 0xe0, 0xd6, 0xd7, 0xd8, 0xd9, 0xbf, 0xfe, 0xe1, 0xe1, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe5, 0xe5, 0xe6, 0xe7, 0xe7, 0xe7, 0xe8, 0xe9, 0xe9, 0xe9, 0xe9, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xef, 0xef, 0xf0, 0xf1, 0xf3, 0xf3, 0xf4, 0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xf9, 0xf9, 0); /* Greek */
+ $charset['iso88598'] = array(0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0x00); /* Hebrew */
+ $charset['iso88599'] = array(); /* Turkish */
+ $charset['iso885913'] = array(); /* Baltic 2 */
+ $charset['cp1256'] = array(0x8d, 0x8e, 0x90, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xde, 0xdf, 0xe1, 0xe3, 0xe4, 0xe5, 0xe6, 0xec, 0xed, 0); 
+ $charset[''] = array();
+ 
  function clean_words($mode, &$entry, &$synonym_list)
  {
***************
*** 26,31 ****
  	static $drop_char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "",  " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ",  " ", " ");
  
! 	static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
! 	static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
  
  	$entry = " " . strip_tags(strtolower($entry)) . " ";
--- 45,50 ----
  	static $drop_char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "",  " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ",  " ", " ");
  
! //	static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
! //	static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
  
  	$entry = " " . strip_tags(strtolower($entry)) . " ";
***************
*** 118,121 ****
--- 137,141 ----
  	{
  		$title_match = ( $word_in == 'title' ) ? 1 : 0;
+ 		$value_sql = "";
  
  		if( !empty($search_matches) )
***************
*** 134,144 ****
  				{
  					$word[] = $search_matches[$i]; 
! 
! 					if( $word_text_sql != "" )
! 					{
! 						$word_text_sql .= ", ";
! 					}
! 
! 					$word_text_sql .= "'" . $search_matches[$i] . "'";
  				} 
  
--- 154,158 ----
  				{
  					$word[] = $search_matches[$i]; 
! 					$word_text_sql .= ( ( $word_text_sql != "" ) ? ", " : "" ) . "'" . $search_matches[$i] . "'";
  				} 
  
***************
*** 149,154 ****
  				FROM " . SEARCH_WORD_TABLE . " 
  				WHERE word_text IN ($word_text_sql)";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
  			{
  				message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
--- 163,167 ----
  				FROM " . SEARCH_WORD_TABLE . " 
  				WHERE word_text IN ($word_text_sql)";
! 			if( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
***************
*** 157,167 ****
  			$check_words = array();
  			$word_id_list = array();
! 			if( $word_check_count = $db->sql_numrows($result) )
  			{
! 				while( $row = $db->sql_fetchrow($result) )
! 				{
! 					$check_words[$row['word_text']] = $row['word_common'];
! 					$word_id_list[] = $row['word_id'];
! 				}
  			}
  
--- 170,177 ----
  			$check_words = array();
  			$word_id_list = array();
! 			while( $row = $db->sql_fetchrow($result) )
  			{
! 				$check_words[$row['word_text']] = $row['word_common'];
! 				$word_id_list[] = $row['word_id'];
  			}
  
***************
*** 172,184 ****
  				$word_common = false;
  
! 				if( $word_check_count )
  				{
! 					if( isset($check_words[$word[$i]]) )
! 					{
! 						$new_match = false;
! 					}
  				}
! 
! 				if( empty($check_words[$word[$i]]) )
  				{
  					$match_word[] = "'" . $word[$i] . "'";
--- 182,190 ----
  				$word_common = false;
  
! 				if( isset($check_words[$word[$i]]) )
  				{
! 					$new_match = false;
  				}
! 				else if( empty($check_words[$word[$i]]) )
  				{
  					$match_word[] = "'" . $word[$i] . "'";
***************
*** 187,206 ****
  				if( $new_match )
  				{
! 					$sql = "INSERT INTO " . SEARCH_WORD_TABLE . "  (word_text, word_common) 
! 						VALUES ('" . $word[$i] . "', 0)"; 
! 					$result = $db->sql_query($sql); 
! 					if( !$result )
  					{
! 						message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
  					}
  				}
  			}
  
  			$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) 
  				SELECT $post_id, word_id, $title_match  
  					FROM " . SEARCH_WORD_TABLE . " 
  					WHERE word_text IN ($word_text_sql)"; 
! 			$result = $db->sql_query($sql); 
! 			if( !$result )
  			{
  				message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
--- 193,245 ----
  				if( $new_match )
  				{
! 					switch( SQL_LAYER )
  					{
! 						case 'mysql':
! 						case 'mysql4':
! 							$value_sql .= ( ( $value_sql != "" ) ? ", " : "" ) . "('" . $word[$i] . "', 0)";
! 							break;
! 						case 'mssql':
! 						case 'mssql-odbc':
! 							$value_sql .= ( ( $value_sql != "" ) ? " UNION ALL " : "" ) . "SELECT '" . $word[$i] . "', 0";
! 							break;
! 						default:
! 							$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
! 								VALUES ('" . $word[$i] . "', 0)"; 
! 							if( !($result = $db->sql_query($sql)) )
! 							{
! 								message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
! 							}
! 							break;
  					}
  				}
  			}
  
+ 			if ( $value_sql != "" )
+ 			{
+ 				switch ( SQL_LAYER )
+ 				{
+ 					case 'mysql':
+ 					case 'mysql4':
+ 						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
+ 							VALUES $value_sql"; 
+ 						break;
+ 					case 'mssql':
+ 					case 'mssql-odbc':
+ 						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
+ 							$value_sql"; 
+ 						break;
+ 				}
+ 
+ 				if( !($result = $db->sql_query($sql)) )
+ 				{
+ 					message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
+ 				}
+ 			}
+ 
  			$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) 
  				SELECT $post_id, word_id, $title_match  
  					FROM " . SEARCH_WORD_TABLE . " 
  					WHERE word_text IN ($word_text_sql)"; 
! 			if( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
***************
*** 217,228 ****
  // Check if specified words are too common now
  //
! function remove_common($mode, $percent, $word_id_list = array())
  {
  	global $db;
  
  	$sql = ( $mode == "global" ) ? "SELECT COUNT(DISTINCT post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE;
! 
! 	$result = $db->sql_query($sql); 
! 	if( !$result )
  	{
  		message_die(GENERAL_ERROR, "Couldn't obtain post count", "", __LINE__, __FILE__, $sql);
--- 256,265 ----
  // Check if specified words are too common now
  //
! function remove_common($mode, $fraction, $word_id_list = array())
  {
  	global $db;
  
  	$sql = ( $mode == "global" ) ? "SELECT COUNT(DISTINCT post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE;
! 	if( !($result = $db->sql_query($sql)) )
  	{
  		message_die(GENERAL_ERROR, "Couldn't obtain post count", "", __LINE__, __FILE__, $sql);
***************
*** 231,237 ****
  	$row = $db->sql_fetchrow($result);
  
! 	if( $row['total_posts'] > 100 )
  	{
! 		$common_threshold = floor($row['total_posts'] * $percent);
  
  		$word_id_sql = "";
--- 268,274 ----
  	$row = $db->sql_fetchrow($result);
  
! 	if( $row['total_posts'] >= 100 )
  	{
! 		$common_threshold = floor($row['total_posts'] * $fraction);
  
  		$word_id_sql = "";
***************
*** 246,285 ****
  			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_MATCH_TABLE . "  
! 					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);
! 				}
  			}
  		}
--- 283,314 ----
  			GROUP BY word_id 
  			HAVING COUNT(word_id) > $common_threshold";
! 		if( !($result = $db->sql_query($sql)) )
  		{
  			message_die(GENERAL_ERROR, "Couldn't obtain common word list", "", __LINE__, __FILE__, $sql);
  		}
  
! 		$common_word_id = "";
! 		while( $row = $db->sql_fetchrow($result) )
  		{
! 			$common_word_id = ( $common_word_id != "" ) ? ", " . $row['word_id'] : $row['word_id'];
! 		}
! 
! 		$db->sql_freeresult($result);
! 
! 		if( $common_word_id != "" )
! 		{
! 			$sql = "UPDATE " . SEARCH_WORD_TABLE . "
! 				SET word_common = " . TRUE . " 
! 				WHERE word_id IN ($common_word_id)";
! 			if( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
  			}
  
! 			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
! 				WHERE word_id IN ($common_word_id)";
! 			if( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
  			}
  		}
***************
*** 295,349 ****
  	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':
--- 324,327 ----
***************
*** 354,392 ****
  			if( $result = $db->sql_query($sql) )
  			{
! 				if( $unmatched_count = $db->sql_numrows($result) )
  				{
! 					$rowset = array();
! 					while( $row = $db->sql_fetchrow($result) )
! 					{
! 						$rowset[] = $row['word_id'];
! 					}
! 
! 					$word_id_sql = implode(", ", $rowset);
  
! 					if( $word_id_sql )
! 					{
! 						$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "  
! 							WHERE word_id IN ($word_id_sql)";
! 						$result = $db->sql_query($sql); 
! 						if( !$result )
! 						{
! 							message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
! 						}
! 					}
! 					else
  					{
! 						return 0;
  					}
! 				}
! 				else
! 				{
! 					return 0;
  				}
  			}
  
  			break;
  	}
  
! 	return $unmatched_count;
  }
  
--- 332,372 ----
  			if( $result = $db->sql_query($sql) )
  			{
! 				$word_id_sql = "";
! 				while( $row = $db->sql_fetchrow($result) )
  				{
! 					$word_id_sql .= ( $word_id_sql != "" ) ? ", " . $row['word_id'] : $row['word_id']; 
! 				}
  
! 				if( $word_id_sql != "" )
! 				{
! 					$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "  
! 						WHERE word_id IN ($word_id_sql)";
! 					if( !($result = $db->sql_query($sql, END_TRANSACTION)) )
  					{
! 						message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
  					}
! 
! 					return $db->sql_affectedrows();
  				}
  			}
+ 			break;
+ 
+ 		default:
+ 			$sql = "DELETE FROM " . SEARCH_WORD_TABLE . " 
+ 				WHERE word_id NOT IN ( 
+ 					SELECT word_id  
+ 					FROM " . SEARCH_MATCH_TABLE . "  
+ 					GROUP BY word_id)"; 
+ 			if( !($result = $db->sql_query($sql, END_TRANSACTION)) )
+ 			{
+ 				message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
+ 			}
+ 
+ 			return $db->sql_affectedrows();
  
  			break;
  	}
  
! 	return 0;
  }
  

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.19,1.20

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

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

Modified Files:
	mssql_schema.sql 
Log Message:
Changes for first_topic_id

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** mssql_schema.sql	2 Feb 2002 18:10:53 -0000	1.19
--- mssql_schema.sql	11 Feb 2002 00:08:14 -0000	1.20
***************
*** 635,639 ****
  GO
  
!  CREATE  INDEX [IX_phpbb_topics] ON [phpbb_topics]([forum_id], [topic_type], [topic_last_post_id]) ON [PRIMARY]
  GO
  
--- 635,639 ----
  GO
  
!  CREATE  INDEX [IX_phpbb_topics] ON [phpbb_topics]([forum_id], [topic_type], [topic_first_post_id], [topic_last_post_id]) ON [PRIMARY]
  GO
  

[Phpbb-checkins] CVS: phpBB2/includes smtp.php,1.11,1.12

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

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

Modified Files:
	smtp.php 
Log Message:
doh, left existing HELO in place ...

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** smtp.php	9 Feb 2002 22:08:52 -0000	1.11
--- smtp.php	10 Feb 2002 13:04:14 -0000	1.12
***************
*** 130,137 ****
  	server_parse($socket, "220");
  
- 	// Send the RFC821 specified HELO.
- 	fputs($socket, "HELO " . $board_config['smtp_host'] . "\r\n");
- 	server_parse($socket, "250");
- 
  	if( !empty($board_config['smtp_username']) && !empty($board_config['smtp_password']) )
  	{ 
--- 130,133 ----

[Phpbb-checkins] CVS: phpBB2/includes smtp.php,1.10,1.11

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

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

Modified Files:
	smtp.php 
Log Message:
Updated ESMTP AUTH as indicated by SirSir

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** smtp.php	4 Feb 2002 14:32:41 -0000	1.10
--- smtp.php	9 Feb 2002 22:08:52 -0000	1.11
***************
*** 20,50 ****
   ***************************************************************************/
  
- /****************************************************************************
- *	This script should be included if the admin has configured the board for
- *	smtp mail instead of standard sendmail.  It includes a function smtpmail
- * 	which is identical to the standard built in mail function in usage.
- ****************************************************************************/
- 
- /****************************************************************************
- *	Function: 		server_parse
- *	Description:	This funtion processes the smtp server's response codes
- *	Usage: 			This function is only used interanally by the smtpmail
- *						function.  It takes two arguments the first a socket pointer
- *						to the opened socket to the server and the second the
- *						response code you are looking for.
- ****************************************************************************/
  define('SMTP_INCLUDED', 1);
! function server_parse($socket, $response)
! {
! 	if( !($server_response = fgets($socket, 256)) )
! 	{
! 		message_die(GENERAL_ERROR, "Couldn't get mail server response codes", "", __LINE__, __FILE__);
! 	}
! 
! 	if( !(substr($server_response, 0, 3) == $response) )
! 	{
! 		message_die(GENERAL_ERROR, "Ran into problems sending Mail. Response: $server_response", "", __LINE__, __FILE__);
! 	}
! }
  
  /****************************************************************************
--- 20,44 ----
   ***************************************************************************/
  
  define('SMTP_INCLUDED', 1);
! //
! // This function has been modified as provided
! // by SirSir to allow multiline responses when 
! // using SMTP Extensions
! //
! function server_parse($socket, $response) 
! { 
!    while ( substr($server_response,3,1) != ' ' ) 
!    { 
!       if( !( $server_response = fgets($socket, 256) ) ) 
!       { 
!          message_die(GENERAL_ERROR, "Couldn't get mail server response codes", "", __LINE__, __FILE__); 
!       } 
!    } 
! 
!    if( !( substr($server_response, 0, 3) == $response ) ) 
!    { 
!       message_die(GENERAL_ERROR, "Ran into problems sending Mail. Response: $server_response", "", __LINE__, __FILE__); 
!    } 
! } 
  
  /****************************************************************************
***************
*** 141,153 ****
  
  	if( !empty($board_config['smtp_username']) && !empty($board_config['smtp_password']) )
! 	{
! 		fputs($socket, "AUTH LOGIN\r\n");
! 
! 		server_parse($socket, "334");
! 		fputs($socket, base64_encode($board_config['smtp_username']) . "\r\n");
! 		server_parse($socket, "334");
! 		fputs($socket, base64_encode($board_config['smtp_password']) . "\r\n");
! 
! 		server_parse($socket, "235");
  	}
  
--- 135,157 ----
  
  	if( !empty($board_config['smtp_username']) && !empty($board_config['smtp_password']) )
! 	{ 
! 		// Send the RFC2554 specified EHLO. 
! 		// This improved as provided by SirSir to accomodate
! 		// both SMTP AND ESMTP capable servers
! 		fputs($socket, "EHLO " . $board_config['smtp_host'] . "\r\n"); 
! 		server_parse($socket, "250"); 
! 
! 		fputs($socket, "AUTH LOGIN\r\n"); 
! 		server_parse($socket, "334"); 
! 		fputs($socket, base64_encode($board_config['smtp_username']) . "\r\n"); 
! 		server_parse($socket, "334"); 
! 		fputs($socket, base64_encode($board_config['smtp_password']) . "\r\n"); 
! 		server_parse($socket, "235"); 
! 	} 
! 	else 
! 	{ 
! 		// Send the RFC821 specified HELO. 
! 		fputs($socket, "HELO " . $board_config['smtp_host'] . "\r\n"); 
! 		server_parse($socket, "250"); 
  	}
  

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.19,1.20

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

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

Modified Files:
	admin_styles.php 
Log Message:
Test before you commit, Bart

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** admin_styles.php	9 Feb 2002 15:48:13 -0000	1.19
--- admin_styles.php	9 Feb 2002 16:56:43 -0000	1.20
***************
*** 518,522 ****
  				$selected_names = $db->sql_fetchrow($result);
  
! 				reset($selected_values)
  				//$selected = array_merge($selected_values, $selected_names);
  				if(count($selected_values))
--- 518,522 ----
  				$selected_names = $db->sql_fetchrow($result);
  
! 				reset($selected_values);
  				//$selected = array_merge($selected_values, $selected_names);
  				if(count($selected_values))
***************
*** 528,532 ****
  				}
  
! 				reset($selected_names)
  				if($selected_names)
  				{
--- 528,532 ----
  				}
  
! 				reset($selected_names);
  				if($selected_names)
  				{

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

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

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

Modified Files:
	admin_users.php 
Log Message:
Fixed problem with stripping HTML in profile (#512639)

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** admin_users.php	27 Jan 2002 14:13:59 -0000	1.41
--- admin_users.php	9 Feb 2002 16:55:19 -0000	1.42
***************
*** 296,300 ****
  		{
  			$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
! 			if( $allowhtml )
  			{
  				$sig_length_check = preg_replace("/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is", "\\1\\3\\4", $sig_length_check);
--- 296,300 ----
  		{
  			$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
! 			if( $board_config['allow_html'] )
  			{
  				$sig_length_check = preg_replace("/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is", "\\1\\3\\4", $sig_length_check);
***************
*** 304,310 ****
  			if($signature_bbcode_uid == '')
  			{
! 				$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
  			}
! 			$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
  
  			if( strlen($sig_length_check) > $board_config['max_sig_chars'] )
--- 304,310 ----
  			if($signature_bbcode_uid == '')
  			{
! 				$signature_bbcode_uid = ( $board_config['allow_bbcode'] ) ? make_bbcode_uid() : "";
  			}
! 			$signature = prepare_message($signature, $board_config['allow_html'], $board_config['allow_bbcode'], $board_config['allow_smilies'], $signature_bbcode_uid);
  
  			if( strlen($sig_length_check) > $board_config['max_sig_chars'] )

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.114,1.115 post.php,1.13,1.14

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

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

Modified Files:
	functions.php post.php 
Log Message:
Fixed 404 for header (#51499)

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** functions.php	8 Feb 2002 20:54:21 -0000	1.114
--- functions.php	9 Feb 2002 15:54:40 -0000	1.115
***************
*** 789,793 ****
  function username_search($search_match, $is_inline_review = 0, $default_list = "")
  {
! 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
  	global $starttime;
  
--- 789,793 ----
  function username_search($search_match, $is_inline_review = 0, $default_list = "")
  {
! 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
  	global $starttime;
  
***************
*** 1087,1089 ****
  }
  
! ?>
\ No newline at end of file
--- 1087,1089 ----
  }
  
! ?>

Index: post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/post.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** post.php	24 Jan 2002 03:26:08 -0000	1.13
--- post.php	9 Feb 2002 15:54:40 -0000	1.14
***************
*** 104,108 ****
  function generate_smilies($mode, $page_id)
  {
! 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
  	global $user_ip, $session_length, $starttime;
  	global $userdata;
--- 104,108 ----
  function generate_smilies($mode, $page_id)
  {
! 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
  	global $user_ip, $session_length, $starttime;
  	global $userdata;
***************
*** 205,207 ****
  }
  
! ?>
\ No newline at end of file
--- 205,207 ----
  }
  
! ?>

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.18,1.19

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

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

Modified Files:
	admin_styles.php 
Log Message:
Fixed empty forum in styles admin bug (#515122), fix suggested by SirSir

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** admin_styles.php	24 Jan 2002 02:51:00 -0000	1.18
--- admin_styles.php	9 Feb 2002 15:48:13 -0000	1.19
***************
*** 518,521 ****
--- 518,522 ----
  				$selected_names = $db->sql_fetchrow($result);
  
+ 				reset($selected_values)
  				//$selected = array_merge($selected_values, $selected_names);
  				if(count($selected_values))
***************
*** 527,530 ****
--- 528,532 ----
  				}
  
+ 				reset($selected_names)
  				if($selected_names)
  				{

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.172,1.173

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

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

Modified Files:
	viewtopic.php 
Log Message:
Or this one even ... this is not easy ... 

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -r1.172 -r1.173
*** viewtopic.php	8 Feb 2002 20:50:18 -0000	1.172
--- viewtopic.php	8 Feb 2002 21:02:54 -0000	1.173
***************
*** 459,464 ****
  		if( trim($words[$i]) != "" )
  		{
! 			$highlight_match[] = "#\b(" . str_replace("\*", ".*?", $words[$i]) . ")(?!(.*?".">.*?<)|(.*?\">))\b#i";
! 			$highlight_replace[] = '<span style="color:#' . $theme['fontcolor3'] . '"><b>\1</b></span>';
  		}
  	}
--- 459,464 ----
  		if( trim($words[$i]) != "" )
  		{
! 			$highlight_match[] = "#\b(\/?)(" . str_replace("\*", ".*?", $words[$i]) . ")(?!(.*?".">.*?<)|(.*?\">)|((1)?".">))\b#i";
! 			$highlight_replace[] = '<span style="color:#' . $theme['fontcolor3'] . '"><b>\2</b></span>';
  		}
  	}

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.113,1.114

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

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

Modified Files:
	functions.php 
Log Message:
Fixed missing " bug #514823 

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -r1.113 -r1.114
*** functions.php	8 Feb 2002 01:44:27 -0000	1.113
--- functions.php	8 Feb 2002 20:54:21 -0000	1.114
***************
*** 459,463 ****
  		if ( $on_page < $total_pages )
  		{
! 			$page_string .= '&nbsp;&nbsp;<a href=' . append_sid($base_url . "&amp;start=" . ( $on_page * $per_page ) ) . '">' . $lang['Next'] . '</a>';
  		}
  
--- 459,463 ----
  		if ( $on_page < $total_pages )
  		{
! 			$page_string .= '&nbsp;&nbsp;<a href="' . append_sid($base_url . "&amp;start=" . ( $on_page * $per_page ) ) . '">' . $lang['Next'] . '</a>';
  		}
  

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.171,1.172

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

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

Modified Files:
	viewtopic.php 
Log Message:
Okay, let's give this highlighting preg_ a shot ...

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -r1.171 -r1.172
*** viewtopic.php	3 Feb 2002 18:34:36 -0000	1.171
--- viewtopic.php	8 Feb 2002 20:50:18 -0000	1.172
***************
*** 459,464 ****
  		if( trim($words[$i]) != "" )
  		{
! 			$highlight_match[] = "#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($words[$i], "#")) . ")(?!.*?<\/a>)(?!.*?\[/url\])(?!.*?<\/span>)\b#i";
! 			$highlight_replace[] = '<span style="color:#' . $theme['fontcolor3'] . '"><b>\\1</b></span>';
  		}
  	}
--- 459,464 ----
  		if( trim($words[$i]) != "" )
  		{
! 			$highlight_match[] = "#\b(" . str_replace("\*", ".*?", $words[$i]) . ")(?!(.*?".">.*?<)|(.*?\">))\b#i";
! 			$highlight_replace[] = '<span style="color:#' . $theme['fontcolor3'] . '"><b>\1</b></span>';
  		}
  	}
***************
*** 1000,1012 ****
  
  	//
- 	// Highlight active words (primarily for search)
- 	//
- 	if( $highlight_active )
- 	{
- 		$message = preg_replace($highlight_match, $highlight_replace, $message);
- 	}
- 
- 
- 	//
  	// If the board has HTML off but the post has HTML
  	// on then we process it, else leave it alone
--- 1000,1003 ----
***************
*** 1046,1049 ****
--- 1037,1048 ----
  	}
  	$message = make_clickable($message);
+ 
+ 	//
+ 	// Highlight active words (primarily for search)
+ 	//
+ 	if( $highlight_active )
+ 	{
+ 		$message = preg_replace($highlight_match, $highlight_replace, $message);
+ 	}
  
  	//

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.112,1.113

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

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

Modified Files:
	functions.php 
Log Message:
hmmm, doh ... of course removing the preg_quote here is no doubt going to cause bug reports of "I can't censor xyz@asd" ...

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -r1.112 -r1.113
*** functions.php	8 Feb 2002 01:33:36 -0000	1.112
--- functions.php	8 Feb 2002 01:44:27 -0000	1.113
***************
*** 766,784 ****
  	$sql = "SELECT word, replacement
  		FROM  " . WORDS_TABLE;
! 	if( !$words_result = $db->sql_query($sql) )
  	{
  		message_die(GENERAL_ERROR, "Couldn't get censored words from database.", "", __LINE__, __FILE__, $sql);
  	}
! 	else
  	{
! 		if ( $row = $db->sql_fetchrow($result) )
  		{
! 			do 
! 			{
! 				$orig_word[] = "#\b(" . str_replace("\*", "\w*?", $row['word']) . ")\b#is";
! 				$replacement_word[] = $row['replacement'];
! 			}
! 			while ( $row = $db->sql_fetchrow($result) );
  		}
  	}
  
--- 766,782 ----
  	$sql = "SELECT word, replacement
  		FROM  " . WORDS_TABLE;
! 	if( !($result = $db->sql_query($sql)) )
  	{
  		message_die(GENERAL_ERROR, "Couldn't get censored words from database.", "", __LINE__, __FILE__, $sql);
  	}
! 
! 	if ( $row = $db->sql_fetchrow($result) )
  	{
! 		do 
  		{
! 			$orig_word[] = "#\b(" . str_replace("*", "\w*?", $row['word']) . ")\b#is";
! 			$replacement_word[] = $row['replacement'];
  		}
+ 		while ( $row = $db->sql_fetchrow($result) );
  	}