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

[Phpbb-checkins] CVS: phpBB2/includes prune.php,1.12,1.13

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

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

Modified Files:
	prune.php 
Log Message:
Wrong function name for cleaning up search tables ... I did change this but looks like I didn't commit it ... @!#%# hell

Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/prune.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** prune.php	18 Mar 2002 23:53:12 -0000	1.12
--- prune.php	20 Mar 2002 15:46:36 -0000	1.13
***************
*** 102,106 ****
  			}
  
! 			remove_unmatched_words();
  
  			$sql = "UPDATE " . FORUMS_TABLE . "
--- 102,106 ----
  			}
  
! 			remove_search_post($sql_post);
  
  			$sql = "UPDATE " . FORUMS_TABLE . "

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.181,1.182

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

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

Modified Files:
	viewtopic.php 
Log Message:
Fix error when view is set to somethng unexpected

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -r1.181 -r1.182
*** viewtopic.php	19 Mar 2002 00:43:19 -0000	1.181
--- viewtopic.php	20 Mar 2002 15:04:21 -0000	1.182
***************
*** 59,71 ****
  // or older topic
  //
! if( isset($HTTP_GET_VARS["view"]) && empty($HTTP_GET_VARS[POST_POST_URL]) )
  {
! 	if( $HTTP_GET_VARS["view"] == "newest" )
  	{
! 		if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_sid"]) )
  		{
! 			$session_id = $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_sid"];
  
! 			if( $session_id )
  			{
  				$sql = "SELECT p.post_id 
--- 59,71 ----
  // or older topic
  //
! if ( isset($HTTP_GET_VARS['view']) && empty($HTTP_GET_VARS[POST_POST_URL]) )
  {
! 	if ( $HTTP_GET_VARS['view'] == 'newest' )
  	{
! 		if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) )
  		{
! 			$session_id = $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid'];
  
! 			if ( $session_id )
  			{
  				$sql = "SELECT p.post_id 
***************
*** 77,86 ****
  					ORDER BY p.post_time ASC 
  					LIMIT 1";
! 				if( !$result = $db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, "Couldn't obtain newer/older topic information", "", __LINE__, __FILE__, $sql);
  				}
  
! 				if( !($row = $db->sql_fetchrow($result)) )
  				{
  					message_die(GENERAL_MESSAGE, 'No_new_posts_last_visit');
--- 77,86 ----
  					ORDER BY p.post_time ASC 
  					LIMIT 1";
! 				if ( !($result = $db->sql_query($sql)) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not obtain newer/older topic information', '', __LINE__, __FILE__, $sql);
  				}
  
! 				if ( !($row = $db->sql_fetchrow($result)) )
  				{
  					message_die(GENERAL_MESSAGE, 'No_new_posts_last_visit');
***************
*** 90,93 ****
--- 90,94 ----
  					$post_id = $row['post_id'];
  					header("Location: " . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id#$post_id", true));
+ 					exit;
  				}
  			}
***************
*** 95,98 ****
--- 96,100 ----
  			{
  				header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
+ 				exit;
  			}
  		}
***************
*** 100,149 ****
  		{
  			header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
  		}
  	}
! 	else if( $HTTP_GET_VARS["view"] == "next" )
  	{
! 		$sql_condition = ">";
! 		$sql_ordering = "ASC";
! 	}
! 	else if( $HTTP_GET_VARS["view"] == "previous" )
! 	{
! 		$sql_condition = "<";
! 		$sql_ordering = "DESC";
! 	}
  
! 	$sql = "SELECT t.topic_id
! 		FROM " . TOPICS_TABLE . " t, " . TOPICS_TABLE . " t2, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2
! 		WHERE t2.topic_id = $topic_id
! 			AND p2.post_id = t2.topic_last_post_id
! 			AND t.forum_id = t2.forum_id
! 			AND p.post_id = t.topic_last_post_id
! 			AND p.post_time $sql_condition p2.post_time
! 			AND p.topic_id = t.topic_id
! 		ORDER BY p.post_time $sql_ordering
! 		LIMIT 1";
! 	if(!$result = $db->sql_query($sql))
! 	{
! 		message_die(GENERAL_ERROR, "Couldn't obtain newer/older topic information", "", __LINE__, __FILE__, $sql);
! 	}
  
! 	if( !$row = $db->sql_fetchrow($result) )
! 	{
! 		if( $HTTP_GET_VARS["view"] == "next" )
  		{
! 			message_die(GENERAL_MESSAGE, 'No_newer_topics');
  		}
  		else
  		{
! 			message_die(GENERAL_MESSAGE, 'No_older_topics');
  		}
  	}
- 	else
- 	{
- 		$topic_id = $row['topic_id'];
- 	}
  }
  
- 
  //
  // This rather complex gaggle of code handles querying for topics but
--- 102,146 ----
  		{
  			header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
+ 			exit;
  		}
  	}
! 	else if( $HTTP_GET_VARS['view'] == 'next' || $HTTP_GET_VARS['view'] == 'previous' )
  	{
! 		$sql_condition = ( $HTTP_GET_VARS['view'] == 'next' ) ? '>' : '<';
! 		$sql_ordering = ( $HTTP_GET_VARS['view'] == 'next' ) ? 'ASC' : 'DESC';
  
! 		$sql = "SELECT t.topic_id
! 			FROM " . TOPICS_TABLE . " t, " . TOPICS_TABLE . " t2, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2
! 			WHERE t2.topic_id = $topic_id
! 				AND p2.post_id = t2.topic_last_post_id
! 				AND t.forum_id = t2.forum_id
! 				AND p.post_id = t.topic_last_post_id
! 				AND p.post_time $sql_condition p2.post_time
! 				AND p.topic_id = t.topic_id
! 			ORDER BY p.post_time $sql_ordering
! 			LIMIT 1";
! 		if ( !($result = $db->sql_query($sql)) )
! 		{
! 			message_die(GENERAL_ERROR, "Couldn't obtain newer/older topic information", "", __LINE__, __FILE__, $sql);
! 		}
  
! 		if ( !($row = $db->sql_fetchrow($result)) )
  		{
! 			if( $HTTP_GET_VARS['view'] == 'next' )
! 			{
! 				message_die(GENERAL_MESSAGE, 'No_newer_topics');
! 			}
! 			else
! 			{
! 				message_die(GENERAL_MESSAGE, 'No_older_topics');
! 			}
  		}
  		else
  		{
! 			$topic_id = $row['topic_id'];
  		}
  	}
  }
  
  //
  // This rather complex gaggle of code handles querying for topics but
***************
*** 151,159 ****
  // page the post is on and the correct display of viewtopic)
  //
! $join_sql_table = ( !isset($post_id) ) ? "" : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 ";
  $join_sql = ( !isset($post_id) ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id";
! $count_sql = ( !isset($post_id) ) ? "" : ", COUNT(p2.post_id) AS prev_posts";
  
! $order_sql = ( !isset($post_id) ) ? "" : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
  
  $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
--- 148,156 ----
  // page the post is on and the correct display of viewtopic)
  //
! $join_sql_table = ( !isset($post_id) ) ? '' : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 ";
  $join_sql = ( !isset($post_id) ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id";
! $count_sql = ( !isset($post_id) ) ? '' : ", COUNT(p2.post_id) AS prev_posts";
  
! $order_sql = ( !isset($post_id) ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
  
  $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "

[Phpbb-checkins] CVS: phpBB2 posting.php,1.151,1.152

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

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

Modified Files:
	posting.php 
Log Message:
Extra check for logged in user when deciding whether to determine if user should be notified on reply

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -r1.151 -r1.152
*** posting.php	18 Mar 2002 13:44:21 -0000	1.151
--- posting.php	20 Mar 2002 14:56:11 -0000	1.152
***************
*** 375,379 ****
  else
  {
! 	if ( $mode != 'newtopic' )
  	{
  		$sql = "SELECT topic_id 
--- 375,379 ----
  else
  {
! 	if ( $mode != 'newtopic' && $userdata['session_logged_in'] )
  	{
  		$sql = "SELECT topic_id 
***************
*** 390,394 ****
  	else
  	{
! 		$notify_user = $userdata['user_notify'];
  	}
  }
--- 390,394 ----
  	else
  	{
! 		$notify_user = ( $userdata['session_logged_in'] ) ? $userdata['user_notify'] : 0;
  	}
  }

[Phpbb-checkins] CVS: phpBB2/admin admin_db_utilities.php,1.39,1.40

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

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

Modified Files:
	admin_db_utilities.php 
Log Message:
Hide warning of ini_get unavabilitiy ...

Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** admin_db_utilities.php	18 Mar 2002 14:54:25 -0000	1.39
--- admin_db_utilities.php	20 Mar 2002 14:41:20 -0000	1.40
***************
*** 35,47 ****
  	$filename = basename(__FILE__);
  	$module['General']['Backup_DB'] = $filename . "?perform=backup";
! 	if(phpversion() >= '4.0.0')
  	{	
! 		$file_uploads = ini_get('file_uploads');
  	}
  	else
  	{
! 		$file_uploads = get_cfg_var('file_uploads');
  	}
! 	if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (phpversion() != '4.0.4pl1') )
  	{
  		$module['General']['Restore_DB'] = $filename . "?perform=restore";
--- 35,47 ----
  	$filename = basename(__FILE__);
  	$module['General']['Backup_DB'] = $filename . "?perform=backup";
! 	if(@phpversion() >= '4.0.0')
  	{	
! 		$file_uploads = @ini_get('file_uploads');
  	}
  	else
  	{
! 		$file_uploads = @get_cfg_var('file_uploads');
  	}
! 	if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
  	{
  		$module['General']['Restore_DB'] = $filename . "?perform=restore";

[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.7,1.8

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

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

Modified Files:
	usercp_register.php 
Log Message:
Fix issue where nothing is reported for avatars larger than max filesize, bug #526880

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** usercp_register.php	19 Mar 2002 21:54:47 -0000	1.7
--- usercp_register.php	20 Mar 2002 14:39:43 -0000	1.8
***************
*** 216,219 ****
--- 216,221 ----
  if ( isset($HTTP_POST_VARS['submit']) )
  {
+ 	include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
+ 
  	$error = FALSE;
  
***************
*** 355,399 ****
  	}
  
! 		include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
! 
! 		if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' )
  		{
! 			$avatar_sql = user_avatar_delete($userdata['avatar_type'], $userdata['avatar_file']);
  		}
- 		else if ( ( $user_avatar_loc != '' || !empty($user_avatar_url) ) && $board_config['allow_avatar_upload'] )
- 		{
- 			if ( !empty($user_avatar_loc) && !empty($user_avatar_url) )
- 			{
- 				$error = true;
- 				$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $lang['Only_one_avatar'];
- 			}
  
! 			$id = ( $mode == 'register' ) ? $new_user_id : $userdata['user_id'];
! 
! 			if ( !empty($user_avatar_loc) )
! 			{
! 				$avatar_sql = user_avatar_upload($mode, 'local', $id, $error, $error_msg, $user_avatar_loc, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
! 			}
! 			else if ( !empty($user_avatar_url) )
! 			{
! 				$avatar_sql = user_avatar_upload($mode, 'remote', $id, $error, $error_msg, $user_avatar_url, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
! 			}
! 			else if ( !empty($user_avatar_name) )
! 			{
! 				$l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024));
  
! 				$error = true;
! 				$error_msg = ( ( !empty($error_msg) ) ? '<br />' : '' ) . $l_avatar_size;
! 			}
! 		}
! 		else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] )
  		{
! 			$avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl);
  		}
! 		else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] )
  		{
! 			$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);
  		}
  
  
  	if ( !$error )
--- 357,398 ----
  	}
  
! 	if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' )
! 	{
! 		$avatar_sql = user_avatar_delete($userdata['avatar_type'], $userdata['avatar_file']);
! 	}
! 	else if ( ( $user_avatar_loc != '' || !empty($user_avatar_url) || !empty($user_avatar_name) ) && $board_config['allow_avatar_upload'] )
! 	{
! 		if ( !empty($user_avatar_loc) && !empty($user_avatar_url) )
  		{
! 			$error = true;
! 			$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $lang['Only_one_avatar'];
  		}
  
! 		$id = ( $mode == 'register' ) ? $new_user_id : $userdata['user_id'];
  
! 		if ( !empty($user_avatar_loc) )
  		{
! 			$avatar_sql = user_avatar_upload($mode, 'local', $id, $error, $error_msg, $user_avatar_loc, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
  		}
! 		else if ( !empty($user_avatar_url) )
  		{
! 			$avatar_sql = user_avatar_upload($mode, 'remote', $id, $error, $error_msg, $user_avatar_url, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
  		}
+ 		else if ( !empty($user_avatar_name) )
+ 		{
+ 			$l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024));
  
+ 			$error = true;
+ 			$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $l_avatar_size;
+ 		}
+ 	}
+ 	else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] )
+ 	{
+ 		$avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl);
+ 	}
+ 	else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] )
+ 	{
+ 		$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);
+ 	}
  
  	if ( !$error )
***************
*** 832,836 ****
  	//
  	$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
! 	$form_enctype = ( !$ini_val('file_uploads') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && $ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
  	
  	$template->assign_vars(array(
--- 831,835 ----
  	//
  	$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
! 	$form_enctype = ( !@$ini_val('file_uploads') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
  	
  	$template->assign_vars(array(

[Phpbb-checkins] CVS: phpBB2/includes usercp_avatar.php,1.4,1.5

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

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

Modified Files:
	usercp_avatar.php 
Log Message:
Missed a width/height check for uploaded avatars

Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_avatar.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** usercp_avatar.php	19 Mar 2002 21:54:47 -0000	1.4
--- usercp_avatar.php	20 Mar 2002 14:38:51 -0000	1.5
***************
*** 136,140 ****
  			$avatar_data = substr($avatar_data, strlen($avatar_data) - $avatar_filesize, $avatar_filesize);
  
! 			$tmp_path = ( !$ini_val('safe_mode') ) ? '/tmp' : './' . $board_config['avatar_path'] . "/tmp";
  			$tmp_filename = tempnam($tmp_path, $userdata['user_id'] . '-');
  
--- 136,140 ----
  			$avatar_data = substr($avatar_data, strlen($avatar_data) - $avatar_filesize, $avatar_filesize);
  
! 			$tmp_path = ( !@$ini_val('safe_mode') ) ? '/tmp' : './' . $board_config['avatar_path'] . "/tmp";
  			$tmp_filename = tempnam($tmp_path, $userdata['user_id'] . '-');
  
***************
*** 177,180 ****
--- 177,182 ----
  			return;
  		}
+ 
+ 		list($width, $height) = @getimagesize($avatar_filename);
  	}
  
***************
*** 203,207 ****
  		else
  		{
! 			if ( $ini_val('open_basedir') != '' )
  			{
  				if ( phpversion() < '4.0.3' )
--- 205,209 ----
  		else
  		{
! 			if ( @$ini_val('open_basedir') != '' )
  			{
  				if ( phpversion() < '4.0.3' )

[Phpbb-checkins] CVS: phpBB2 install.php,1.39,1.40

[Jonathan H. <the...@us...>]

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

Modified Files:
	install.php 
Log Message:
Fix for bug # 532327 (This is what happens when I rush something in :D)


Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** install.php	19 Mar 2002 23:21:23 -0000	1.39
--- install.php	20 Mar 2002 14:26:26 -0000	1.40
***************
*** 818,823 ****
  			}
  			$sql = "UPDATE " . $table_prefix . "config
! 				SET config_value = '" . $server_path . "' 
! 				WHERE config_name = 'server_path'";
  			$result = $db->sql_query($sql);
  			if( !$result )
--- 818,823 ----
  			}
  			$sql = "UPDATE " . $table_prefix . "config
! 				SET config_value = '" . $script_path . "' 
! 				WHERE config_name = 'script_path'";
  			$result = $db->sql_query($sql);
  			if( !$result )

[Phpbb-checkins] CVS: phpBB2 update_to_RC4.php,1.1,1.2

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

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

Modified Files:
	update_to_RC4.php 
Log Message:
Make first_id in topics NULL

Index: update_to_RC4.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_to_RC4.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** update_to_RC4.php	20 Mar 2002 00:22:08 -0000	1.1
--- update_to_RC4.php	20 Mar 2002 14:04:48 -0000	1.2
***************
*** 217,221 ****
  	
  		$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)";
--- 217,221 ----
  	
  		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
! 			topic_first_post_id int NULL";
  		$sql[] = "CREATE INDEX topic_first_post_id 
  			ON " . TOPICS_TABLE . " (topic_first_post_id)";

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

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

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

Modified Files:
	admin_user_ban.php 
Log Message:
what a shock ... an error

Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** admin_user_ban.php	20 Mar 2002 00:21:27 -0000	1.19
--- admin_user_ban.php	20 Mar 2002 01:23:24 -0000	1.20
***************
*** 478,482 ****
  }
  
! $template->pparse('body");
  
  include('page_footer_admin.'.$phpEx);
--- 478,482 ----
  }
  
! $template->pparse('body');
  
  include('page_footer_admin.'.$phpEx);

[Phpbb-checkins] CVS: phpBB2 update_to_RC4.php,NONE,1.1

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

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

Added Files:
	update_to_RC4.php 
Log Message:
hey, everyone, Kenny's back

--- NEW FILE ---
<html>
<body>
<?php

define('IN_PHPBB', 1);
$phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'config.'.$phpEx);
include($phpbb_root_path . 'includes/constants.'.$phpEx);
include($phpbb_root_path . 'includes/functions.'.$phpEx);
include($phpbb_root_path . 'includes/db.'.$phpEx);

$sql = "SELECT config_value  
	FROM " . CONFIG_TABLE . " 
	WHERE config_name = 'version'";
if ( !($result = $db->sql_query($sql)) )
{
	die("Couldn't obtain version info");
}

if ( $row = $db->sql_fetchrow($result) )
{
	if ( $row['config_value'] == 'RC-3' )
	{
		$sql = "UPDATE " . CONFIG_TABLE . " 
			SET config_value = 'RC-4' 
			WHERE config_name = 'version'";
		if ( !($result = $db->sql_query($sql)) )
		{
			die("Couldn't update version info");
		}

		die("UPDATING COMPLETE -> RC-4 installed");
	}
}

$sql = array();

switch ( SQL_LAYER )
{
	case 'mysql':
	case 'mysql4':
		$sql[] = "ALTER TABLE " . RANKS_TABLE . " DROP 
			COLUMN rank_max";

		$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,  
			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 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;

	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[] = "ALTER TABLE " . TOPICS_TABLE . " 
			ADD COLUMN topic_first_post_id int4";
		$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;

	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]";

		/* DROP FORUM TABLE -- if this may cause you problems you can safely 
		   comment it out, remember to manually remove the IDENTITY setting on 
		   the forum_id column */
		$sql [] = "ALTER TABLE " . FORUMS_TABLE . " DROP 
			CONSTRAINT [DF_" . $table_prefix . "forums_forum_posts], 
			CONSTRAINT [DF_" . $table_prefix . "forums_forum_topics], 
			CONSTRAINT [DF_" . $table_prefix . "forums_forum_last_post_id], 
			CONSTRAINT [DF_" . $table_prefix . "forums_prune_enable], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_view], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_read], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_post], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_reply], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_edit], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_delete], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_sticky], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_announce], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_vote], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_pollcreate], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_attachments]";
		$sql[] = "CREATE TABLE Tmp_" . FORUMS_TABLE . " 
			(forum_id int NOT NULL, cat_id int NOT NULL, forum_name varchar(100) NOT NULL, forum_desc varchar(255) NULL, forum_status smallint NOT NULL, forum_order int NOT NULL, forum_posts int NOT NULL, forum_topics smallint NOT NULL, forum_last_post_id int NOT NULL, prune_next int NULL, prune_enable smallint NOT NULL, auth_view smallint NOT NULL, auth_read smallint NOT NULL, auth_post smallint NOT NULL, auth_reply smallint NOT NULL, auth_edit smallint NOT NULL, auth_delete smallint NOT NULL,	auth_sticky smallint NOT NULL, auth_announce smallint NOT NULL, auth_vote smallint NOT NULL, auth_pollcreate smallint NOT NULL, auth_attachments smallint NOT NULL) ON [PRIMARY]";
		$sql[] = "ALTER TABLE [Tmp_" . FORUMS_TABLE . "] WITH NOCHECK ADD 
			CONSTRAINT [DF_" . $table_prefix . "forums_forum_posts] DEFAULT (0) FOR [forum_posts], 
			CONSTRAINT [DF_" . $table_prefix . "forums_forum_topics] DEFAULT (0) FOR [forum_topics], 
			CONSTRAINT [DF_" . $table_prefix . "forums_forum_last_post_id] DEFAULT (0) FOR [forum_last_post_id], 
			CONSTRAINT [DF_" . $table_prefix . "forums_prune_enable] DEFAULT (0) FOR [prune_enable], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_view] DEFAULT (0) FOR [auth_view], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_read] DEFAULT (0) FOR [auth_read], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_post] DEFAULT (0) FOR [auth_post], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_reply] DEFAULT (0) FOR [auth_reply], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_edit] DEFAULT (0) FOR [auth_edit], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_delete] DEFAULT (0) FOR [auth_delete], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_sticky] DEFAULT (0) FOR [auth_sticky], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_announce] DEFAULT (0) FOR [auth_announce], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_vote] DEFAULT (0) FOR [auth_vote], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_pollcreate] DEFAULT (0) FOR [auth_pollcreate], 
			CONSTRAINT [DF_" . $table_prefix . "forums_auth_attachments] DEFAULT (0) FOR [auth_attachments]";
		$sql[] = "INSERT INTO Tmp_" . FORUMS_TABLE . " (forum_id, cat_id, forum_name, forum_desc, forum_status, forum_order, forum_posts, forum_topics, forum_last_post_id, prune_next, prune_enable, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_sticky, auth_announce, auth_vote, auth_pollcreate, auth_attachments)
				SELECT forum_id, cat_id, forum_name, forum_desc, forum_status, forum_order, forum_posts, forum_topics, forum_last_post_id, prune_next, prune_enable, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_sticky, auth_announce, auth_vote, auth_pollcreate, auth_attachments FROM " . FORUMS_TABLE . " TABLOCKX";
		$sql[] = "DROP TABLE " . FORUMS_TABLE;
		$sql[] = "EXECUTE sp_rename N'Tmp_" . FORUMS_TABLE . "', N'" . FORUMS_TABLE . "', 'OBJECT'";
		$sql[] = "ALTER TABLE " . FORUMS_TABLE . " ADD 
			CONSTRAINT [PK_" . $table_prefix . "forums] PRIMARY KEY CLUSTERED (forum_id) ON [PRIMARY]";
		$sql[] = "CREATE NONCLUSTERED INDEX [IX_" . $table_prefix . "forums]
			ON " . FORUMS_TABLE . " (cat_id, forum_order, forum_last_post_id) ON [PRIMARY]";
		/* END OF DROP FORUM -- don't remove anything after this point! */

		$sql[] = "DROP INDEX " . RANKS_TABLE . ".IX_" . $table_prefix . "ranks";
		$sql[] = "ALTER TABLE " . RANKS_TABLE . " DROP 
			COLUMN rank_max";
		$sql[] = "CREATE  INDEX [IX_" . $table_prefix . "ranks] 
			ON [" . RANKS_TABLE . "]([rank_min], [rank_special]) ON [PRIMARY]";

		$sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics";
		$sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD 
			topic_first_post_id int NULL, 
			CONSTRAINT [DF_" . $table_prefix . "topics_topic_first_post_id] 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 " . SEARCH_WORD_TABLE . " DROP 
			CONSTRAINT [PK_" . $table_prefix . "search_wordlist]";
		$sql[] = "CREATE UNIQUE INDEX [IX_" . $table_prefix . "search_wordlist] 
			ON [" . SEARCH_WORD_TABLE . "]([word_text]) WITH IGNORE_DUP_KEY ON [PRIMARY]";
		$sql[] = "CREATE  INDEX [IX_" . $table_prefix . "search_wordlist_1] 
			ON [" . SEARCH_WORD_TABLE . "]([word_common]) ON [PRIMARY]";

		$sql[] = "CREATE INDEX [IX_" . $table_prefix . "search_wordmatch_1] 
			ON [" . SEARCH_MATCH_TABLE . "]([word_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[] = "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;

	default:
		die("No DB LAYER found!");
		break;
}

$errored = false;
for($i = 0; $i < count($sql); $i++)
{
	echo "Running :: " . $sql[$i];
	flush();

	if ( !($result = $db->sql_query($sql[$i])) )
	{
		$errored = true;
		$error = $db->sql_error();
		echo " -> <b>FAILED</b> ---> <u>" . $error['message'] . "</u><br /><br />\n\n";
	}
	else
	{
		echo " -> <b>COMPLETED</b><br /><br />\n\n";
	}
}

if ( $errored )
{
	echo "\n<br /><b>Some queries failed! This is probably nothing to worry about, update will attempt to continue. Should this fail you may need to seek help at our development board (see README)</b><br /><br />\n\n";
	flush();
}

$sql = "SELECT themes_id 
	FROM " . THEMES_TABLE . " 
	WHERE template_name = 'subSilver'";
if( !($result = $db->sql_query($sql)) )
{
	die("Couldn't obtain subSilver id");
}

if( $row = $db->sql_fetchrow($result) )
{
	$theme_id = $row['themes_id'];

	$sql = "UPDATE " . THEMES_TABLE . " 
		SET head_stylesheet = 'subSilver.css', 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)) )
	{
		die("Couldn't update subSilver theme");
	}

	$sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) 
		VALUES ($theme_id, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', '')";
	if ( !($result = $db->sql_query($sql)) )
	{
		echo "WARNING >> Couldn't insert subSilver name info<br />\n";
	}
}

print "<br />Updating topic first post info<br />\n";
flush();

$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)) )
{
	die("Couldn't obtain first post id list");
}

if ( $row = $db->sql_fetchrow($result) )
{
	do
	{
		$post_id = $row['first_post_id'];
		$topic_id = $row['topic_id'];

		$sql = "UPDATE " . TOPICS_TABLE . " 
			SET topic_first_post_id = $post_id 
			WHERE topic_id = $topic_id";
		if ( !$db->sql_query($sql) )
		{
			die("Couldn't update topic first post id in topic :: $topic_id");
		}
	}
	while ( $row = $db->sql_fetchrow($result) );
}

print "<br />Updating moderator user_level<br />\n";
flush();

$sql = "SELECT DISTINCT u.user_id 
	FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa 
	WHERE aa.auth_mod = 1
		AND ug.group_id = aa.group_id
		AND u.user_id = ug.user_id 
		AND u.user_level <> 1";
if ( !$db->sql_query($sql) )
{
	die("Couldn't obtain moderator user ids");
}

$mod_user = array();
while ( $row = $db->sql_fetchrow($result) )
{
	$mod_user[] = $row['user_id'];
}

if ( count($mod_user) )
{
	$sql = "UPDATE " . USERS_TABLE . " 
		SET user_level = " . MOD . " 
		WHERE user_id IN (" . implode(", ", $mod_user) . ")"; 
	if ( !$db->sql_query($sql) )
	{
		die("Couldn't update user level");
	}
}

print "<br />Updating config settings<br />\n";
flush();

$sql = "INSERT INTO " . CONFIG_TABLE . "
	(config_name, config_value) VALUES ('server_name', 'www.myserver.tld')";
if( !$db->sql_query($sql) )
{  
	print "Failed inserting server_name config ... probably exists already<br />\n";
}

$sql = "INSERT INTO " . CONFIG_TABLE . "
	(config_name, config_value) VALUES ('script_path', '/phpBB2/')";
if( !$db->sql_query($sql) )
{  
	print "Failed inserting script_path config ... probably exists already<br />\n";
}

$sql = "INSERT INTO " . CONFIG_TABLE . "
	(config_name, config_value) VALUES ('server_port', '80')";
if( !$db->sql_query($sql) )
{  
	print "Failed inserting server_port config ... probably exists already<br />\n";
}

$sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value )
	VALUES ('version', 'RC-3')";
if ( !$db->sql_query($sql) )
{
	print "Failed inserting version config ... probably exists already<br />\n";
}

$sql = "INSERT INTO " . CONFIG_TABLE . "
	(config_name, config_value) VALUES ('record_online_users', '1')";
if( !$db->sql_query($sql) )
{
	print "Failed inserting record_online_users config ... probably exists already<br />\n";
}

$sql = "INSERT INTO " . CONFIG_TABLE . "
	(config_name, config_value) VALUES ('record_online_date', '" . time() . "')";
if( !$db->sql_query($sql) )
{  
	print "Failed inserting record_online_date config ... probably exists already<br />\n";
}


echo "\n<br />\n<b>COMPLETE!</b><br />\n";
echo "\n<p>You should now visit the General Configuration settings page in the <a href=\"admin/\">Administration Panel</a> and update the 'Server' settings. If you do not do this emails sent from the board will contain incorrect information. Don't forget to delete this file!</p>\n";
?>
</body>
</html>

[Phpbb-checkins] CVS: phpBB2/admin admin_disallow.php,1.7,1.8 admin_user_ban.php,1.18,1.19

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

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

Modified Files:
	admin_disallow.php admin_user_ban.php 
Log Message:
Add inclusion of validates functions + other minor updates

Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** admin_disallow.php	18 Mar 2002 14:54:25 -0000	1.7
--- admin_disallow.php	20 Mar 2002 00:21:27 -0000	1.8
***************
*** 34,42 ****
  // Include required files, get $phpEx and check permissions
  //
! $phpbb_root_dir = "./../";
  require('pagestart.inc');
  
  if( isset($HTTP_POST_VARS['add_name']) )
  {
  	$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
  	$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );
--- 34,44 ----
  // Include required files, get $phpEx and check permissions
  //
! $phpbb_root_dir = './../';
  require('pagestart.inc');
  
  if( isset($HTTP_POST_VARS['add_name']) )
  {
+ 	include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
+ 
  	$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
  	$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );

Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** admin_user_ban.php	18 Mar 2002 19:42:05 -0000	1.18
--- admin_user_ban.php	20 Mar 2002 00:21:27 -0000	1.19
***************
*** 338,356 ****
  else
  {
- 
  	$template->set_filenames(array(
! 		"body" => "admin/user_ban_body.tpl")
  	);
  
  	$template->assign_vars(array(
! 		"L_BAN_TITLE" => $lang['Ban_control'],
! 		"L_BAN_EXPLAIN" => $lang['Ban_explain'],
! 		"L_BAN_EXPLAIN_WARN" => $lang['Ban_explain_warn'],
! 		"L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
! 		"L_EMAIL_ADDRESS" => $lang['Email_address'],
! 		"L_SUBMIT" => $lang['Submit'],
! 		"L_RESET" => $lang['Reset'],
  
! 		"S_BANLIST_ACTION" => append_sid("admin_user_ban.$phpEx"))
  	);
  
--- 338,355 ----
  else
  {
  	$template->set_filenames(array(
! 		'body' => 'admin/user_ban_body.tpl')
  	);
  
  	$template->assign_vars(array(
! 		'L_BAN_TITLE' => $lang['Ban_control'],
! 		'L_BAN_EXPLAIN' => $lang['Ban_explain'],
! 		'L_BAN_EXPLAIN_WARN' => $lang['Ban_explain_warn'],
! 		'L_IP_OR_HOSTNAME' => $lang['IP_hostname'],
! 		'L_EMAIL_ADDRESS' => $lang['Email_address'],
! 		'L_SUBMIT' => $lang['Submit'],
! 		'L_RESET' => $lang['Reset'],
  
! 		'S_BANLIST_ACTION' => append_sid("admin_user_ban.$phpEx"))
  	);
  
***************
*** 361,384 ****
  		WHERE user_id <> " . ANONYMOUS . "
  		ORDER BY username ASC";
! 	$u_result = $db->sql_query($sql);
! 	$user_list = $db->sql_fetchrowset($u_result);
  
! 	$select_userlist = "";
  	for($i = 0; $i < count($user_list); $i++)
  	{
! 		$select_userlist .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
  		$userban_count++;
  	}
! 	$select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist . "</select>";
  
  	$template->assign_vars(array(
! 		"L_BAN_USER" => $lang['Ban_username'],
! 		"L_BAN_USER_EXPLAIN" => $lang['Ban_username_explain'],
! 		"L_BAN_IP" => $lang['Ban_IP'],
! 		"L_BAN_IP_EXPLAIN" => $lang['Ban_IP_explain'],
! 		"L_BAN_EMAIL" => $lang['Ban_email'],
! 		"L_BAN_EMAIL_EXPLAIN" => $lang['Ban_email_explain'],
  
! 		"S_BAN_USERLIST_SELECT" => $select_userlist)
  	);
  
--- 360,388 ----
  		WHERE user_id <> " . ANONYMOUS . "
  		ORDER BY username ASC";
! 	if ( !($result = $db->sql_query($sql)) )
! 	{
! 		message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql);
! 	}
  
! 	$user_list = $db->sql_fetchrowset($result);
! 	$db->sql_freeresult($result);
! 
! 	$select_userlist = '';
  	for($i = 0; $i < count($user_list); $i++)
  	{
! 		$select_userlist .= '<option value="' . $user_list[$i]['user_id'] . '">' . $user_list[$i]['username'] . '</option>';
  		$userban_count++;
  	}
! 	$select_userlist = '<select name="ban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';
  
  	$template->assign_vars(array(
! 		'L_BAN_USER' => $lang['Ban_username'],
! 		'L_BAN_USER_EXPLAIN' => $lang['Ban_username_explain'],
! 		'L_BAN_IP' => $lang['Ban_IP'],
! 		'L_BAN_IP_EXPLAIN' => $lang['Ban_IP_explain'],
! 		'L_BAN_EMAIL' => $lang['Ban_email'],
! 		'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'],
  
! 		'S_BAN_USERLIST_SELECT' => $select_userlist)
  	);
  
***************
*** 393,471 ****
  			AND u.user_id <> " . ANONYMOUS . "
  		ORDER BY u.user_id ASC";
! 	$u_result = $db->sql_query($sql);
! 	$user_list = $db->sql_fetchrowset($u_result);
  
! 	$select_userlist = "";
  	for($i = 0; $i < count($user_list); $i++)
  	{
! 		$select_userlist .= "<option value=\"" . $user_list[$i]['ban_id'] . "\">" . $user_list[$i]['username'] . "</option>";
  		$userban_count++;
  	}
  
! 	if( $select_userlist == "" )
  	{
! 		$select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
  	}
  
! 	$select_userlist = "<select name=\"unban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist;
! 	$select_userlist .= "</select>";
  
  	$sql = "SELECT ban_id, ban_ip, ban_email
  		FROM " . BANLIST_TABLE;
! 	$b_result = $db->sql_query($sql);
! 	$banlist = $db->sql_fetchrowset($b_result);
  
! 	$select_iplist = "";
! 	$select_emaillist = "";
  
! 	for($i = 0; $i < $db->sql_numrows($b_result); $i++)
  	{
  		$ban_id = $banlist[$i]['ban_id'];
  
! 		if( !empty($banlist[$i]['ban_ip']) )
  		{
! 			$ban_ip = str_replace("255", "*", decode_ip($banlist[$i]['ban_ip']));
! 			$select_iplist .= "<option value=\"$ban_id\">$ban_ip</option>";
  			$ipban_count++;
  		}
! 		else if( !empty($banlist[$i]['ban_email']) )
  		{
  			$ban_email = $banlist[$i]['ban_email'];
! 			$select_emaillist .= "<option value=\"$ban_id\">$ban_email</option>";
  			$emailban_count++;
  		}
  	}
  
! 	if($select_iplist == "")
  	{
! 		$select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
  	}
  
! 	if( $select_emaillist == "") 
  	{
! 		$select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
  	}
  
! 	$select_iplist = "<select name=\"unban_ip[]\" multiple=\"multiple\" size=\"5\">" . $select_iplist . "</select>";
! 	$select_emaillist = "<select name=\"unban_email[]\" multiple=\"multiple\" size=\"5\">" . $select_emaillist . "</select>";
  
  	$template->assign_vars(array(
! 		"L_UNBAN_USER" => $lang['Unban_username'],
! 		"L_UNBAN_USER_EXPLAIN" => $lang['Unban_username_explain'],
! 		"L_UNBAN_IP" => $lang['Unban_IP'],
! 		"L_UNBAN_IP_EXPLAIN" => $lang['Unban_IP_explain'],
! 		"L_UNBAN_EMAIL" => $lang['Unban_email'],
! 		"L_UNBAN_EMAIL_EXPLAIN" => $lang['Unban_email_explain'],
! 
! 		"S_UNBAN_USERLIST_SELECT" => $select_userlist,
! 		"S_UNBAN_IPLIST_SELECT" => $select_iplist,
! 		"S_UNBAN_EMAILLIST_SELECT" => $select_emaillist,
! 		"S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
  	);
  }
  
! $template->pparse("body");
  
  include('page_footer_admin.'.$phpEx);
  
! ?>
--- 397,484 ----
  			AND u.user_id <> " . ANONYMOUS . "
  		ORDER BY u.user_id ASC";
! 	if ( !($result = $db->sql_query($sql)) )
! 	{
! 		message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql);
! 	}
! 
! 	$user_list = $db->sql_fetchrowset($result);
! 	$db->sql_freeresult($result);
  
! 	$select_userlist = '';
  	for($i = 0; $i < count($user_list); $i++)
  	{
! 		$select_userlist .= '<option value="' . $user_list[$i]['ban_id'] . '">' . $user_list[$i]['username'] . '</option>';
  		$userban_count++;
  	}
  
! 	if( $select_userlist == '' )
  	{
! 		$select_userlist = '<option value="-1">' . $lang['No_banned_users'] . '</option>';
  	}
  
! 	$select_userlist = '<select name="unban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';
  
  	$sql = "SELECT ban_id, ban_ip, ban_email
  		FROM " . BANLIST_TABLE;
! 	if ( !($result = $db->sql_query($sql)) )
! 	{
! 		message_die(GENERAL_ERROR, 'Could not select current ip ban list', '', __LINE__, __FILE__, $sql);
! 	}
! 
! 	$banlist = $db->sql_fetchrowset($result);
! 	$db->sql_freeresult($result);
  
! 	$select_iplist = '';
! 	$select_emaillist = '';
  
! 	for($i = 0; $i < count($banlist); $i++)
  	{
  		$ban_id = $banlist[$i]['ban_id'];
  
! 		if ( !empty($banlist[$i]['ban_ip']) )
  		{
! 			$ban_ip = str_replace('255', '*', decode_ip($banlist[$i]['ban_ip']));
! 			$select_iplist .= '<option value="' . $ban_id . '">' . $ban_ip . '</option>';
  			$ipban_count++;
  		}
! 		else if ( !empty($banlist[$i]['ban_email']) )
  		{
  			$ban_email = $banlist[$i]['ban_email'];
! 			$select_emaillist .= '<option value="' . $ban_id . '">' . $ban_email . '</option>';
  			$emailban_count++;
  		}
  	}
  
! 	if ( $select_iplist == '' )
  	{
! 		$select_iplist = '<option value="-1">' . $lang['No_banned_ip'] . '</option>';
  	}
  
! 	if ( $select_emaillist == '' )  
  	{
! 		$select_emaillist = '<option value="-1">' . $lang['No_banned_email'] . '</option>';
  	}
  
! 	$select_iplist = '<select name="unban_ip[]" multiple="multiple" size="5">' . $select_iplist . '</select>';
! 	$select_emaillist = '<select name="unban_email[]" multiple="multiple" size="5">' . $select_emaillist . '</select>';
  
  	$template->assign_vars(array(
! 		'L_UNBAN_USER' => $lang['Unban_username'],
! 		'L_UNBAN_USER_EXPLAIN' => $lang['Unban_username_explain'],
! 		'L_UNBAN_IP' => $lang['Unban_IP'],
! 		'L_UNBAN_IP_EXPLAIN' => $lang['Unban_IP_explain'],
! 		'L_UNBAN_EMAIL' => $lang['Unban_email'],
! 		'L_UNBAN_EMAIL_EXPLAIN' => $lang['Unban_email_explain'],
! 
! 		'S_UNBAN_USERLIST_SELECT' => $select_userlist,
! 		'S_UNBAN_IPLIST_SELECT' => $select_iplist,
! 		'S_UNBAN_EMAILLIST_SELECT' => $select_emaillist,
! 		'S_BAN_ACTION' => append_sid("admin_user_ban.$phpEx"))
  	);
  }
  
! $template->pparse('body");
  
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 install.php,1.38,1.39 upgrade.php,1.24,1.25

[Jonathan H. <the...@us...>]

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

Modified Files:
	install.php upgrade.php 
Log Message:
Various updates for install and upgrade...


Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** install.php	19 Mar 2002 17:36:49 -0000	1.38
--- install.php	19 Mar 2002 23:21:23 -0000	1.39
***************
*** 233,236 ****
--- 233,241 ----
  $ftp_pass = ( !empty($HTTP_POST_VARS['ftp_pass']) ) ? $HTTP_POST_VARS['ftp_pass'] : "";
  
+ $server_name = ( !empty($HTTP_POST_VARS['server_name']) ) ? $HTTP_POST_VARS['server_name'] : "";
+ $server_port = ( !empty($HTTP_POST_VARS['server_port']) ) ? $HTTP_POST_VARS['server_port'] : "";
+ $board_email = ( !empty($HTTP_POST_VARS['board_email']) ) ? $HTTP_POST_VARS['board_email'] : "";
+ $script_path = ( !empty($HTTP_POST_VARS['script_path']) ) ? $HTTP_POST_VARS['script_path'] : "";
+ 
  if( @file_exists('config.'.$phpEx) )
  {
***************
*** 427,430 ****
--- 432,439 ----
  			$s_hidden_fields .= '<input type="hidden" name="admin_pass1" value="1" />';
  			$s_hidden_fields .= '<input type="hidden" name="admin_pass2" value="1" />';
+ 			$s_hidden_fields .= '<input type="hidden" name="server_port" value="'.$server_port.'" />';
+ 			$s_hidden_fields .= '<input type="hidden" name="server_name" value="'.$server_name.'" />';
+ 			$s_hidden_fields .= '<input type="hidden" name="script_path" value="'.$script_path.'" />';
+ 			$s_hidden_fields .= '<input type="hidden" name="board_email" value="'.$board_email.'" />';
  			$template->assign_block_vars("switch_upgrade_install", array());
  			$template->assign_vars(array(
***************
*** 505,510 ****
  }
  else if( ( empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || $dbhost == "" )  && !defined("PHPBB_INSTALLED") )
! {
! 	//
  	// Ok we haven't installed before so lets work our way through the various
  	// steps of the install process.  This could turn out to be quite a lengty 
--- 514,518 ----
  }
  else if( ( empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || $dbhost == "" )  && !defined("PHPBB_INSTALLED") )
! {	//
  	// Ok we haven't installed before so lets work our way through the various
  	// steps of the install process.  This could turn out to be quite a lengty 
***************
*** 516,519 ****
--- 524,554 ----
  	// Namely dbms, dbhost, dbname, dbuser, and dbpasswd.
  	//
+ 
+ 	//
+ 	// Guess at some basic info used for install..
+ 	//
+ 	
+ 	if ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
+ 	{
+ 		$server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
+ 	}
+ 	else if ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
+ 	{
+ 		$server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
+ 	}
+ 	else
+ 	{
+ 		$server_name = '';
+ 	}
+ 	if ( !empty($HTTP_SERVER_VARS['SERVER_PORT']) || !empty($HTTP_ENV_VARS['SERVER_PORT']) )
+ 	{
+ 		$server_port = ( !empty($HTTP_SERVER_VARS['SERVER_PORT']) ) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $HTTP_ENV_VARS['SERVER_PORT'];
+ 	}
+ 	else
+ 	{
+ 		$server_port = '80';
+ 	}
+ 	$script_path = preg_replace('/install\.'.$phpEx.'/i', '', $HTTP_SERVER_VARS['PHP_SELF']);
+ 
  	$instruction_text = $lang['Inst_Step_0'];
  
***************
*** 560,564 ****
  		"L_ADMIN_CONFIRM_PASSWORD" => $lang['Admin_Password_confirm'], 
  		"L_SUBMIT" => $lang['Start_Install'], 
! 
  		"DB_PREFIX" => ( !empty($table_prefix) ) ? $table_prefix : "phpbb_", 
  		"DB_HOST" => ( $dbhost != "" ) ? $dbhost : "", 
--- 595,606 ----
  		"L_ADMIN_CONFIRM_PASSWORD" => $lang['Admin_Password_confirm'], 
  		"L_SUBMIT" => $lang['Start_Install'], 
! 		"L_ADMIN_EMAIL" => $lang['Admin_email'],
! 		"L_SERVER_NAME" => $lang['Server_name'],
! 		"L_SERVER_PORT" => $lang['Server_port'],
! 		"L_SCRIPT_PATH" => $lang['Script_path'],
! 		
! 		"SCRIPT_PATH" => $script_path,
! 		"SERVER_PORT" => $server_port,
! 		"SERVER_NAME" => $server_name,
  		"DB_PREFIX" => ( !empty($table_prefix) ) ? $table_prefix : "phpbb_", 
  		"DB_HOST" => ( $dbhost != "" ) ? $dbhost : "", 
***************
*** 759,767 ****
  				$error .= "Could not insert default_lang :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
  			}
  
  			$admin_pass_md5 = ( $confirm && $userdata['user_level'] == ADMIN ) ? $admin_pass1 : md5($admin_pass1);
  
  			$sql = "UPDATE " . $table_prefix . "users 
! 				SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "' 
  				WHERE username = 'Admin'";
  			$result = $db->sql_query($sql);
--- 801,850 ----
  				$error .= "Could not insert default_lang :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
  			}
+ 			$sql = "UPDATE " . $table_prefix . "config
+ 				SET config_value = '" . $server_name . "' 
+ 				WHERE config_name = 'server_name'";
+ 			$result = $db->sql_query($sql);
+ 			if( !$result )
+ 			{
+ 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ 			}
+ 			$sql = "UPDATE " . $table_prefix . "config
+ 				SET config_value = '" . $server_port . "' 
+ 				WHERE config_name = 'server_port'";
+ 			$result = $db->sql_query($sql);
+ 			if( !$result )
+ 			{
+ 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ 			}
+ 			$sql = "UPDATE " . $table_prefix . "config
+ 				SET config_value = '" . $server_path . "' 
+ 				WHERE config_name = 'server_path'";
+ 			$result = $db->sql_query($sql);
+ 			if( !$result )
+ 			{
+ 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ 			}
+ 			$sql = "UPDATE " . $table_prefix . "config
+ 				SET config_value = '" . $board_email . "' 
+ 				WHERE config_name = 'board_email'";
+ 			$result = $db->sql_query($sql);
+ 			if( !$result )
+ 			{
+ 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ 			}
+ 			$sql = "UPDATE " . $table_prefix . "config
+ 				SET config_value = '" . $server_name . "' 
+ 				WHERE config_name = 'cookie_domain'";
+ 			$result = $db->sql_query($sql);
+ 			if( !$result )
+ 			{
+ 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
+ 			}
+ 			
  
  			$admin_pass_md5 = ( $confirm && $userdata['user_level'] == ADMIN ) ? $admin_pass1 : md5($admin_pass1);
  
  			$sql = "UPDATE " . $table_prefix . "users 
! 				SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "', user_email='" . str_replace("\'", "''", $board_email) . "'
  				WHERE username = 'Admin'";
  			$result = $db->sql_query($sql);
***************
*** 872,875 ****
--- 955,962 ----
  					$s_hidden_fields .= '<input type="hidden" name="admin_pass1" value="1" />';
  					$s_hidden_fields .= '<input type="hidden" name="admin_pass2" value="1" />';
+ 					$s_hidden_fields .= '<input type="hidden" name="server_port" value="'.$server_port.'" />';
+ 					$s_hidden_fields .= '<input type="hidden" name="server_name" value="'.$server_name.'" />';
+ 					$s_hidden_fields .= '<input type="hidden" name="script_path" value="'.$script_path.'" />';
+ 					$s_hidden_fields .= '<input type="hidden" name="board_email" value="'.$board_email.'" />';
  
  					$template->assign_block_vars("switch_upgrade_install", array());

Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** upgrade.php	19 Mar 2002 19:37:30 -0000	1.24
--- upgrade.php	19 Mar 2002 23:21:23 -0000	1.25
***************
*** 1806,1809 ****
--- 1806,1830 ----
  			query($sql, "Couldn't insert board_startdate");
  
+ 			$sql = "UPDATE " . $table_prefix . "config 
+ 				SET config_value = '" . $server_name . "' 
+ 				WHERE config_name = 'server_name' 
+ 					OR config_name = 'cookie_domain'";
+ 			query($sql, "Couldn't insert Board Server domain");
+ 
+ 			$sql = "UPDATE " . $table_prefix . "config 
+ 				SET config_value = '" . $server_port . "'
+ 				WHERE config_name = 'server_port'";
+ 			query($sql, "Couldn't insert Board server port");
+ 			
+ 			$sql = "UPDATE " . $table_prefix . "config 
+ 				SET config_value = '" . $board_email . "'
+ 				WHERE config_name = 'board_email'";
+ 			query($sql, "Couldn't insert Board admin email");
+ 			
+ 			$sql = "UPDATE " . $table_prefix . "config 
+ 				SET config_value = '" . $script_path . "'
+ 				WHERE config_name = 'script_path'";
+ 			query($sql, "Couldn't insert Board admin email");
+ 			
  			//
  			// Change session table to HEAP if MySQL version matches

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

[Jonathan H. <the...@us...>]

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

Modified Files:
	install.tpl 
Log Message:
Various updates for install and upgrade...


Index: install.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/install.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** install.tpl	16 Dec 2001 01:52:52 -0000	1.7
--- install.tpl	19 Mar 2002 23:21:23 -0000	1.8
***************
*** 95,98 ****
--- 95,114 ----
  					</tr>
  					<tr>
+ 						<td class="row1" align="right"><span class="gen">{L_ADMIN_EMAIL}: </span></td>
+ 						<td class="row2"><input type="text" name="board_email" /></td>
+ 					</tr> 
+ 					<tr>
+ 						<td class="row1" align="right"><span class="gen">{L_SERVER_NAME}: </span></td>
+ 						<td class="row2"><input type="text" name="server_name" value="{SERVER_NAME}" /></td>
+ 					</tr> 
+ 					<tr>
+ 						<td class="row1" align="right"><span class="gen">{L_SERVER_PORT}: </span></td>
+ 						<td class="row2"><input type="text" name="server_port" value="{SERVER_PORT}" /></td>
+ 					</tr>
+ 					<tr>
+ 						<td class="row1" align="right"><span class="gen">{L_SCRIPT_PATH}: </span></td>
+ 						<td class="row2"><input type="text" name="script_path" value="{SCRIPT_PATH}" /></td>
+ 					</tr>
+ 					<tr>
  						<td class="row1" align="right"><span class="gen">{L_ADMIN_USERNAME}: </span></td>
  						<td class="row2"><input type="text" name="admin_name" value="{ADMIN_USERNAME}" /></td>
***************
*** 147,159 ****
  					<!-- BEGIN switch_common_install -->
  					<tr> 
! 					  <td class="cat" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td>
  					</tr>
  					<!-- END switch_common_install -->
  					<!-- BEGIN switch_upgrade_install -->
  					<tr>
! 						<td class="cat" align="center" colspan="2">{L_UPGRADE_INST}</td>
  					</tr>
  					<tr>
! 						<td class="cat" align="center" colspan="2"><input type="submit" name="upgrade_now" value="{L_UPGRADE_SUBMIT}" /></td>
  					</tr>
  					<!-- END switch_upgrade_install -->
--- 163,175 ----
  					<!-- BEGIN switch_common_install -->
  					<tr> 
! 					  <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td>
  					</tr>
  					<!-- END switch_common_install -->
  					<!-- BEGIN switch_upgrade_install -->
  					<tr>
! 						<td class="catbottom" align="center" colspan="2">{L_UPGRADE_INST}</td>
  					</tr>
  					<tr>
! 						<td class="catbottom" align="center" colspan="2"><input type="submit" name="upgrade_now" value="{L_UPGRADE_SUBMIT}" /></td>
  					</tr>
  					<!-- END switch_upgrade_install -->

[Phpbb-checkins] CVS: phpBB2/db/schemas ms_access_primer.zip,1.13,1.14 mssql_basic.sql,1.12,1.13 mssql_schema.sql,1.22,1.23 mysql_basic.sql,1.13,1.14 oracle_basic.sql,1.4,1.5 postgres_basic.sql,1.13,1.14

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

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

Modified Files:
	ms_access_primer.zip mssql_basic.sql mssql_schema.sql 
	mysql_basic.sql oracle_basic.sql postgres_basic.sql 
Log Message:
A few updates for versioning, fixed _broken_ MS Access primer archive and compacted it ... 

Index: ms_access_primer.zip
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/ms_access_primer.zip,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
Binary files /tmp/cvsZsxGbe and /tmp/cvs0ZEYQj differ

Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** mssql_basic.sql	3 Mar 2002 16:51:27 -0000	1.12
--- mssql_basic.sql	19 Mar 2002 22:00:17 -0000	1.13
***************
*** 68,72 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-3');
  
  /*
--- 68,72 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4');
  
  /*

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** mssql_schema.sql	11 Feb 2002 17:21:30 -0000	1.22
--- mssql_schema.sql	19 Mar 2002 22:00:17 -0000	1.23
***************
*** 582,586 ****
  	CONSTRAINT [DF_phpbb_users_user_allowbbcode] DEFAULT (1) FOR [user_allowbbcode],
  	CONSTRAINT [DF_phpbb_users_user_allowsmile] DEFAULT (1) FOR [user_allowsmile],
! 	CONSTRAINT [DF_phpbb_users_user_allowavatar] DEFAULT (0) FOR [user_allowavatar],
  	CONSTRAINT [DF_phpbb_users_user_allow_pm] DEFAULT (1) FOR [user_allow_pm],
  	CONSTRAINT [DF_phpbb_users_user_allow_viewonline] DEFAULT (1) FOR [user_allow_viewonline],
--- 582,586 ----
  	CONSTRAINT [DF_phpbb_users_user_allowbbcode] DEFAULT (1) FOR [user_allowbbcode],
  	CONSTRAINT [DF_phpbb_users_user_allowsmile] DEFAULT (1) FOR [user_allowsmile],
! 	CONSTRAINT [DF_phpbb_users_user_allowavatar] DEFAULT (1) FOR [user_allowavatar],
  	CONSTRAINT [DF_phpbb_users_user_allow_pm] DEFAULT (1) FOR [user_allow_pm],
  	CONSTRAINT [DF_phpbb_users_user_allow_viewonline] DEFAULT (1) FOR [user_allow_viewonline],

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mysql_basic.sql	25 Feb 2002 22:16:21 -0000	1.13
--- mysql_basic.sql	19 Mar 2002 22:00:17 -0000	1.14
***************
*** 61,65 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-3');
  
  
--- 61,65 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4');
  
  

Index: oracle_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/oracle_basic.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** oracle_basic.sql	25 Feb 2002 22:16:21 -0000	1.4
--- oracle_basic.sql	19 Mar 2002 22:00:17 -0000	1.5
***************
*** 55,59 ****
  INSERT INTO phpbb_config VALUES ('record_online_date','0');
  INSERT INTO phpbb_config VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config VALUES ('version', 'RC-3');
  INSERT INTO phpbb_config VALUES ('server_name', 'www.yourdomain.tld');
  INSERT INTO phpbb_config VALUES ('server_port', '80');
--- 55,59 ----
  INSERT INTO phpbb_config VALUES ('record_online_date','0');
  INSERT INTO phpbb_config VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config VALUES ('version', 'RC-4');
  INSERT INTO phpbb_config VALUES ('server_name', 'www.yourdomain.tld');
  INSERT INTO phpbb_config VALUES ('server_port', '80');

Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** postgres_basic.sql	25 Feb 2002 22:16:21 -0000	1.13
--- postgres_basic.sql	19 Mar 2002 22:00:17 -0000	1.14
***************
*** 62,66 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-3');
  
  -- Categories
--- 62,66 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4');
  
  -- Categories

[Phpbb-checkins] CVS: phpBB2/includes usercp_activate.php,1.3,1.4 usercp_avatar.php,1.3,1.4 usercp_email.php,1.4,1.5 usercp_register.php,1.6,1.7

[Jonathan H. <the...@us...>]

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

Modified Files:
	usercp_activate.php usercp_avatar.php usercp_email.php 
	usercp_register.php 
Log Message:
Just me nitpicking... Thought the file header name should match the filename... 


Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_activate.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** usercp_activate.php	18 Mar 2002 23:53:12 -0000	1.3
--- usercp_activate.php	19 Mar 2002 21:54:47 -0000	1.4
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                                avatars.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                            usercp_activate.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
***************
*** 94,96 ****
  }
  
! ?>
\ No newline at end of file
--- 94,96 ----
  }
  
! ?>

Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_avatar.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** usercp_avatar.php	18 Mar 2002 23:53:12 -0000	1.3
--- usercp_avatar.php	19 Mar 2002 21:54:47 -0000	1.4
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                                avatars.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                             usercp_avatar.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
***************
*** 334,336 ****
  }
  
! ?>
\ No newline at end of file
--- 334,336 ----
  }
  
! ?>

Index: usercp_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_email.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** usercp_email.php	18 Mar 2002 23:53:12 -0000	1.4
--- usercp_email.php	19 Mar 2002 21:54:47 -0000	1.5
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                                avatars.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                             usercp_email.php 
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
***************
*** 204,206 ****
  }
  
! ?>
\ No newline at end of file
--- 204,206 ----
  }
  
! ?>

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** usercp_register.php	19 Mar 2002 01:11:27 -0000	1.6
--- usercp_register.php	19 Mar 2002 21:54:47 -0000	1.7
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                                avatars.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                            usercp_register.php 
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001

[Phpbb-checkins] CVS: phpBB2 update_to_RC3.php,1.16,NONE

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

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

Removed Files:
	update_to_RC3.php 
Log Message:
Oh no, they killed update_to_RC3.php, those ba****ds

--- update_to_RC3.php DELETED ---

[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.54,1.55

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

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

Modified Files:
	groupcp.php 
Log Message:
Ooops, thanks AL_ for noting another problem ... I wish I'd never come up with this usergroup nonsense, I'll keep my big mouth shut next time :D

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** groupcp.php	19 Mar 2002 18:24:58 -0000	1.54
--- groupcp.php	19 Mar 2002 21:38:49 -0000	1.55
***************
*** 1218,1229 ****
  			}
  			while( $row = $db->sql_fetchrow($result) );
- 		}
- 		else
- 		{
- 			message_die(GENERAL_MESSAGE, $lang['No_groups_exist']);
- 		}
  
! 		$s_pending_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_pending_groups_opt . "</select>";
! 		$s_member_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_member_groups_opt . "</select>";
  	}
  
--- 1218,1225 ----
  			}
  			while( $row = $db->sql_fetchrow($result) );
  
! 			$s_pending_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_pending_groups_opt . "</select>";
! 			$s_member_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_member_groups_opt . "</select>";
! 		}
  	}
  

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.101,1.102

[Jonathan H. <the...@us...>]

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

Modified Files:
	page_header.php 
Log Message:
Fix for AOL browser issues as well as some IE blank Gzip pages..


Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -r1.101 -r1.102
*** page_header.php	18 Mar 2002 13:35:22 -0000	1.101
--- page_header.php	19 Mar 2002 21:10:14 -0000	1.102
***************
*** 479,484 ****
  }
  
! header ("Cache-Control: no-store, no-cache, must-revalidate");
! header ("Cache-Control: pre-check=0, post-check=0, max-age=0", false);
  header ("Pragma: no-cache");
  header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
--- 479,483 ----
  }
  
! header ("Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0");
  header ("Pragma: no-cache");
  header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
***************
*** 487,489 ****
  $template->pparse("overall_header");
  
! ?>
\ No newline at end of file
--- 486,488 ----
  $template->pparse("overall_header");
  
! ?>

[Phpbb-checkins] CVS: phpBB2/includes usercp_sendpasswd.php,1.3,1.4

[Jonathan H. <the...@us...>]

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

Modified Files:
	usercp_sendpasswd.php 
Log Message:
Well.... I hope this is right... It works at least.  Can't seem to reach Paul currently, and I don't want this to slip through for RC-4, so for now I copied the old stuff from a previous revision of profile, and pasted it in here... Tested to work on my local machine... (if you had something else in mind Paul feel free to overwrite my version)


Index: usercp_sendpasswd.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_sendpasswd.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** usercp_sendpasswd.php	18 Mar 2002 23:53:12 -0000	1.3
--- usercp_sendpasswd.php	19 Mar 2002 20:47:59 -0000	1.4
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                                avatars.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                           usercp_sendpasswd.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
***************
*** 28,204 ****
  }
  
! if ( !$userdata['session_logged_in'] )
  {
! 	header("Location: " . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
! 	exit;
! }
! 
! if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) || !empty($HTTP_POST_VARS[POST_USERS_URL]) )
! {
! 	$user_id = ( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) ? $HTTP_GET_VARS[POST_USERS_URL] : $HTTP_POST_VARS[POST_USERS_URL];
! }
! else
! {
! 	message_die(GENERAL_MESSAGE, $lang['No_user_specified']);
! }
! 
! $sql = "SELECT username, user_email, user_viewemail, user_lang  
! 	FROM " . USERS_TABLE . " 
! 	WHERE user_id = $user_id";
! if ( $result = $db->sql_query($sql) )
! {
! 	$row = $db->sql_fetchrow($result);
! 
! 	$username = $row['username'];
! 	$user_email = $row['user_email']; 
! 	$user_lang = $row['user_lang'];
  
! 	if ( $row['user_viewemail'] || $userdata['user_level'] == ADMIN )
  	{
! 		if ( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] )
! 		{
! 			message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']);
! 		}
! 
! 		if ( isset($HTTP_POST_VARS['submit']) )
  		{
! 			$error = FALSE;
! 
! 			if ( !empty($HTTP_POST_VARS['subject']) )
! 			{
! 				$subject = trim(strip_tags(stripslashes($HTTP_POST_VARS['subject'])));
! 			}
! 			else
  			{
! 				$error = TRUE;
! 				$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Empty_subject_email'] : $lang['Empty_subject_email'];
  			}
  
! 			if ( !empty($HTTP_POST_VARS['message']) )
! 			{
! 				$message = trim(strip_tags(stripslashes($HTTP_POST_VARS['message'])));
! 			}
! 			else
! 			{
! 				$error = TRUE;
! 				$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Empty_message_email'] : $lang['Empty_message_email'];
! 			}
  
! 			if ( !$error )
  			{
! 				$sql = "UPDATE " . USERS_TABLE . " 
! 					SET user_emailtime = " . time() . " 
! 					WHERE user_id = " . $userdata['user_id'];
! 				if ( $result = $db->sql_query($sql) )
! 				{
! 					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! 					$emailer = new emailer($board_config['smtp_delivery']);
! 
! 					$email_headers = "From: " . $userdata['user_email'] . "\n";
! 					if ( !empty($HTTP_POST_VARS['cc_email']) )
! 					{
! 						$email_headers .= "Cc: " . $userdata['user_email'] . "\n";
! 					}
! 					$email_headers .= "Return-Path: " . $userdata['user_email'] . "\n";
! 					$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
! 					$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
! 					$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
! 					$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
! 
! 					$emailer->use_template("profile_send_email", $user_lang);
! 					$emailer->email_address($user_email);
! 					$emailer->set_subject($subject);
! 					$emailer->extra_headers($email_headers);
! 
! 					$emailer->assign_vars(array(
! 						"SITENAME" => $board_config['sitename'], 
! 						"BOARD_EMAIL" => $board_config['board_email'], 
! 						"FROM_USERNAME" => $userdata['username'], 
! 						"TO_USERNAME" => $username, 
! 						"MESSAGE" => $message)
! 					);
! 					$emailer->send();
! 					$emailer->reset();
! 
! 					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
! 					);
! 
! 					$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_index'],  '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
! 
! 					message_die(GENERAL_MESSAGE, $message);
! 				}
! 				else
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't update last email time", "", __LINE__, __FILE__, $sql);
! 				}
  			}
- 		}
  
! 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
! 		$template->set_filenames(array(
! 			"body" => "profile_send_email.tpl",
! 			"jumpbox" => "jumpbox.tpl")
! 		);
! 
! 		$jumpbox = make_jumpbox();
! 		$template->assign_vars(array(
! 			"L_GO" => $lang['Go'],
! 			"L_JUMP_TO" => $lang['Jump_to'],
! 			"L_SELECT_FORUM" => $lang['Select_forum'],
! 
! 			"S_JUMPBOX_LIST" => $jumpbox,
! 			"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
! 		);
! 		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
  
! 		if ( $error )
! 		{
! 			$template->set_filenames(array(
! 				"reg_header" => "error_body.tpl")
  			);
  			$template->assign_vars(array(
! 				"ERROR_MESSAGE" => $error_msg)
  			);
- 			$template->assign_var_from_handle("ERROR_BOX", "reg_header");
- 		}
  
! 		if ( $userdata['user_sig'] != "" )
  		{
! 			$template->assign_block_vars("signature_checkbox", array());
  		}
- 
- 		$template->assign_vars(array(
- 			"USERNAME" => $username,
- 
- 			"S_SIGNATURE_CHECKED" => ( $attach_sig ) ? 'checked="checked"' : '', 
- 			"S_POST_ACTION" => append_sid("profile.$phpEx?&amp;mode=email&amp;" . POST_USERS_URL . "=$user_id"), 
- 
- 			"L_SEND_EMAIL_MSG" => $lang['Send_email_msg'], 
- 			"L_RECIPIENT" => $lang['Recipient'], 
- 			"L_SUBJECT" => $lang['Subject'],
- 			"L_MESSAGE_BODY" => $lang['Message_body'], 
- 			"L_MESSAGE_BODY_DESC" => $lang['Email_message_desc'], 
- 			"L_OPTIONS" => $lang['Options'],
- 			"L_CC_EMAIL" => $lang['CC_email'], 
- 			"L_NOTIFY_ON_REPLY" => $lang['Notify'], 
- 			"L_SPELLCHECK" => $lang['Spellcheck'],
- 			"L_SEND_EMAIL" => $lang['Send_email'])
- 		);
- 
- 		$template->pparse("body");
- 
- 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  	}
  	else
  	{
! 		message_die(GENERAL_MESSAGE, $lang['User_prevent_email']);
  	}
  }
  else
  {
! 	message_die(GENERAL_MESSAGE, $lang['User_not_exist']);
  }
  
! ?>
\ No newline at end of file
--- 28,141 ----
  }
  
! if ( isset($HTTP_POST_VARS['submit']) )
  {
! 	$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
! 	$email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";
  
! 	$sql = "SELECT user_id, username, user_email, user_active, user_lang 
! 		FROM " . USERS_TABLE . " 
! 		WHERE user_email = '" . str_replace("\'", "''", $email) . "' 
! 			AND username = '" . str_replace("\'", "''", $username) . "'";
! 	if ( $result = $db->sql_query($sql) )
  	{
! 		if ( $row = $db->sql_fetchrow($result) )
  		{
! 			if ( $row['user_active'] == 0 )
  			{
! 				message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']);
  			}
  
! 			$username = $row['username'];
  
! 			$user_actkey = gen_rand_string(true);
! 			$user_password = gen_rand_string(false);
! 			
! 			$sql = "UPDATE " . USERS_TABLE . " 
! 				SET user_newpasswd = '" .md5($user_password) . "', user_actkey = '$user_actkey' 
! 				WHERE user_id = " . $row['user_id'];
! 			if ( !$result = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't update new password information", "", __LINE__, __FILE__, $sql);
  			}
  
! 			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! 			$emailer = new emailer($board_config['smtp_delivery']);
  
! 			$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
! 			$emailer->use_template("user_activate_passwd", $row['user_lang']);
! 			$emailer->email_address($row['user_email']);
! 			$emailer->set_subject();//$lang['New_password_activation']
! 			$emailer->extra_headers($email_headers);
! 
! 			$emailer->assign_vars(array(
! 				"SITENAME" => $board_config['sitename'], 
! 				"USERNAME" => $username,
! 				"PASSWORD" => $user_password,
! 				"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
! 
! 				"U_ACTIVATE" => $server_url . "?mode=activate&act_key=$user_actkey")
  			);
+ 			$emailer->send();
+ 			$emailer->reset();
+ 
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="15;url=' . append_sid("index.$phpEx") . '">')
  			);
  
! 			$message = $lang['Password_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'],  "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
! 
! 			message_die(GENERAL_MESSAGE, $message);
! 		}
! 		else
  		{
! 			message_die(GENERAL_MESSAGE, $lang['No_email_match']);
  		}
  	}
  	else
  	{
! 		message_die(GENERAL_ERROR, "Couldn't obtain user information for sendpassword", "", __LINE__, __FILE__, $sql);
  	}
  }
  else
  {
! 	$username = "";
! 	$email = "";
  }
  
! //
! // Output basic page
! //
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! 
! $template->set_filenames(array(
! 	"body" => "profile_send_pass.tpl",
! 	"jumpbox" => "jumpbox.tpl")
! );
! 
! $jumpbox = make_jumpbox();
! $template->assign_vars(array(
! 	"L_GO" => $lang['Go'],
! 	"L_JUMP_TO" => $lang['Jump_to'],
! 	"L_SELECT_FORUM" => $lang['Select_forum'],
! 
! 	"S_JUMPBOX_LIST" => $jumpbox,
! 	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
! );
! $template->assign_var_from_handle("JUMPBOX", "jumpbox");
! 
! $template->assign_vars(array(
! 	"USERNAME" => $username,
! 	"EMAIL" => $email,
! 
! 	"L_SEND_PASSWORD" => $lang['Send_password'], 
! 	"L_ITEMS_REQUIRED" => $lang['Items_required'],
! 	"L_EMAIL_ADDRESS" => $lang['Email_address'],
! 	"L_SUBMIT" => $lang['Submit'],
! 	"L_RESET" => $lang['Reset'])
! );
! 
! $template->pparse("body");
! 
! include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>

[Phpbb-checkins] CVS: phpBB2 upgrade.php,1.23,1.24

[Jonathan H. <the...@us...>]

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

Modified Files:
	upgrade.php 
Log Message:
Fix for bug #521935 (extra fields in db after upgrade)


Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** upgrade.php	18 Mar 2002 13:35:43 -0000	1.23
--- upgrade.php	19 Mar 2002 19:37:30 -0000	1.24
***************
*** 1832,1836 ****
  				PRIVMSGS_TABLE => array("msg_text"), 
  				RANKS_TABLE => array("rank_max"), 
! 				SMILIES_TABLE => array("emotion")
  			);
  
--- 1832,1837 ----
  				PRIVMSGS_TABLE => array("msg_text"), 
  				RANKS_TABLE => array("rank_max"), 
! 				SMILIES_TABLE => array("emotion"),
! 				TOPICS_TABLE => array("topic_notify")
  			);
  

[Phpbb-checkins] CVS: phpBB2 search.php,1.65,1.66

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

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

Modified Files:
	search.php 
Log Message:
Broke bbcode removal when displaying incomplete posts ... fixed

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** search.php	18 Mar 2002 22:59:39 -0000	1.65
--- search.php	19 Mar 2002 18:59:50 -0000	1.66
***************
*** 765,771 ****
  					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);
  
  						if( count($search_string) )
--- 765,772 ----
  					if( $return_chars != -1 )
  					{
  						$message = strip_tags($message);
! 						$message = preg_replace("/\[.*?:$bbcode_uid:?.*?\]/si", '', $message);
! 						$message = preg_replace('/\[url\]|\[\/url\]/si', '', $message);
! 						$message = ( strlen($message) > $return_chars ) ? substr($message, 0, $return_chars) . ' ...' : $message;
  
  						if( count($search_string) )
***************
*** 773,779 ****
  							$message = preg_replace($search_string, $replace_string, $message);
  						}
- 						
- 						$message = preg_replace('/\[url\]|\[\/url\]/si', '', $message);
- 
  					}
  					else
--- 774,777 ----

[Phpbb-checkins] CVS: phpBB2/templates/subSilver profile_view_body.tpl,1.13,1.14 viewtopic_body.tpl,1.28,1.29

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

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

Modified Files:
	profile_view_body.tpl viewtopic_body.tpl 
Log Message:
Update profile ICQ output to layers for IE, nothing for NS ... note a height is set for the icon but since all languages use the same ICQ icon it's not apparently a problem for subSilver

Index: profile_view_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/profile_view_body.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** profile_view_body.tpl	28 Feb 2002 14:08:02 -0000	1.13
--- profile_view_body.tpl	19 Mar 2002 18:47:07 -0000	1.14
***************
*** 1,15 ****
   
- <script language="Javascript" type="text/javascript">
- <!--
- function create_icq_subsilver(icq_user_addr, icq_status_img, icq_add_img)
- {
- 	if( icq_user_addr.length && icq_user_addr.indexOf("&nbsp;") == -1 )
- 	{
- 		document.write('<table width="59" border="0" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap" style=" background-image: url(\'' + icq_add_img + '\'); background-repeat: no-repeat"><img src="images/spacer.gif" width="3" height="18" alt = "">' + icq_status_img + '<a href="http://wwp.icq.com/scripts/search.dll?to=' + icq_user_addr + '"><img src="images/spacer.gif" width="35" height="18" border="0" alt="{L_ICQ_NUMBER}" /></a></td></tr></table>');
- 	}
- }
- //-->
- </script>
- 
  <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
    <tr> 
--- 1,3 ----
***************
*** 83,93 ****
  		<tr> 
  		  <td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_ICQ_NUMBER}:</span></td>
! 		  <td class="row1" valign="middle"><span class="gen">
! 		  <script language="JavaScript" type="text/javascript"><!-- 
  
! 		  create_icq_subsilver('{ICQ}', '{ICQ_STATUS_IMG}', '{ICQ_IMG}');
  		  
! 		  //--></script>
! 		  <noscript>{ICQ_ADD_IMG}</noscript></span></td>
  		</tr>
  	  </table>
--- 71,82 ----
  		<tr> 
  		  <td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_ICQ_NUMBER}:</span></td>
! 		  <td class="row1"><script language="JavaScript" type="text/javascript"><!-- 
  
! 		if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 )
! 			document.write(' {ICQ_ADD_IMG}');
! 		else
! 			document.write('<table cellspacing="0" cellpadding="0" border="0"><tr><td nowrap="nowrap"><div style="position:relative;height:18px"><div style="position:absolute">{ICQ_ADD_IMG}</div><div style="position:absolute;left:3px;top:-1px">{ICQ_STATUS_IMG}</div></div></td></tr></table>');
  		  
! 		  //--></script><noscript>{ICQ_ADD_IMG}</noscript></td>
  		</tr>
  	  </table>

Index: viewtopic_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewtopic_body.tpl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** viewtopic_body.tpl	2 Mar 2002 21:54:24 -0000	1.28
--- viewtopic_body.tpl	19 Mar 2002 18:47:07 -0000	1.29
***************
*** 66,70 ****
  			document.write(' {postrow.ICQ_ADD_IMG}');
  		else
! 			document.write('</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">{postrow.ICQ_ADD_IMG}</div><div style="position:absolute;left:3px">{postrow.ICQ_STATUS_IMG}</div></div>');
  		  
  		  //--></script><noscript>{postrow.ICQ_ADD_IMG}</noscript></td>
--- 66,70 ----
  			document.write(' {postrow.ICQ_ADD_IMG}');
  		else
! 			document.write('</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">{postrow.ICQ_ADD_IMG}</div><div style="position:absolute;left:3px;top:-1px">{postrow.ICQ_STATUS_IMG}</div></div>');
  		  
  		  //--></script><noscript>{postrow.ICQ_ADD_IMG}</noscript></td>

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

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

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

Modified Files:
	groupcp.php 
Log Message:
Various fixes for unviewable group problems, etc.

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** groupcp.php	18 Mar 2002 13:35:42 -0000	1.53
--- groupcp.php	19 Mar 2002 18:24:58 -0000	1.54
***************
*** 22,26 ****
  
  define('IN_PHPBB', true);
! $phpbb_root_path = "./";
  include($phpbb_root_path . 'extension.inc');
  include($phpbb_root_path . 'common.'.$phpEx);
--- 22,26 ----
  
  define('IN_PHPBB', true);
! $phpbb_root_path = './';
  include($phpbb_root_path . 'extension.inc');
[...965 lines suppressed...]
! 		'L_GROUP_MEMBERSHIP_DETAILS' => $lang['Group_member_details'],
! 		'L_JOIN_A_GROUP' => $lang['Group_member_join'],
! 		'L_YOU_BELONG_GROUPS' => $lang['Current_memberships'],
! 		'L_SELECT_A_GROUP' => $lang['Non_member_groups'],
! 		'L_PENDING_GROUPS' => $lang['Memberships_pending'],
! 		'L_SUBSCRIBE' => $lang['Subscribe'],
! 		'L_UNSUBSCRIBE' => $lang['Unsubscribe'],
! 		'L_VIEW_INFORMATION' => $lang['View_Information'], 
! 
! 		'S_USERGROUP_ACTION' => append_sid("groupcp.$phpEx"), 
! 		'S_HIDDEN_FIELDS' => $s_hidden_fields, 
! 
! 		'GROUP_LIST_SELECT' => $s_group_list,
! 		'GROUP_PENDING_SELECT' => $s_pending_groups,
! 		'GROUP_MEMBER_SELECT' => $s_member_groups)
  	);
  
! 	$template->pparse('user');
  
  }

[Phpbb-checkins] CVS: phpBB2 install.php,1.37,1.38

[Jonathan H. <the...@us...>]

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

Modified Files:
	install.php 
Log Message:
Fix for bug #512279 Install now uses table prefix properly..


Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** install.php	18 Mar 2002 15:21:10 -0000	1.37
--- install.php	19 Mar 2002 17:36:49 -0000	1.38
***************
*** 419,422 ****
--- 419,423 ----
  			$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
  			$s_hidden_fields .= '<input type="hidden" name="dbms" value="'.$dmbs.'" />';
+ 			$s_hidden_fields .= '<input type="hidden" name="prefix" value="'.$table_prefix.'" />';
  			$s_hidden_fields .= '<input type="hidden" name="dbhost" value="'.$dbhost.'" />';
  			$s_hidden_fields .= '<input type="hidden" name="dbname" value="'.$dbname.'" />';
***************
*** 863,866 ****
--- 864,868 ----
  					$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
  					$s_hidden_fields .= '<input type="hidden" name="dbms" value="'.$dbms.'" />';
+ 					$s_hidden_fields .= '<input type="hidden" name="prefix" value="'.$table_prefix.'" />';
  					$s_hidden_fields .= '<input type="hidden" name="dbhost" value="'.$dbhost.'" />';
  					$s_hidden_fields .= '<input type="hidden" name="dbname" value="'.$dbname.'" />';

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

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

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

Modified Files:
	group_select_body.tpl 
Log Message:
Here we have the pleasure of fixing bugs 526891 and 530830.  Both have been tested on my local copy, and they should be ready!


Index: group_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/group_select_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** group_select_body.tpl	1 Mar 2002 00:10:41 -0000	1.4
--- group_select_body.tpl	19 Mar 2002 15:39:06 -0000	1.5
***************
*** 9,15 ****
--- 9,17 ----
  	<th class="thHead" align="center">{L_GROUP_SELECT}</th>
  	</tr>
+ 	<!-- BEGIN select_box -->
  	<tr>
  		<td class="row1" align="center">{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" name="edit" value="{L_LOOK_UP}" class="mainoption" />&nbsp;</td>
  	</tr>
+ 	<!-- END select_box -->
  	<tr>
  		<td class="catBottom" align="center">{S_HIDDEN_FIELDS}<input type="submit" class="liteoption" name="new" value="{L_CREATE_NEW_GROUP}" /></td>