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

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

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

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

Modified Files:
	viewforum.php 
Log Message:
Minor update to SQL to remove an IN where it was no longer necessary

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -r1.138 -r1.139
*** viewforum.php	2 Apr 2002 15:10:44 -0000	1.138
--- viewforum.php	4 Apr 2002 11:47:43 -0000	1.139
***************
*** 288,292 ****
  $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username
  	FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . USERS_TABLE . " u2
! 	WHERE t.forum_id IN ($forum_id, -1)
  		AND t.topic_poster = u.user_id
  		AND p.post_id = t.topic_last_post_id
--- 288,292 ----
  $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username
  	FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . USERS_TABLE . " u2
! 	WHERE t.forum_id = $forum_id 
  		AND t.topic_poster = u.user_id
  		AND p.post_id = t.topic_last_post_id

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.70,1.71

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

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

Modified Files:
	modcp.php 
Log Message:
Minor update for page count display

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** modcp.php	2 Apr 2002 14:02:05 -0000	1.70
--- modcp.php	4 Apr 2002 11:41:32 -0000	1.71
***************
*** 145,149 ****
  	$topic_row = $db->sql_fetchrow($result);
  
! 	$forum_topics = $topic_row['forum_topics'];
  	$forum_id = $topic_row['forum_id'];
  	$forum_name = $topic_row['forum_name'];
--- 145,149 ----
  	$topic_row = $db->sql_fetchrow($result);
  
! 	$forum_topics = ( $topic_row['forum_topics'] == 0 ) ? 1 : $topic_row['forum_topics'];
  	$forum_id = $topic_row['forum_id'];
  	$forum_name = $topic_row['forum_name'];
***************
*** 160,164 ****
  	$topic_row = $db->sql_fetchrow($result);
  
! 	$forum_topics = $topic_row['forum_topics'];
  	$forum_name = $topic_row['forum_name'];
  }
--- 160,164 ----
  	$topic_row = $db->sql_fetchrow($result);
  
! 	$forum_topics = ( $topic_row['forum_topics'] == 0 ) ? 1 : $topic_row['forum_topics'];
  	$forum_name = $topic_row['forum_name'];
  }

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_basic.sql,1.13,1.13.2.1 mysql_basic.sql,1.14,1.14.2.1 postgres_basic.sql,1.15,1.15.2.1

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

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

Modified Files:
      Tag: phpBB-2_0_0
	mssql_basic.sql mysql_basic.sql postgres_basic.sql 
Log Message:
Update version numbers ... almost there

Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -r1.13 -r1.13.2.1
*** mssql_basic.sql	19 Mar 2002 22:00:17 -0000	1.13
--- mssql_basic.sql	4 Apr 2002 15:00:11 -0000	1.13.2.1
***************
*** 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');
  
  /*
--- 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', '.0.0');
  
  /*

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** mysql_basic.sql	19 Mar 2002 22:00:17 -0000	1.14
--- mysql_basic.sql	4 Apr 2002 15:00:11 -0000	1.14.2.1
***************
*** 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');
  
  
--- 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', '.0.0');
  
  

Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -r1.15 -r1.15.2.1
*** postgres_basic.sql	25 Mar 2002 19:31:18 -0000	1.15
--- postgres_basic.sql	4 Apr 2002 15:00:11 -0000	1.15.2.1
***************
*** 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
--- 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', '.0.0');
  
  -- Categories

[Phpbb-checkins] CVS: phpBB2/includes prune.php,1.18,1.19

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

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

Modified Files:
	prune.php 
Log Message:
Minor change to cope with a now fixed (I think) situation where last_post_id was set to 0 ... would leave these topics and posts in place during prune

Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/prune.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** prune.php	2 Apr 2002 15:10:41 -0000	1.18
--- prune.php	4 Apr 2002 11:51:25 -0000	1.19
***************
*** 40,44 ****
  			AND t.topic_vote = 0 
  			AND t.topic_type <> " . POST_ANNOUNCE . " 
! 			AND p.post_id = t.topic_last_post_id";
  	if ( $prune_date != '' )
  	{
--- 40,45 ----
  			AND t.topic_vote = 0 
  			AND t.topic_type <> " . POST_ANNOUNCE . " 
! 			AND ( p.post_id = t.topic_last_post_id 
! 				OR t.topic_last_post_id = 0 )";
  	if ( $prune_date != '' )
  	{

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

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

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

Modified Files:
	viewonline.php 
Log Message:
Incorrect HTML

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** viewonline.php	4 Apr 2002 01:56:12 -0000	1.53
--- viewonline.php	4 Apr 2002 11:25:56 -0000	1.54
***************
*** 127,131 ****
  				$hidden_users++;
  
! 				$username = '<i>' . $username . '<i>';
  			}
  			else
--- 127,131 ----
  				$hidden_users++;
  
! 				$username = '<i>' . $username . '</i>';
  			}
  			else

[Phpbb-checkins] CVS: phpBB2/includes constants.php,1.46,1.47

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

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

Modified Files:
	constants.php 
Log Message:
Switch off DEBUG mode ... will have to ask users to enable this in some cases during bug reporting but this will prevent piles of SQL being output in a few unecessary places

Index: constants.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/constants.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** constants.php	2 Apr 2002 21:13:47 -0000	1.46
--- constants.php	4 Apr 2002 11:53:50 -0000	1.47
***************
*** 27,32 ****
  
  // Debug Level
! define('DEBUG', 1); // Debugging on
! //define('DEBUG', 0); // Debugging off
  
  
--- 27,32 ----
  
  // Debug Level
! //define('DEBUG', 1); // Debugging on
! define('DEBUG', 0); // Debugging off
  
  
***************
*** 179,181 ****
  define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
  
! ?>
--- 179,181 ----
  define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/includes page_tail.php,1.26,1.27

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

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

Modified Files:
	page_tail.php 
Log Message:
Remove timing and other details for final release ...can always be put back for those that want it

Index: page_tail.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_tail.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** page_tail.php	18 Mar 2002 13:35:22 -0000	1.26
--- page_tail.php	4 Apr 2002 11:53:13 -0000	1.27
***************
*** 23,27 ****
  if ( !defined('IN_PHPBB') )
  {
! 	die("Hacking attempt");
  }
  
--- 23,27 ----
  if ( !defined('IN_PHPBB') )
  {
! 	die('Hacking attempt');
  }
  
***************
*** 29,76 ****
  // Show the overall footer.
  //
! if($userdata['user_level'] == ADMIN)
! {
! 	$admin_link = "<a href=\"" . append_sid("admin/index.$phpEx") . "\">" . $lang['Admin_panel'] . "</a><br /><br />";
! }
! else
! {
! 	$admin_link = "";
! }
! $current_time = time();
  
! if( empty($gen_simple_header) )
! {
! 	$template->set_filenames(array(
! 		"overall_footer" => "overall_footer.tpl")
! 	);
! }
! else
! {
! 	$template->set_filenames(array(
! 		"overall_footer" => "simple_footer.tpl")
! 	);
! }
  
  $template->assign_vars(array(
! 	"PHPBB_VERSION" => "2.0 " . $board_config['version'],
! 	"TRANSLATION_INFO" => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : "", 
! 	"ADMIN_LINK" => $admin_link)
  );
  
! $template->pparse("overall_footer");
! 
! //
! // Output page creation time
! //
! $mtime = microtime();
! $mtime = explode(" ",$mtime);
! $mtime = $mtime[1] + $mtime[0];
! $endtime = $mtime;
! $totaltime = ($endtime - $starttime);
! 
! $gzip_text = ($board_config['gzip_compress']) ? "GZIP compression enabled" : "GZIP compression disabled";
! $debug_mode = (DEBUG) ? " : Debug Mode" : "";
! 
! printf("<br /><center><font size=\"-2\">phpBB Created this page in %f seconds : " . $db->num_queries . " queries executed : $gzip_text".$debug_mode."</font></center>", $totaltime);
  
  //
--- 29,45 ----
  // Show the overall footer.
  //
! $admin_link = ( $userdata['user_level'] == ADMIN ) ? '<a href="' . append_sid("admin/index.$phpEx") . '">' . $lang['Admin_panel'] . '</a><br /><br />' : '';
  
! $template->set_filenames(array(
! 	'overall_footer' => ( empty($gen_simple_header) ) ? 'overall_footer.tpl' : 'simple_footer.tpl')
! );
  
  $template->assign_vars(array(
! 	'PHPBB_VERSION' => '2' . $board_config['version'],
! 	'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '', 
! 	'ADMIN_LINK' => $admin_link)
  );
  
! $template->pparse('overall_footer');
  
  //
***************
*** 79,90 ****
  $db->sql_close();
  
- //for($i=0;$i<count($db->query_array);$i++)
- //	echo $db->query_array[$i] . "<BR>";
- 
  //
! // Compress buffered output if required
! // and send to browser
  //
! if($do_gzip_compress)
  {
  	//
--- 48,55 ----
  $db->sql_close();
  
  //
! // Compress buffered output if required and send to browser
  //
! if ( $do_gzip_compress )
  {
  	//
***************
*** 100,110 ****
  	$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
  
! 	echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
  	echo $gzip_contents;
! 	echo pack("V", $gzip_crc);
! 	echo pack("V", $gzip_size);
  }
  
  exit;
  
! ?>
--- 65,75 ----
  	$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
  
! 	echo '\x1f\x8b\x08\x00\x00\x00\x00\x00';
  	echo $gzip_contents;
! 	echo pack('V', $gzip_crc);
! 	echo pack('V', $gzip_size);
  }
  
  exit;
  
! ?>
\ No newline at end of file

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

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

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

Added Files:
	update_to_FINAL.php 
Log Message:
last updater

--- 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' || $row['config_value'] == 'RC-4' )
	{
		$sql = array();
		switch ( SQL_LAYER )
		{
			case 'mysql':
			case 'mysql4':
				$sql[] = "ALTER TABLE " . USERS_TABLE . " DROP 
					COLUMN user_autologin_key";
				break;

			case 'mssql-odbc':
			case 'mssql':
			case 'msaccess':
				$sql[] = "ALTER TABLE " . USERS_TABLE . " DROP 
					COLUMN user_autologin_key";
				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";
			}
		}

		unset($sql);

		$sql = "UPDATE " . CONFIG_TABLE . " 
			SET config_value = '.0.0' 
			WHERE config_name = 'version'";
		if ( !($result = $db->sql_query($sql)) )
		{
			die("Couldn't update version info");
		}

		die("UPDATING COMPLETE -> 2.0.0 Final installed");
	}
}

$sql = array();

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

		$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 . " DROP 
			COLUMN user_autologin_key";

		$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 . " DROP 
			COLUMN user_autologin_key";

		$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 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', '.0.0')";
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_db_utilities.php,1.41,1.42

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

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

Modified Files:
	admin_db_utilities.php 
Log Message:
Just me being anal again... A couple of miss-spellings in error messages


Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** admin_db_utilities.php	22 Mar 2002 17:00:32 -0000	1.41
--- admin_db_utilities.php	3 Apr 2002 20:14:46 -0000	1.42
***************
*** 490,494 ****
  	if (!$result)
  	{
! 		message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
  	}
  
--- 490,494 ----
  	if (!$result)
  	{
! 		message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
  	}
  
***************
*** 579,583 ****
  	if (!$result)
  	{
! 		message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
  	}
  
--- 579,583 ----
  	if (!$result)
  	{
! 		message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
  	}
  

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

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

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

Modified Files:
	usercp_activate.php 
Log Message:
Just me being anal again... A couple of miss-spellings in error messages


Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_activate.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** usercp_activate.php	2 Apr 2002 14:02:27 -0000	1.5
--- usercp_activate.php	3 Apr 2002 20:14:47 -0000	1.6
***************
*** 47,51 ****
  				$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('admin_welcome_activated', $row['user_lang']);
--- 47,51 ----
  				$emailer = new emailer($board_config['smtp_delivery']);
  
! 				$email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
  				$emailer->use_template('admin_welcome_activated', $row['user_lang']);
***************
*** 94,96 ****
  }
  
! ?>
\ No newline at end of file
--- 94,96 ----
  }
  
! ?>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images/lang_albanian icon_aim.gif,NONE,1.1 icon_edit.gif,NONE,1.1 icon_email.gif,NONE,1.1 icon_icq_add.gif,NONE,1.1 icon_ip.gif,NONE,1.1 icon_msnm.gif,NONE,1.1 icon_pm.gif,NONE,1.1 icon_profile.gif,NONE,1.1 icon_quote.gif,NONE,1.1 icon_search.gif,NONE,1.1 icon_www.gif,NONE,1.1 icon_yim.gif,NONE,1.1 msg_newpost.gif,NONE,1.1 post.gif,NONE,1.1 reply-locked.gif,NONE,1.1 reply.gif,NONE,1.1

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

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

Added Files:
	icon_aim.gif icon_edit.gif icon_email.gif icon_icq_add.gif 
	icon_ip.gif icon_msnm.gif icon_pm.gif icon_profile.gif 
	icon_quote.gif icon_search.gif icon_www.gif icon_yim.gif 
	msg_newpost.gif post.gif reply-locked.gif reply.gif 
Log Message:
Initial version by alket and psotfx

--- NEW FILE ---
GIF89a;
¬yÊvŒžÊ
x`©`C‡b:]K³A‚…Ȭ
/«D‰0_*¨È¶/‡¶xÐ÷.½¼÷ö]Ìö/Ä/ 8@¹²å˘3kÞ|™‚
--- NEW FILE ---
GIF89aF
$Yb xï|ÏRˆB¤@d¾¤rdtPD‰P#tËíz¿àp·±|,2


p	8Œx©
·8	n		§y
È@
--- NEW FILE ---
GIF89a;
­àå¦ÄîÉ°
$¨3@R„í&*l g¼@ب«
È6P A’€ʹ„™NƒÎ›T¼ú §OŒoVi°°±€ƒýŽ­jhA
‡„.5ÄT`µ]‡€
p˜ ˜W¡`-]ÀÀ“ŽiÈÆa¥;(x  &
ÉMÞvep™
--- NEW FILE ---
GIF89a;

\“®•û•y«ÅŽ´È	œ
¦ÆÖ9û9ÿÿ±;‚¦ÿÿ*_Y"q™ïÊ÷îîïSÀûÀ×ÛÝãíòD1Jx`|\~““Ù·Ùÿÿÿ!ù

Hp&i?‡u
p
Ÿ
rŒ­­Iq		m†v
^
--- NEW FILE ---
GIF89a

Š?Š
3ª¨²
4º»¼5,.1035!
--- NEW FILE ---
GIF89a;
·
·ÉÊM
ɺ
ÓÕ
qp°Mƒ„,ŠC˜

--- NEW FILE ---
GIF89a;
ååÓ
'¼§•˜p	µ
á)
ª®œ.@øz&(ÒNIÓ.uñÇÂKno!p•6E )3¬O
T™€bÚ¤k€€Áæ>~^
--- NEW FILE ---
GIF89a;
Î
¤QI\±„ê¨Ûïø¼~¯4 S
un[[t|‰{‰-
vZ[‡Š›w

’

¢-¦	
wF®®œ³©Ž	
	»¼	^¬Ã
Щ^¹¸º½»Àv
--- NEW FILE ---
GIF89aF
T*A”¬vËíz¿àmçaùX(
D ‘<ž·Øîø¼~ÏïûñKK
w5mprAkŽ}‘’’	AOUnœ}~“«

--- NEW FILE ---
GIF89a;
a†ŸŸ
Dnf:`Š`™kk› ¡¼¼
E¥z
l”
Ç
›ÍC£Í½½Àlê¹Êܸ›X
ü
†xH@ 8
äD ÀÁCƒ‡
Øš @
*v ˆOú*z00¤ –‚Dz)·°’.Pó(fÈ( ‡|
$Ð'@Á„ÿr9@‚Q	ðdø/$	¢™êà€';5
)0 ¸' 1p€†á'$ÜÍ{
ĆM»¶íÛ¸së®V‹‡žV‚nà‡
--- NEW FILE ---
GIF89a;
åÀn»ßð¸¼Ýi<C$@&js„…lˆ‰ˆ
|}y††Š meBm•›pžŠ¡´ 
Rmk
˜p
l£IˆËË_Ó
Üܹl	l
7¯o£ÓIïÓßv
ùݸuøVêÀ¼q	¸€
†u¯:eØÀƒ„
9PÌwŒÆŠÃtÙ

–Œ\@
ɒ¤hOvҐ Ã
l´\“$ý *Z¥îq@´XƒÀèr°KY`É ‡GFªys…
--- NEW FILE ---
GIF89a;


zÇÆÉ
 t
--- NEW FILE ---
GIF89aZ
§¾€6È®šä±Ïëë
L= ^Nà%‘ƒ
P
8°a+—ùˆ¦ƒZ8Pà؁&䶵 1è\¦wCßE  ¦"()Àáoy¬1p©À
.hš`Y‚‰šl<óL`cÑÎrE+@A„	A„t8ÐídU«mp㊐äc
h0Àtx€€
	â’}	PÇBÀ
--- NEW FILE ---
GIF89aZ

F	¸]º	H
ÎYlÙÙ«ÄƙÉää
'£C

ž&RûÍýø)ð¢áÄ
BqÂ͙ƒ`nóÜfÆ쀃Ó¨$3}aƒÓ©7ž=xAƒ“­¸³`Áâ¯í<÷Ë
8àWnàDQ±ÔL}LTZ€Ýÿ%ˆ
[ḒÁ%AoE9†Ì”l°€
0G
--- NEW FILE ---
GIF89aZ
5„–`wfˆ‰‹ž8 ;(lC&3]:*1—t™›œŠž 8½¾8
HéZ,DH B
"HèCB„,·Ea¬|I‘.Ý»—†‘W	¡Ç‚/,UƐ»„ƶÀààŽÊ8ÄöÈ !AÂ÷"HH(á@^
|S»X½Z„‘.@pà0@
--- NEW FILE ---
GIF89aZ
C|j‚—B…šžbEz
œ	|˜k›šŸ²‰E
}’[ÇX˚˜³žÖפDhz	j•\aaH„ìožï³×öö'¥C»4$Ø#d˜
$¶9 Á‘‡7$<Á
Ø`
«fà4€ô,0€@SÎ×|¸Nð„ºëÖ8 °aA7á©4dÈMx0
ÈR1üö­ Á„A6¬Bõ

4
þ¨m^(§`
X(î½÷že‡PH 

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images/lang_albanian - New directory

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

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

Log Message:
Directory /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_albanian added to the repository

[Phpbb-checkins] CVS: phpBB2 viewonline.php,1.52,1.53

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

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

Modified Files:
	viewonline.php 
Log Message:
minor changes ... hopefully!

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** viewonline.php	2 Apr 2002 16:09:00 -0000	1.52
--- viewonline.php	4 Apr 2002 01:56:12 -0000	1.53
***************
*** 98,106 ****
  $guest_counter = 0;
  $prev_user = 0;
! $prev_ip = 0;
  
  while ( $row = $db->sql_fetchrow($result) )
  {
! 	$view_online = 0;
  
  	if ( $row['session_logged_in'] ) 
--- 98,106 ----
  $guest_counter = 0;
  $prev_user = 0;
! $prev_ip = '';
  
  while ( $row = $db->sql_fetchrow($result) )
  {
! 	$view_online = false;
  
  	if ( $row['session_logged_in'] ) 
***************
*** 124,128 ****
  			if ( !$row['user_allow_viewonline'] )
  			{
! 				$view_online = ( $userdata['user_level'] == ADMIN ) ? 1 : 0;
  				$hidden_users++;
  
--- 124,128 ----
  			if ( !$row['user_allow_viewonline'] )
  			{
! 				$view_online = ( $userdata['user_level'] == ADMIN ) ? true : false;
  				$hidden_users++;
  
***************
*** 131,135 ****
  			else
  			{
! 				$view_online = 1;
  				$registered_users++;
  			}
--- 131,135 ----
  			else
  			{
! 				$view_online = true;
  				$registered_users++;
  			}
***************
*** 147,151 ****
  		if ( $row['session_ip'] != $prev_ip )
  		{
! 			$view_online = 1;
  			$guest_users++;
  	
--- 147,151 ----
  		if ( $row['session_ip'] != $prev_ip )
  		{
! 			$view_online = true;
  			$guest_users++;
  	

[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.19,1.20

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

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

Modified Files:
	usercp_register.php 
Log Message:
Wasn't reporting oversized (filesize) avatars ... again.

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** usercp_register.php	1 Apr 2002 19:19:47 -0000	1.19
--- usercp_register.php	3 Apr 2002 23:24:59 -0000	1.20
***************
*** 359,363 ****
  		$avatar_sql = user_avatar_delete($userdata['avatar_type'], $userdata['avatar_file']);
  	}
! 	else if ( !empty($user_avatar_upload) && $board_config['allow_avatar_upload'] )
  	{
  		if ( !empty($user_avatar_upload) )
--- 359,363 ----
  		$avatar_sql = user_avatar_delete($userdata['avatar_type'], $userdata['avatar_file']);
  	}
! 	else if ( ( !empty($user_avatar_upload) || !empty($user_avatar_name) ) && $board_config['allow_avatar_upload'] )
  	{
  		if ( !empty($user_avatar_upload) )

[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.57,1.58

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

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

Modified Files:
	groupcp.php 
Log Message:
Fix missing var preventing display of email link to users when browsing groups as group moderator or admin

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** groupcp.php	31 Mar 2002 00:06:33 -0000	1.57
--- groupcp.php	3 Apr 2002 22:24:56 -0000	1.58
***************
*** 28,32 ****
  // -------------------------
  //
! function generate_user_info(&$row, $date_format, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
  {
  	global $lang, $images, $board_config;
--- 28,32 ----
  // -------------------------
  //
! function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
  {
  	global $lang, $images, $board_config;
***************
*** 53,57 ****
  	}
  
! 	if ( !empty($row['user_viewemail']) || $userdata['user_level'] == ADMIN )
  	{
  		$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email'];
--- 53,57 ----
  	}
  
! 	if ( !empty($row['user_viewemail']) || $group_mod )
  	{
  		$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email'];
***************
*** 892,896 ****
  	$user_id = $group_moderator['user_id'];
  
! 	generate_user_info($group_moderator, $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  	$template->assign_vars(array(
--- 892,896 ----
  	$user_id = $group_moderator['user_id'];
  
! 	generate_user_info($group_moderator, $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  	$template->assign_vars(array(
***************
*** 981,985 ****
  		$user_id = $group_members[$i]['user_id'];
  
! 		generate_user_info($group_members[$i], $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  		if ( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator )
--- 981,985 ----
  		$user_id = $group_members[$i]['user_id'];
  
! 		generate_user_info($group_members[$i], $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  		if ( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator )
***************
*** 1074,1078 ****
  				$user_id = $modgroup_pending_list[$i]['user_id'];
  
! 				generate_user_info($modgroup_pending_list[$i], $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  				$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
--- 1074,1078 ----
  				$user_id = $modgroup_pending_list[$i]['user_id'];
  
! 				generate_user_info($modgroup_pending_list[$i], $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  				$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];

[Phpbb-checkins] CVS: phpBB2/language/lang_french/email admin_welcome_inactive.tpl,1.2,1.3 coppa_welcome_inactive.tpl,1.2,1.3 group_added.tpl,1.2,1.3 group_approved.tpl,1.2,1.3 group_request.tpl,1.2,1.3 privmsg_notify.tpl,1.2,1.3 topic_notify.tpl,1.2,1.3 user_activate.tpl,1.2,1.3 user_activate_passwd.tpl,1.2,1.3 user_welcome.tpl,1.2,1.3 user_welcome_inactive.tpl,1.2,1.3

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

Update of /cvsroot/phpbb/phpBB2/language/lang_french/email
In directory usw-pr-cvs1:/tmp/cvs-serv4403/language/lang_french/email

Modified Files:
	admin_welcome_inactive.tpl coppa_welcome_inactive.tpl 
	group_added.tpl group_approved.tpl group_request.tpl 
	privmsg_notify.tpl topic_notify.tpl user_activate.tpl 
	user_activate_passwd.tpl user_welcome.tpl 
	user_welcome_inactive.tpl 
Log Message:
Various updates

Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_welcome_inactive.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- admin_welcome_inactive.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Bienvenue sur les Forums {SITENAME}
  
  {WELCOME_MSG}
--- 1,3 ----
! Subject: Bienvenue sur les forums de {SITENAME}
  
  {WELCOME_MSG}

Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** coppa_welcome_inactive.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- coppa_welcome_inactive.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Bienvenue sur les Forums {SITENAME}
  
  {WELCOME_MSG}
--- 1,3 ----
! Subject: Bienvenue sur les forums de {SITENAME}
  
  {WELCOME_MSG}

Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_added.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- group_added.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Vous avez été rajouté à ce groupe d'utilisateurs
  
  Félicitations,
--- 1,3 ----
! Subject: Vous avez été ajouté à un groupe
  
  Félicitations,

Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_approved.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- group_approved.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Votre requête a été approuvée
  
  Félicitations,
--- 1,3 ----
! Subject: Votre demande a été approuvée
  
  Félicitations,

Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_request.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- group_request.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Une requête d'adhésion à votre groupe a été faites
  
  Cher {GROUP_MODERATOR},
--- 1,3 ----
! Subject: Une demande pour rejoindre votre groupe a été formulée
  
  Cher {GROUP_MODERATOR},

Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** privmsg_notify.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- privmsg_notify.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Un Nouveau Message Privé vient d'arriver
  
  Hello {USERNAME},
--- 1,3 ----
! Subject: Un nouveau message privé vient d'arriver
  
  Hello {USERNAME},

Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** topic_notify.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- topic_notify.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Notification de Réponse au Sujet - {TOPIC_TITLE}
  
  Bonjour {USERNAME},
--- 1,3 ----
! Subject: Notification de réponse au sujet - {TOPIC_TITLE}
  
  Bonjour {USERNAME},

Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_activate.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- user_activate.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Réactivez votre compte !
  
  Bonjour {USERNAME},
--- 1,3 ----
! Subject: Réactivez votre compte
  
  Bonjour {USERNAME},

Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_activate_passwd.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- user_activate_passwd.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Activation d'un nouveau mot de passe
  
  Bonjour {USERNAME}
--- 1,3 ----
! Subject: Activation du nouveau mot de passe
  
  Bonjour {USERNAME}

Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_welcome.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- user_welcome.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,3 ****
! Subject: Bienvenue sur les Forums {SITENAME}
  
  {WELCOME_MSG}
--- 1,3 ----
! Subject: Bienvenue sur les forums de {SITENAME}
  
  {WELCOME_MSG}

Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_welcome_inactive.tpl	2 Mar 2002 18:13:24 -0000	1.2
--- user_welcome_inactive.tpl	3 Apr 2002 17:47:16 -0000	1.3
***************
*** 1,4 ****
- Subject: Bienvenue sur les Forums {SITENAME}
- 
  {WELCOME_MSG}
  
--- 1,2 ----

[Phpbb-checkins] CVS: phpBB2/language/lang_french lang_admin.php,1.3,1.4 lang_main.php,1.6,1.7

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

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

Modified Files:
	lang_admin.php lang_main.php 
Log Message:
Various updates

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/lang_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** lang_admin.php	13 Feb 2002 22:26:02 -0000	1.3
--- lang_admin.php	3 Apr 2002 17:47:16 -0000	1.4
***************
*** 48,52 ****
  $lang['Mass_Email'] = "Email de Masse";
  $lang['Ranks'] = "Rangs";
! $lang['Smilies'] = "Emoticons";
  $lang['Ban_Management'] = "Contrôle du bannissement";
  $lang['Word_Censor'] = "Censure";
--- 48,52 ----
  $lang['Mass_Email'] = "Email de Masse";
  $lang['Ranks'] = "Rangs";
! $lang['Smilies'] = "Smilies";
  $lang['Ban_Management'] = "Contrôle du bannissement";
  $lang['Word_Censor'] = "Censure";
***************
*** 544,547 ****
--- 544,548 ----
  $lang['Rank_added'] = "Le rang a été ajouté avec succès";
  $lang['Rank_removed'] = "Le rang a été supprimé avec succès";
+ $lang['No_update_ranks'] = "Le rang a été supprimé avec succès, toutefois, les comptes des utilisateurs n'ont pas été mis à jour. Vous devrez remettre à zéro manuellement leur rang.";
  
  $lang['Click_return_rankadmin'] = "Cliquez %sici%s pour revenir à l'Administration des Rangs";

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_french/lang_main.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** lang_main.php	6 Mar 2002 00:36:22 -0000	1.6
--- lang_main.php	3 Apr 2002 17:47:16 -0000	1.7
***************
*** 26,34 ****
  
  
  // setlocale(LC_ALL, "fr");
  $lang['ENCODING'] = "ISO-8859-1";
! $lang['DIRECTION'] = "ltr"; // do not translate this, it's the Left to Right direction of text
! $lang['LEFT'] = "left"; // do not translate this, it's the normal 'left' direction of text
! $lang['RIGHT'] = "right"; // do not translate this, it's the normal 'right' direction of text
  $lang['DATE_FORMAT'] =  "d M Y"; // This should be changed to the default date format for your language, php date() format
  
--- 26,46 ----
  
  
+ //
+ // The format of this file is:
+ //
+ // ---> $lang['message'] = "text";
+ //
+ // You should also try to set a locale and a character
+ // encoding (plus direction). The encoding and direction
+ // will be sent to the template. The locale may or may
+ // not work, it's dependent on OS support and the syntax
+ // varies ... give it your best guess!
+ //
+ 
  // setlocale(LC_ALL, "fr");
  $lang['ENCODING'] = "ISO-8859-1";
! $lang['DIRECTION'] = "LTR";
! $lang['LEFT'] = "GAUCHE";
! $lang['RIGHT'] = "DROITE";
  $lang['DATE_FORMAT'] =  "d M Y"; // This should be changed to the default date format for your language, php date() format
  
***************
*** 276,280 ****
  
  $lang['Lock_topic'] = "Verrouiller le sujet";
! $lang['Unlock_topic'] = "Dévérouiller le sujet";
  $lang['Move_topic'] = "Déplacer le sujet";
  $lang['Delete_topic'] = "Supprimer le sujet";
--- 288,292 ----
  
  $lang['Lock_topic'] = "Verrouiller le sujet";
! $lang['Unlock_topic'] = "Déverrouiller le sujet";
  $lang['Move_topic'] = "Déplacer le sujet";
  $lang['Delete_topic'] = "Supprimer le sujet";
***************
*** 347,352 ****
  $lang['BBCode_is_ON'] = "Le %sBBCode%s est <u>Activé</u>"; // %s are replaced with URI pointing to FAQ
  $lang['BBCode_is_OFF'] = "Le %sBBCode%s est <u>Désactivé</u>";
! $lang['Smilies_are_ON'] = "Les Smilies sont <u>Activé</u>";
! $lang['Smilies_are_OFF'] = "Les Smilies sont <u>Désactivé</u>";
  
  $lang['Attach_signature'] = "Attacher sa signature (les signatures peuvent être modifiées dans le profil)";
--- 359,364 ----
  $lang['BBCode_is_ON'] = "Le %sBBCode%s est <u>Activé</u>"; // %s are replaced with URI pointing to FAQ
  $lang['BBCode_is_OFF'] = "Le %sBBCode%s est <u>Désactivé</u>";
! $lang['Smilies_are_ON'] = "Les Smilies sont <u>Activés</u>";
! $lang['Smilies_are_OFF'] = "Les Smilies sont <u>Désactivés</u>";
  
  $lang['Attach_signature'] = "Attacher sa signature (les signatures peuvent être modifiées dans le profil)";
***************
*** 540,544 ****
  $lang['Signature'] = "Signature";
  $lang['Signature_explain'] = "Ceci est un bloc de texte qui peut être ajouté aux messages que vous postez. Il y a une limite de %d caractères";
! $lang['Public_view_email'] = "Toujours montrer mon Adresse Email";
  
  $lang['Current_password'] = "Mot de passe actuel";
--- 552,556 ----
  $lang['Signature'] = "Signature";
  $lang['Signature_explain'] = "Ceci est un bloc de texte qui peut être ajouté aux messages que vous postez. Il y a une limite de %d caractères";
! $lang['Public_view_email'] = "Toujours montrer son Adresse email";
  
  $lang['Current_password'] = "Mot de passe actuel";
***************
*** 553,562 ****
  $lang['Upload_Avatar_URL'] = "Envoyer l'Avatar à partir d'une URL";
  $lang['Upload_Avatar_URL_explain'] = "Entrez l'URL de l'image Avatar, elle sera copiée sur ce site.";
! $lang['Pick_local_Avatar'] = "Sélectionner un Avatar de la Gallerie";
  $lang['Link_remote_Avatar'] = "Lier l'Avatar à partir d'un autre site";
  $lang['Link_remote_Avatar_explain'] = "Entrez l'URL de l'image Avatar que vous voulez lier.";
  $lang['Avatar_URL'] = "URL de l'Image Avatar";
! $lang['Select_from_gallery'] = "Sélectionner un Avatar à partir de la Gallerie";
! $lang['View_avatar_gallery'] = "Montrer la Gallerie";
  
  $lang['Select_avatar'] = "Sélectionner l'avatar";
--- 565,574 ----
  $lang['Upload_Avatar_URL'] = "Envoyer l'Avatar à partir d'une URL";
  $lang['Upload_Avatar_URL_explain'] = "Entrez l'URL de l'image Avatar, elle sera copiée sur ce site.";
! $lang['Pick_local_Avatar'] = "Sélectionner un Avatar de la Galerie";
  $lang['Link_remote_Avatar'] = "Lier l'Avatar à partir d'un autre site";
  $lang['Link_remote_Avatar_explain'] = "Entrez l'URL de l'image Avatar que vous voulez lier.";
  $lang['Avatar_URL'] = "URL de l'Image Avatar";
! $lang['Select_from_gallery'] = "Sélectionner un Avatar à partir de la Galerie";
! $lang['View_avatar_gallery'] = "Montrer la Galerie";
  
  $lang['Select_avatar'] = "Sélectionner l'avatar";
***************
*** 603,610 ****
  
  $lang['Registration'] = "Enregistrement - Règlement";
! $lang['Reg_agreement'] = "Les administrateurs et modérateurs de ce forum s'efforceront de supprimer ou éditer tous les messages à caractère répréhensible aussi rapidement que possible, toutefois, il leur est impossible de passer en revue tous les messages. Vous admettez donc que tous les messages postés sur ces forums expriment la vue et opinion de leurs auteurs respectifs, et non pas des administrateurs, ou modérateurs, ou webmestres (excepté les messages postés par ceux-ci) et par conséquent ne peuvent pas être tenus pour responsables.<br /><br />Vous consentez à ne pas poster de messages injurieux, obscènes, vulgaires, diffamatoires, menaçants, sexuels ou tout autre message qui violerait les lois applicables. Le faire peut vous conduire à être banni immédiatement de façon permanente (et votre fournisseur d'accès à internet en sera informé). L'adresse IP de chaque message est enregistrée afin d'aider à faire respecter ces conditions. Vous êtes d'accord sur le fait que le webmestre, l'administrateur et les modérateurs ce de forum ont le droit de supprimer, éditer, déplacer ou verrouiller n'importe quel sujet de discussion à tout moment. En tant qu'utilisateur, vous êtes d'accord sur le fait que toutes les informations que vous donnerez ci-après seront stockées dans une base de données. Cependant, ces informations ne seront divulguées à aucune tierce personne ou société sans votre accord. Le webmestre, l'administrateur, et les modérateurs ne peuvent pas être tenus pour responsables si une tentative de piratage informatique conduit à l'accès de ces données.<br /><br />Ce forum utilise les cookies pour stocker des informations sur votre ordinateur. Ces cookies ne contiendront aucune information que vous aurez entré ci-après, ils servent uniquement à améliorer le confort d'utilisation. L'adresse email est uniquement utilisée afin de confirmer les détails de votre enregistrement ainsi que votre mot de passe (et aussi pour vous envoyer un nouveau mot de passe dans la cas où vous l'oubliriez).<br /><br />En vous enregistrant, vous vous portez garant du fait d'être en accord avec le règlement ci-dessus.";
  
  $lang['Agree_under_13'] = "J'accepte le règlement et j'ai <b>moins</b> de 13 ans";
! $lang['Agree_over_13'] = "J'accepte le règlement et j'ai <b>plus</b> 13 ans";
  $lang['Agree_not'] = "Je n'accepte pas le règlement";
  
--- 615,622 ----
  
  $lang['Registration'] = "Enregistrement - Règlement";
! $lang['Reg_agreement'] = "Les administrateurs et modérateurs de ce forum s'efforceront de supprimer ou éditer tous les messages à caractère répréhensible aussi rapidement que possible. Toutefois, il leur est impossible de passer en revue tous les messages. Vous admettez donc que tous les messages postés sur ces forums expriment la vue et opinion de leurs auteurs respectifs, et non pas des administrateurs, ou modérateurs, ou webmestres (excepté les messages postés par eux-même) et par conséquent ne peuvent pas être tenus pour responsables.<br /><br />Vous consentez à ne pas poster de messages injurieux, obscènes, vulgaires, diffamatoires, menaçants, sexuels ou tout autre message qui violerait les lois applicables. Le faire peut vous conduire à être banni immédiatement de façon permanente (et votre fournisseur d'accès à internet en sera informé). L'adresse IP de chaque message est enregistrée afin d'aider à faire respecter ces conditions. Vous êtes d'accord sur le fait que le webmestre, l'administrateur et les modérateurs de ce forum ont le droit de supprimer, éditer, déplacer ou verrouiller n'importe quel sujet de discussion à tout moment. En tant qu'utilisateur, vous êtes d'accord sur le fait que toutes les informations que vous donnerez ci-après seront stockées dans une base de données. Cependant, ces informations ne seront divulguées à aucune tierce personne ou société sans votre accord. Le webmestre, l'administrateur, et les modérateurs ne peuvent pas être tenus pour responsables si une tentative de piratage informatique conduit à l'accès de ces données.<br /><br />Ce forum utilise les cookies pour stocker des informations sur votre ordinateur. Ces cookies ne contiendront aucune information que vous aurez entré ci-après, ils servent uniquement à améliorer le confort d'utilisation. L'adresse email est uniquement utilisée afin de confirmer les détails de votre enregistrement ainsi que votre mot de passe (et aussi pour vous envoyer un nouveau mot de passe dans la cas où vous l'oublieriez).<br /><br />En vous enregistrant, vous vous portez garant du fait d'être en accord avec le règlement ci-dessus.";
  
  $lang['Agree_under_13'] = "J'accepte le règlement et j'ai <b>moins</b> de 13 ans";
! $lang['Agree_over_13'] = "J'accepte le règlement et j'ai <b>plus</b> de 13 ans";
  $lang['Agree_not'] = "Je n'accepte pas le règlement";
  
***************
*** 620,625 ****
  $lang['User_prevent_email'] = "Cet utilisateur ne souhaite pas recevoir d'email. Essayez de lui envoyer un message privé";
  $lang['User_not_exist'] = "Cet utilisateur n'existe pas";
! $lang['CC_email'] = "Envoyer une copie de cet email à vous-même";
! $lang['Email_message_desc'] = "Ce message sera envoyé en texte plein, n'insérez aucun code HTML ou BBCode. L'adresse de retour pour ce message sera dirigée vers votre adresse email.";
  $lang['Flood_email_limit'] = "Vous ne pouvez pas envoyer un autre email pour le moment, essayez plus tard";
  $lang['Recipient'] = "Destinataire";
--- 632,637 ----
  $lang['User_prevent_email'] = "Cet utilisateur ne souhaite pas recevoir d'email. Essayez de lui envoyer un message privé";
  $lang['User_not_exist'] = "Cet utilisateur n'existe pas";
! $lang['CC_email'] = "Envoyer une copie de cet email à soi-même";
! $lang['Email_message_desc'] = "Ce message sera envoyé en texte plein, n'insérez aucun code HTML ou BBCode. L'adresse de réponse pour ce message sera celle de votre email.";
  $lang['Flood_email_limit'] = "Vous ne pouvez pas envoyer un autre email pour le moment, essayez plus tard";
  $lang['Recipient'] = "Destinataire";
***************
*** 694,701 ****
  $lang['Unsub_success'] = "Vous avez été désinscrit de ce groupe.";
  
! $lang['Approve_selected'] = "Approuver la Sélection";
! $lang['Deny_selected'] = "Refusé la Sélection";
  $lang['Not_logged_in'] = "Vous devez être connecté pour joindre un groupe.";
! $lang['Remove_selected'] = "Enlever la Sélection";
  $lang['Add_member'] = "Ajouter le Membre";
  $lang['Not_group_moderator'] = "Vous n'êtes pas le modérateur de ce groupe, vous ne pouvez donc pas accomplir cette action.";
--- 706,713 ----
  $lang['Unsub_success'] = "Vous avez été désinscrit de ce groupe.";
  
! $lang['Approve_selected'] = "Approuver la sélection";
! $lang['Deny_selected'] = "Refuser la sélection";
  $lang['Not_logged_in'] = "Vous devez être connecté pour joindre un groupe.";
! $lang['Remove_selected'] = "Supprimer la sélection";
  $lang['Add_member'] = "Ajouter le Membre";
  $lang['Not_group_moderator'] = "Vous n'êtes pas le modérateur de ce groupe, vous ne pouvez donc pas accomplir cette action.";
***************
*** 814,824 ****
  //
  $lang['Mod_CP'] = "Panneau de Contrôle de Modération";
! $lang['Mod_CP_explain'] = "En utilisant le formulaire ci-dessous, vous pouvez accomplir des opérations de modération de masse sur ce forum. Vous pouvez vérouiller, dévérouiller, déplacer ou supprimer n'importe quel nombre de sujets.";
  
  $lang['Select'] = "Sélectionner";
  $lang['Delete'] = "Supprimer";
  $lang['Move'] = "Déplacer";
! $lang['Lock'] = "Vérouiller";
! $lang['Unlock'] = "Dévérouiller";
  
  $lang['Topics_Removed'] = "Les sujets sélectionnés ont été retirés de la base de données avec succès.";
--- 826,836 ----
  //
  $lang['Mod_CP'] = "Panneau de Contrôle de Modération";
! $lang['Mod_CP_explain'] = "En utilisant le formulaire ci-dessous, vous pouvez accomplir des opérations de modération de masse sur ce forum. Vous pouvez verrouiller, déverrouiller, déplacer ou supprimer n'importe quel nombre de sujets.";
  
  $lang['Select'] = "Sélectionner";
  $lang['Delete'] = "Supprimer";
  $lang['Move'] = "Déplacer";
! $lang['Lock'] = "Verrouiller";
! $lang['Unlock'] = "Déverrouiller";
  
  $lang['Topics_Removed'] = "Les sujets sélectionnés ont été retirés de la base de données avec succès.";
***************
*** 829,834 ****
  
  $lang['Confirm_delete_topic'] = "Etes-vous sûr de vouloir supprimer le(s) sujet(s) sélectionné(s) ?";
! $lang['Confirm_lock_topic'] = "Etes-vous sûr de vouloir vérouiller le(s) sujet(s) sélectionné(s) ?";
! $lang['Confirm_unlock_topic'] = "Etes-vous sûr de vouloir dévérouiller le(s) sujet(s) sélectionné(s) ?";
  $lang['Confirm_move_topic'] = "Etes-vous sûr de vouloir déplacer le(s) sujet(s) sélectionné(s) ?";
  
--- 841,846 ----
  
  $lang['Confirm_delete_topic'] = "Etes-vous sûr de vouloir supprimer le(s) sujet(s) sélectionné(s) ?";
! $lang['Confirm_lock_topic'] = "Etes-vous sûr de vouloir verrouiller le(s) sujet(s) sélectionné(s) ?";
! $lang['Confirm_unlock_topic'] = "Etes-vous sûr de vouloir déverrouiller le(s) sujet(s) sélectionné(s) ?";
  $lang['Confirm_move_topic'] = "Etes-vous sûr de vouloir déplacer le(s) sujet(s) sélectionné(s) ?";
  
***************
*** 870,874 ****
  $lang['-5'] = "EST (U.S./Canada)";
  $lang['-4'] = "GMT - 4 Heures";
! $lang['-3.5'] = "GMT - 3.5 Heures";
  $lang['-3'] = "GMT - 3 Heures";
  $lang['-2'] = "Mid-Atlantic";
--- 882,886 ----
  $lang['-5'] = "EST (U.S./Canada)";
  $lang['-4'] = "GMT - 4 Heures";
! $lang['-3.5'] = "GMT - 3,5 Heures";
  $lang['-3'] = "GMT - 3 Heures";
  $lang['-2'] = "Mid-Atlantic";
***************
*** 878,887 ****
  $lang['2'] = "EET (Europe)";
  $lang['3'] = "GMT + 3 Heures";
! $lang['3.5'] = "GMT + 3.5 Heures";
  $lang['4'] = "GMT + 4 Heures";
! $lang['4.5'] = "GMT + 4.5 Heures";
  $lang['5'] = "GMT + 5 Heures";
! $lang['5.5'] = "GMT + 5.5 Heures";
  $lang['6'] = "GMT + 6 Heures";
  $lang['7'] = "GMT + 7 Heures";
  $lang['8'] = "WST (Australie)";
--- 890,900 ----
  $lang['2'] = "EET (Europe)";
  $lang['3'] = "GMT + 3 Heures";
! $lang['3.5'] = "GMT + 3,5 Heures";
  $lang['4'] = "GMT + 4 Heures";
! $lang['4.5'] = "GMT + 4,5 Heures";
  $lang['5'] = "GMT + 5 Heures";
! $lang['5.5'] = "GMT + 5,5 Heures";
  $lang['6'] = "GMT + 6 Heures";
+ $lang['6.5'] = "GMT + 6.5 Heures";
  $lang['7'] = "GMT + 7 Heures";
  $lang['8'] = "WST (Australie)";
***************
*** 939,943 ****
  $lang['datetime']['Fri'] = "Ven";
  $lang['datetime']['Sat'] = "Sam";
! $lang['datetime']['January'] = "Janiver";
  $lang['datetime']['February'] = "Février";
  $lang['datetime']['March'] = "Mars";
--- 952,956 ----
  $lang['datetime']['Fri'] = "Ven";
  $lang['datetime']['Sat'] = "Sam";
! $lang['datetime']['January'] = "Janvier";
  $lang['datetime']['February'] = "Février";
  $lang['datetime']['March'] = "Mars";
***************
*** 958,962 ****
  $lang['datetime']['Jun'] = "Juin";
  $lang['datetime']['Jul'] = "Juil";
! $lang['datetime']['Aug'] = "Auo";
  $lang['datetime']['Sep'] = "Sep";
  $lang['datetime']['Oct'] = "Oct";
--- 971,975 ----
  $lang['datetime']['Jun'] = "Juin";
  $lang['datetime']['Jul'] = "Juil";
! $lang['datetime']['Aug'] = "Aôu";
  $lang['datetime']['Sep'] = "Sep";
  $lang['datetime']['Oct'] = "Oct";
***************
*** 978,982 ****
  
  // Translator credit 
! $lang['TRANSLATION_INFO'] = "Traduction par : <a href=\"http://www.phpbb-fr.com/\" target=\"_blank\">Helix</a>";
  
  //
--- 991,995 ----
  
  // Translator credit 
! $lang['TRANSLATION_INFO'] = "Traduction par : <a href=\"http://www.phpbb-fr.com/\" target=\"_blank\">phpBB-fr.com</a>";
  
  //

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

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

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

Modified Files:
	functions_post.php 
Log Message:
Minor error in stats updating when deleting first post of a topic ... topic replies was not decremented

Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** functions_post.php	2 Apr 2002 21:13:47 -0000	1.8
--- functions_post.php	3 Apr 2002 14:38:56 -0000	1.9
***************
*** 440,444 ****
  			if ( $row = $db->sql_fetchrow($result) )
  			{
! 				$topic_update_sql = 'topic_first_post_id = ' . $row['post_id'];
  			}
  		}
--- 440,444 ----
  			if ( $row = $db->sql_fetchrow($result) )
  			{
! 				$topic_update_sql = 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['post_id'];
  			}
  		}

[Phpbb-checkins] CVS: phpBB2/includes functions_admin.php,1.4,1.5 prune.php,1.16,1.17

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

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

Modified Files:
	functions_admin.php prune.php 
Log Message:
more changes

Index: functions_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** functions_admin.php	2 Apr 2002 14:02:27 -0000	1.4
--- functions_admin.php	2 Apr 2002 14:53:40 -0000	1.5
***************
*** 72,76 ****
  			while( $row = $db->sql_fetchrow($result) )
  			{
! 				sync("forum", $row['forum_id']);
  			}
  		   	break;
--- 72,76 ----
  			while( $row = $db->sql_fetchrow($result) )
  			{
! 				sync('forum', $row['forum_id']);
  			}
  		   	break;
***************
*** 86,90 ****
  			while( $row = $db->sql_fetchrow($result) )
  			{
! 				sync("topic", $row['topic_id']);
  			}
  			break;
--- 86,90 ----
  			while( $row = $db->sql_fetchrow($result) )
  			{
! 				sync('topic', $row['topic_id']);
  			}
  			break;

Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/prune.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** prune.php	2 Apr 2002 14:02:27 -0000	1.16
--- prune.php	2 Apr 2002 14:53:40 -0000	1.17
***************
*** 27,31 ****
  
  require($phpbb_root_path . 'includes/functions_search.'.$phpEx);
- require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
  
  function prune($forum_id, $prune_date)
--- 27,30 ----
***************
*** 111,116 ****
  			remove_search_post($sql_post);
  
- 			sync('forum', $forum_id);
- 
  			return array ('topics' => $pruned_topics, 'posts' => $pruned_posts);
  		}
--- 110,113 ----
***************
*** 126,129 ****
--- 123,128 ----
  function auto_prune($forum_id = 0)
  {
+ 	require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
+ 
  	global $db, $lang;
  
***************
*** 143,147 ****
  			$next_prune = time() + ( $row['prune_freq'] * 86400 );
  
! 			$pruned = prune($forum_id, $prune_date);
  
  			$sql = "UPDATE " . FORUMS_TABLE . " 
--- 142,147 ----
  			$next_prune = time() + ( $row['prune_freq'] * 86400 );
  
! 			prune($forum_id, $prune_date);
! 			sync('forum', $forum_id);
  
  			$sql = "UPDATE " . FORUMS_TABLE . " 

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

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

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

Removed Files:
	update_to_RC4.php 
Log Message:
Time for tubby bye bye

--- update_to_RC4.php DELETED ---

[Phpbb-checkins] CVS: phpBB2/includes constants.php,1.45,1.46 functions_post.php,1.7,1.8 functions_validate.php,1.5,1.6 smtp.php,1.15,1.16 template.php,1.9,1.10

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

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

Modified Files:
	constants.php functions_post.php functions_validate.php 
	smtp.php template.php 
Log Message:
Ok this is just me being anal again... No code changes, just file headers..


Index: constants.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/constants.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** constants.php	18 Mar 2002 13:35:22 -0000	1.45
--- constants.php	2 Apr 2002 21:13:47 -0000	1.46
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                               includes.php
   *                            -------------------
   *   begin                : Saturday', Feb 13', 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                               constants.php
   *                            -------------------
   *   begin                : Saturday', Feb 13', 2001
***************
*** 179,181 ****
  define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
  
! ?>
\ No newline at end of file
--- 179,181 ----
  define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
  
! ?>

Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** functions_post.php	2 Apr 2002 14:03:49 -0000	1.7
--- functions_post.php	2 Apr 2002 21:13:47 -0000	1.8
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                                 post.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                            functions_post.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
***************
*** 840,842 ****
  }
  
! ?>
\ No newline at end of file
--- 840,842 ----
  }
  
! ?>

Index: functions_validate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_validate.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** functions_validate.php	21 Mar 2002 14:29:42 -0000	1.5
--- functions_validate.php	2 Apr 2002 21:13:47 -0000	1.6
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                             user_selects.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                          functions_validate.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** smtp.php	18 Mar 2002 23:53:12 -0000	1.15
--- smtp.php	2 Apr 2002 21:13:47 -0000	1.16
***************
*** 1,12 ****
  <?php
  /***************************************************************************
!                                 smtp.php
! 						  -------------------
!     begin                : Wed May 09 2001
!     copyright            : (C) 2001 The phpBB Group
!     email                : su...@ph...
! 
!     $Id$
! 
   ***************************************************************************/
  
--- 1,12 ----
  <?php
  /***************************************************************************
!  *                              smtp.php
!  *                       -------------------
!  *   begin                : Wed May 09 2001
!  *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
!  *
!  *   $Id$
!  *
   ***************************************************************************/
  
***************
*** 229,231 ****
  }
  
! ?>
\ No newline at end of file
--- 229,231 ----
  }
  
! ?>

Index: template.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/template.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** template.php	18 Mar 2002 23:53:12 -0000	1.9
--- template.php	2 Apr 2002 21:13:47 -0000	1.10
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                              template.inc
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                              template.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
***************
*** 476,478 ****
  }
  
! ?>
\ No newline at end of file
--- 476,478 ----
  }
  
! ?>

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.69,1.70 viewforum.php,1.136,1.137

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

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

Modified Files:
	modcp.php viewforum.php 
Log Message:
Various updates with any luck they fix a few minor issues without causing new ones ...

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** modcp.php	31 Mar 2002 00:06:33 -0000	1.69
--- modcp.php	2 Apr 2002 14:02:05 -0000	1.70
***************
*** 193,197 ****
  // Do major work ...
  //
! switch($mode)
  {
  	case 'delete':
--- 193,197 ----
  // Do major work ...
  //
! switch( $mode )
  {
  	case 'delete':
***************
*** 218,228 ****
  				message_die(GENERAL_ERROR, 'Could not get post id information', '', __LINE__, __FILE__, $sql);
  			}
- 			$rowset = $db->sql_fetchrowset($result);
  
  			$post_id_sql = '';
! 			for($i = 0; $i < count($rowset); $i++)
  			{
! 				$post_id_sql .= ( ( $post_id_sql != '' ) ? ', ' : '' ) . $rowset[$i]['post_id'];
  			}
  
  			$sql = "SELECT vote_id 
--- 218,228 ----
  				message_die(GENERAL_ERROR, 'Could not get post id information', '', __LINE__, __FILE__, $sql);
  			}
  
  			$post_id_sql = '';
! 			while ( $row = $db->sql_fetchrow($result) )
  			{
! 				$post_id_sql .= ( ( $post_id_sql != '' ) ? ', ' : '' ) . $row['post_id'];
  			}
+ 			$db->sql_freeresult($result);
  
  			$sql = "SELECT vote_id 
***************
*** 233,243 ****
  				message_die(GENERAL_ERROR, 'Could not get vote id information', '', __LINE__, __FILE__, $sql);
  			}
- 			$rowset = $db->sql_fetchrowset($result);
  
  			$vote_id_sql = '';
! 			for($i = 0; $i < count($rowset); $i++)
  			{
! 				$vote_id_sql .= ( ( $vote_id_sql != '' ) ? ', ' : '' ) . $rowset[$i]['vote_id'];
  			}
  
  			//
--- 233,243 ----
  				message_die(GENERAL_ERROR, 'Could not get vote id information', '', __LINE__, __FILE__, $sql);
  			}
  
  			$vote_id_sql = '';
! 			while ( $row = $db->sql_fetchrow($result) )
  			{
! 				$vote_id_sql .= ( ( $vote_id_sql != '' ) ? ', ' : '' ) . $row['vote_id'];
  			}
+ 			$db->sql_freeresult($result);
  
  			//
***************
*** 248,252 ****
  				WHERE topic_id IN ($topic_id_sql) 
  					OR topic_moved_id IN ($topic_id_sql)";
! 			if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete topics', '', __LINE__, __FILE__, $sql);
--- 248,252 ----
  				WHERE topic_id IN ($topic_id_sql) 
  					OR topic_moved_id IN ($topic_id_sql)";
! 			if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete topics', '', __LINE__, __FILE__, $sql);
***************
*** 258,262 ****
  					FROM " . POSTS_TABLE . " 
  					WHERE post_id IN ($post_id_sql)";
! 				if ( !($result = $db->sql_query($sql)) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete posts', '', __LINE__, __FILE__, $sql);
--- 258,262 ----
  					FROM " . POSTS_TABLE . " 
  					WHERE post_id IN ($post_id_sql)";
! 				if ( !$db->sql_query($sql) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete posts', '', __LINE__, __FILE__, $sql);
***************
*** 266,285 ****
  					FROM " . POSTS_TEXT_TABLE . " 
  					WHERE post_id IN ($post_id_sql)";
! 				if ( !($result = $db->sql_query($sql)) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete posts text', '', __LINE__, __FILE__, $sql);
  				}
  
- 				$sql = "DELETE 
- 					FROM " . SEARCH_MATCH_TABLE . " 
- 					WHERE post_id IN ($post_id_sql)";
- 				if ( !($result = $db->sql_query($sql)) )
- 				{
- 					message_die(GENERAL_ERROR, 'Could not delete posts text', '', __LINE__, __FILE__, $sql);
- 				}
- 				
- 				//
- 				// Delete unmatched words
- 				//
  				remove_search_post($post_id_sql);
  			}
--- 266,274 ----
  					FROM " . POSTS_TEXT_TABLE . " 
  					WHERE post_id IN ($post_id_sql)";
! 				if ( !$db->sql_query($sql) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete posts text', '', __LINE__, __FILE__, $sql);
  				}
  
  				remove_search_post($post_id_sql);
  			}
***************
*** 290,294 ****
  					FROM " . VOTE_DESC_TABLE . " 
  					WHERE vote_id IN ($vote_id_sql)";
! 				if ( !($result = $db->sql_query($sql)) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete vote descriptions', '', __LINE__, __FILE__, $sql);
--- 279,283 ----
  					FROM " . VOTE_DESC_TABLE . " 
  					WHERE vote_id IN ($vote_id_sql)";
! 				if ( !$db->sql_query($sql) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete vote descriptions', '', __LINE__, __FILE__, $sql);
***************
*** 298,302 ****
  					FROM " . VOTE_RESULTS_TABLE . " 
  					WHERE vote_id IN ($vote_id_sql)";
! 				if ( !($result = $db->sql_query($sql)) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete vote results', '', __LINE__, __FILE__, $sql);
--- 287,291 ----
  					FROM " . VOTE_RESULTS_TABLE . " 
  					WHERE vote_id IN ($vote_id_sql)";
! 				if ( !$db->sql_query($sql) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete vote results', '', __LINE__, __FILE__, $sql);
***************
*** 306,310 ****
  					FROM " . VOTE_USERS_TABLE . " 
  					WHERE vote_id IN ($vote_id_sql)";
! 				if ( !($result = $db->sql_query($sql)) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete vote users', '', __LINE__, __FILE__, $sql);
--- 295,299 ----
  					FROM " . VOTE_USERS_TABLE . " 
  					WHERE vote_id IN ($vote_id_sql)";
! 				if ( !$db->sql_query($sql) )
  				{
  					message_die(GENERAL_ERROR, 'Could not delete vote users', '', __LINE__, __FILE__, $sql);
***************
*** 315,319 ****
  				FROM " . TOPICS_WATCH_TABLE . " 
  				WHERE topic_id IN ($topic_id_sql)";
! 			if ( !($result = $db->sql_query($sql, END_TRANSACTION)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete watched post list', '', __LINE__, __FILE__, $sql);
--- 304,308 ----
  				FROM " . TOPICS_WATCH_TABLE . " 
  				WHERE topic_id IN ($topic_id_sql)";
! 			if ( !$db->sql_query($sql, END_TRANSACTION) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete watched post list', '', __LINE__, __FILE__, $sql);
***************
*** 409,413 ****
  					FROM " . TOPICS_TABLE . " 
  					WHERE topic_id IN ($topic_list) 
! 						AND topic_moved_id = 0";
  				if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
  				{
--- 398,402 ----
  					FROM " . TOPICS_TABLE . " 
  					WHERE topic_id IN ($topic_list) 
! 						AND topic_status <> " . TOPIC_MOVED;
  				if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
  				{
***************
*** 427,431 ****
  						$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_first_post_id, topic_last_post_id, topic_moved_id)
  							VALUES ($old_forum_id, '" . addslashes(str_replace("\'", "''", $row[$i]['topic_title'])) . "', '" . str_replace("\'", "''", $row[$i]['topic_poster']) . "', " . $row[$i]['topic_time'] . ", " . TOPIC_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_first_post_id'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)";
! 						if ( !($result = $db->sql_query($sql)) )
  						{
  							message_die(GENERAL_ERROR, 'Could not insert shadow topic', '', __LINE__, __FILE__, $sql);
--- 416,420 ----
  						$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_first_post_id, topic_last_post_id, topic_moved_id)
  							VALUES ($old_forum_id, '" . addslashes(str_replace("\'", "''", $row[$i]['topic_title'])) . "', '" . str_replace("\'", "''", $row[$i]['topic_poster']) . "', " . $row[$i]['topic_time'] . ", " . TOPIC_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_first_post_id'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)";
! 						if ( !$db->sql_query($sql) )
  						{
  							message_die(GENERAL_ERROR, 'Could not insert shadow topic', '', __LINE__, __FILE__, $sql);
***************
*** 436,440 ****
  						SET forum_id = $new_forum_id  
  						WHERE topic_id = $topic_id";
! 					if ( !($result = $db->sql_query($sql)) )
  					{
  						message_die(GENERAL_ERROR, 'Could not update old topic', '', __LINE__, __FILE__, $sql);
--- 425,429 ----
  						SET forum_id = $new_forum_id  
  						WHERE topic_id = $topic_id";
! 					if ( !$db->sql_query($sql) )
  					{
  						message_die(GENERAL_ERROR, 'Could not update old topic', '', __LINE__, __FILE__, $sql);
***************
*** 444,448 ****
  						SET forum_id = $new_forum_id 
  						WHERE topic_id = $topic_id";
! 					if ( !($result = $db->sql_query($sql)) )
  					{
  						message_die(GENERAL_ERROR, 'Could not update post topic ids', '', __LINE__, __FILE__, $sql);
--- 433,437 ----
  						SET forum_id = $new_forum_id 
  						WHERE topic_id = $topic_id";
! 					if ( !$db->sql_query($sql) )
  					{
  						message_die(GENERAL_ERROR, 'Could not update post topic ids', '', __LINE__, __FILE__, $sql);
***************
*** 630,634 ****
  			$post_time = $post_rowset['post_time'];
  
! 			$post_subject = trim(strip_tags($HTTP_POST_VARS['subject']));
  			if ( empty($post_subject) )
  			{
--- 619,623 ----
  			$post_time = $post_rowset['post_time'];
  
! 			$post_subject = trim(htmlspecialchars($HTTP_POST_VARS['subject']));
  			if ( empty($post_subject) )
  			{
***************
*** 668,672 ****
  			}
  
! 			if( !($result = $db->sql_query($sql, END_TRANSACTION)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not update posts table', '', __LINE__, __FILE__, $sql);
--- 657,661 ----
  			}
  
! 			if( !$db->sql_query($sql, END_TRANSACTION) )
  			{
  				message_die(GENERAL_ERROR, 'Could not update posts table', '', __LINE__, __FILE__, $sql);
***************
*** 952,961 ****
  		$template->pparse('viewip');
  
- 		break;
- 
- 	case 'auth':
- 		//
- 		// For future use ...
- 		//
  		break;
  
--- 941,944 ----

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -r1.136 -r1.137
*** viewforum.php	31 Mar 2002 00:06:33 -0000	1.136
--- viewforum.php	2 Apr 2002 14:02:05 -0000	1.137
***************
*** 256,260 ****
  	$row = $db->sql_fetchrow($result);
  
! 	$topics_count = $row['forum_topics'];
  	$limit_topics_time = "AND p.post_time >= $min_topic_time";
  
--- 256,260 ----
  	$row = $db->sql_fetchrow($result);
  
! 	$topics_count = ( $forum_row['forum_topics'] ) ? $forum_row['forum_topics'] : 1;
  	$limit_topics_time = "AND p.post_time >= $min_topic_time";
  
***************
*** 266,270 ****
  else
  {
! 	$topics_count = $forum_row['forum_topics'];
  
  	$limit_topics_time = '';
--- 266,270 ----
  else
  {
! 	$topics_count = ( $forum_row['forum_topics'] ) ? $forum_row['forum_topics'] : 1;
  
  	$limit_topics_time = '';

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.137,1.138

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

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

Modified Files:
	viewforum.php 
Log Message:
No comment

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -r1.137 -r1.138
*** viewforum.php	2 Apr 2002 14:02:05 -0000	1.137
--- viewforum.php	2 Apr 2002 15:10:44 -0000	1.138
***************
*** 175,178 ****
--- 175,179 ----
  	{
  		include($phpbb_root_path . 'includes/prune.'.$phpEx);
+ 		require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
  		auto_prune($forum_id);
  	}

[Phpbb-checkins] CVS: phpBB2 viewonline.php,1.51,1.52

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

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

Modified Files:
	viewonline.php 
Log Message:
More minor changes

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** viewonline.php	31 Mar 2002 02:42:24 -0000	1.51
--- viewonline.php	2 Apr 2002 16:09:00 -0000	1.52
***************
*** 91,295 ****
  }
  
! if ( $row = $db->sql_fetchrow($result) )
  {
! 	$guest_users = 0;
! 	$registered_users = 0;
! 	$hidden_users = 0;
! 
! 	$reg_counter = 0;
! 	$guest_counter = 0;
! 	$prev_user = 0;
! 	$prev_ip = 0;
  
! 	do
  	{
! 		$view_online = 0;
  
! 		if ( $row['session_logged_in'] ) 
  		{
! 			$user_id = $row['user_id'];
  
! 			if ( $user_id != $prev_user )
  			{
! 				$username = $row['username'];
! 
! 				$style_color = '';
! 				if ( $row['user_level'] == ADMIN )
! 				{
! 					$username = '<b style="color:#' . $theme['fontcolor3'] . '">' . $username . '</b>';
! 				}
! 				else if ( $row['user_level'] == MOD )
! 				{
! 					$username = '<b style="color:#' . $theme['fontcolor2'] . '">' . $username . '</b>';
! 				}
! 
! 				if ( !$row['user_allow_viewonline'] )
! 				{
! 					$view_online = ( $userdata['user_level'] == ADMIN ) ? 1 : 0;
! 					$hidden_users++;
! 
! 					$username = '<i>' . $username . '<i>';
! 				}
! 				else
! 				{
! 					$view_online = 1;
! 					$registered_users++;
! 				}
! 
! 				$last_update = $row['user_session_time'];
! 				$user_page = $row['user_session_page'];
! 
! 				$which_counter = 'reg_counter';
! 				$which_row = 'reg_user_row';
! 				$prev_user = $user_id;
  			}
! 		}
! 		else
! 		{
! 			if ( $row['session_ip'] != $prev_ip )
  			{
! 				$view_online = 1;
! 				$guest_users++;
! 		
! 				$username = $lang['Guest'];
! 				$last_update = $row['session_time'];
! 				$user_page = $row['session_page'];
! 
! 				$which_counter = 'guest_counter';
! 				$which_row = 'guest_user_row';
  			}
- 		}
- 
- 		$prev_ip = $row['session_ip'];
  
! 		if ( $view_online )
! 		{
! 			if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
  			{
! 				switch( $user_page )
! 				{
! 					case PAGE_INDEX:
! 						$location = $lang['Forum_index'];
! 						$location_url = "index.$phpEx";
! 						break;
! 					case PAGE_POSTING:
! 						$location = $lang['Posting_message'];
! 						$location_url = "index.$phpEx";
! 						break;
! 					case PAGE_LOGIN:
! 						$location = $lang['Logging_on'];
! 						$location_url = "index.$phpEx";
! 						break;
! 					case PAGE_SEARCH:
! 						$location = $lang['Searching_forums'];
! 						$location_url = "search.$phpEx";
! 						break;
! 					case PAGE_PROFILE:
! 						$location = $lang['Viewing_profile'];
! 						$location_url = "index.$phpEx";
! 						break;
! 					case PAGE_VIEWONLINE:
! 						$location = $lang['Viewing_online'];
! 						$location_url = "viewonline.$phpEx";
! 						break;
! 					case PAGE_VIEWMEMBERS:
! 						$location = $lang['Viewing_member_list'];
! 						$location_url = "memberlist.$phpEx";
! 						break;
! 					case PAGE_PRIVMSGS:
! 						$location = $lang['Viewing_priv_msgs'];
! 						$location_url = "privmsg.$phpEx";
! 						break;
! 					case PAGE_FAQ:
! 						$location = $lang['Viewing_FAQ'];
! 						$location_url = "faq.$phpEx";
! 						break;
! 					default:
! 						$location = $lang['Forum_index'];
! 						$location_url = "index.$phpEx";
! 				}
  			}
  			else
  			{
! 				$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $user_page);
! 				$location = $forum_data[$user_page];
  			}
  
! 			$row_color = ( $$which_counter % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
! 			$row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 			$template->assign_block_vars("$which_row", array(
! 				'ROW_COLOR' => '#' . $row_color,
! 				'ROW_CLASS' => $row_class,
! 				'USERNAME' => $username,
! 				'LASTUPDATE' => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']),
! 				'FORUM_LOCATION' => $location,
! 
! 				'U_USER_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $user_id),
! 				'U_FORUM_LOCATION' => append_sid($location_url))
! 			);
! 
! 			$$which_counter++;
  		}
  	}
- 	while ( $row = $db->sql_fetchrow($result) );
- 
- 	if( $registered_users == 0 )
- 	{
- 		$l_r_user_s = $lang['Reg_users_zero_online'];
- 	}
- 	else if( $registered_users == 1 )
- 	{
- 		$l_r_user_s = $lang['Reg_user_online'];
- 	}
  	else
  	{
! 		$l_r_user_s = $lang['Reg_users_online'];
! 	}
  
! 	if( $hidden_users == 0 )
! 	{
! 		$l_h_user_s = $lang['Hidden_users_zero_online'];
! 	}
! 	else if( $hidden_users == 1 )
! 	{
! 		$l_h_user_s = $lang['Hidden_user_online'];
! 	}
! 	else
! 	{
! 		$l_h_user_s = $lang['Hidden_users_online'];
  	}
  
! 	if( $guest_users == 0 )
! 	{
! 		$l_g_user_s = $lang['Guest_users_zero_online'];
! 	}
! 	else if( $guest_users == 1 )
! 	{
! 		$l_g_user_s = $lang['Guest_user_online'];
! 	}
! 	else
  	{
! 		$l_g_user_s = $lang['Guest_users_online'];
! 	}
  
! 	$template->assign_vars(array(
! 		'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users), 
! 		'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users))
! 	);
  
! 	if ( $registered_users + $hidden_users == 0 )
! 	{
! 		$template->assign_vars(array(
! 			'L_NO_REGISTERED_USERS_BROWSING' => $lang['No_users_browsing'])
! 		);
! 	}
  
! 	if ( $guest_users == 0 )
! 	{
! 		$template->assign_vars(array(
! 			'L_NO_GUESTS_BROWSING' => $lang['No_users_browsing'])
  		);
  	}
  }
  
--- 91,291 ----
  }
  
! $guest_users = 0;
! $registered_users = 0;
! $hidden_users = 0;
! 
! $reg_counter = 0;
! $guest_counter = 0;
! $prev_user = 0;
! $prev_ip = 0;
! 
! while ( $row = $db->sql_fetchrow($result) )
  {
! 	$view_online = 0;
  
! 	if ( $row['session_logged_in'] ) 
  	{
! 		$user_id = $row['user_id'];
  
! 		if ( $user_id != $prev_user )
  		{
! 			$username = $row['username'];
  
! 			$style_color = '';
! 			if ( $row['user_level'] == ADMIN )
  			{
! 				$username = '<b style="color:#' . $theme['fontcolor3'] . '">' . $username . '</b>';
  			}
! 			else if ( $row['user_level'] == MOD )
  			{
! 				$username = '<b style="color:#' . $theme['fontcolor2'] . '">' . $username . '</b>';
  			}
  
! 			if ( !$row['user_allow_viewonline'] )
  			{
! 				$view_online = ( $userdata['user_level'] == ADMIN ) ? 1 : 0;
! 				$hidden_users++;
! 
! 				$username = '<i>' . $username . '<i>';
  			}
  			else
  			{
! 				$view_online = 1;
! 				$registered_users++;
  			}
  
! 			$last_update = $row['user_session_time'];
! 			$user_page = $row['user_session_page'];
  
! 			$which_counter = 'reg_counter';
! 			$which_row = 'reg_user_row';
! 			$prev_user = $user_id;
  		}
  	}
  	else
  	{
! 		if ( $row['session_ip'] != $prev_ip )
! 		{
! 			$view_online = 1;
! 			$guest_users++;
! 	
! 			$username = $lang['Guest'];
! 			$last_update = $row['session_time'];
! 			$user_page = $row['session_page'];
  
! 			$which_counter = 'guest_counter';
! 			$which_row = 'guest_user_row';
! 		}
  	}
  
! 	$prev_ip = $row['session_ip'];
! 
! 	if ( $view_online )
  	{
! 		if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
! 		{
! 			switch( $user_page )
! 			{
! 				case PAGE_INDEX:
! 					$location = $lang['Forum_index'];
! 					$location_url = "index.$phpEx";
! 					break;
! 				case PAGE_POSTING:
! 					$location = $lang['Posting_message'];
! 					$location_url = "index.$phpEx";
! 					break;
! 				case PAGE_LOGIN:
! 					$location = $lang['Logging_on'];
! 					$location_url = "index.$phpEx";
! 					break;
! 				case PAGE_SEARCH:
! 					$location = $lang['Searching_forums'];
! 					$location_url = "search.$phpEx";
! 					break;
! 				case PAGE_PROFILE:
! 					$location = $lang['Viewing_profile'];
! 					$location_url = "index.$phpEx";
! 					break;
! 				case PAGE_VIEWONLINE:
! 					$location = $lang['Viewing_online'];
! 					$location_url = "viewonline.$phpEx";
! 					break;
! 				case PAGE_VIEWMEMBERS:
! 					$location = $lang['Viewing_member_list'];
! 					$location_url = "memberlist.$phpEx";
! 					break;
! 				case PAGE_PRIVMSGS:
! 					$location = $lang['Viewing_priv_msgs'];
! 					$location_url = "privmsg.$phpEx";
! 					break;
! 				case PAGE_FAQ:
! 					$location = $lang['Viewing_FAQ'];
! 					$location_url = "faq.$phpEx";
! 					break;
! 				default:
! 					$location = $lang['Forum_index'];
! 					$location_url = "index.$phpEx";
! 			}
! 		}
! 		else
! 		{
! 			$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $user_page);
! 			$location = $forum_data[$user_page];
! 		}
  
! 		$row_color = ( $$which_counter % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
! 		$row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 		$template->assign_block_vars("$which_row", array(
! 			'ROW_COLOR' => '#' . $row_color,
! 			'ROW_CLASS' => $row_class,
! 			'USERNAME' => $username,
! 			'LASTUPDATE' => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']),
! 			'FORUM_LOCATION' => $location,
  
! 			'U_USER_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $user_id),
! 			'U_FORUM_LOCATION' => append_sid($location_url))
  		);
+ 
+ 		$$which_counter++;
  	}
+ }
+ 
+ if( $registered_users == 0 )
+ {
+ 	$l_r_user_s = $lang['Reg_users_zero_online'];
+ }
+ else if( $registered_users == 1 )
+ {
+ 	$l_r_user_s = $lang['Reg_user_online'];
+ }
+ else
+ {
+ 	$l_r_user_s = $lang['Reg_users_online'];
+ }
+ 
+ if( $hidden_users == 0 )
+ {
+ 	$l_h_user_s = $lang['Hidden_users_zero_online'];
+ }
+ else if( $hidden_users == 1 )
+ {
+ 	$l_h_user_s = $lang['Hidden_user_online'];
+ }
+ else
+ {
+ 	$l_h_user_s = $lang['Hidden_users_online'];
+ }
+ 
+ if( $guest_users == 0 )
+ {
+ 	$l_g_user_s = $lang['Guest_users_zero_online'];
+ }
+ else if( $guest_users == 1 )
+ {
+ 	$l_g_user_s = $lang['Guest_user_online'];
+ }
+ else
+ {
+ 	$l_g_user_s = $lang['Guest_users_online'];
+ }
+ 
+ $template->assign_vars(array(
+ 	'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users), 
+ 	'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users))
+ );
+ 
+ if ( $registered_users + $hidden_users == 0 )
+ {
+ 	$template->assign_vars(array(
+ 		'L_NO_REGISTERED_USERS_BROWSING' => $lang['No_users_browsing'])
+ 	);
+ }
+ 
+ if ( $guest_users == 0 )
+ {
+ 	$template->assign_vars(array(
+ 		'L_NO_GUESTS_BROWSING' => $lang['No_users_browsing'])
+ 	);
  }
  

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.132,1.133 functions_admin.php,1.3,1.4 prune.php,1.15,1.16 usercp_activate.php,1.4,1.5

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

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

Modified Files:
	functions.php functions_admin.php prune.php 
	usercp_activate.php 
Log Message:
Various updates with any luck they fix a few minor issues without causing new ones ...

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -r1.132 -r1.133
*** functions.php	31 Mar 2002 00:06:34 -0000	1.132
--- functions.php	2 Apr 2002 14:02:27 -0000	1.133
***************
*** 215,227 ****
  		}
  	}
- 		/*switch( getenv('HTTP_ACCEPT_LANGUAGE') )
- 		{
- 			case 'en-gb':
- 				$board_config['default_lang'] = 'english';
- 				break;
- 			case 'fr':
- 				$board_config['default_lang'] = 'french';
- 				break;
- 		}*/
  
  	if ( !file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx) )
--- 215,218 ----
***************
*** 315,320 ****
  function decode_ip($int_ip)
  {
! 	$hexipbang = explode('.',chunk_split($int_ip, 2, '.'));
! 	return hexdec($hexipbang[0]).'.'.hexdec($hexipbang[1]).'.'.hexdec($hexipbang[2]).'.'.hexdec($hexipbang[3]);
  }
  
--- 306,311 ----
  function decode_ip($int_ip)
  {
! 	$hexipbang = explode('.', chunk_split($int_ip, 2, '.'));
! 	return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]);
  }
  
***************
*** 351,355 ****
  	if ( $total_pages == 1 )
  	{
! 		return "";
  	}
  
--- 342,346 ----
  	if ( $total_pages == 1 )
  	{
! 		return '';
  	}
  
***************
*** 443,447 ****
  {
  	$text = preg_quote($str);
! 	$text = str_replace($delimiter, "\\" . $delimiter, $text);
  	
  	return $text;
--- 434,438 ----
  {
  	$text = preg_quote($str);
! 	$text = str_replace($delimiter, '\\' . $delimiter, $text);
  	
  	return $text;
***************
*** 471,475 ****
  		do 
  		{
! 			$orig_word[] = "#\b(" . str_replace("\*", "\w*?", phpbb_preg_quote($row['word'], "#")) . ")\b#i";
  			$replacement_word[] = $row['replacement'];
  		}
--- 462,466 ----
  		do 
  		{
! 			$orig_word[] = '#\b(' . str_replace('\*', '\w*?', phpbb_preg_quote($row['word'], '#')) . ')\b#i';
  			$replacement_word[] = $row['replacement'];
  		}

Index: functions_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** functions_admin.php	18 Mar 2002 23:53:12 -0000	1.3
--- functions_admin.php	2 Apr 2002 14:02:27 -0000	1.4
***************
*** 91,97 ****
  
  	  	case 'forum':
! 			$sql = "SELECT MAX(post_id) AS last_post, COUNT(post_id) AS total 
! 				FROM " . POSTS_TABLE . " 
! 				WHERE forum_id = $id";
  			if ( !$result = $db->sql_query($sql) )
  			{
--- 91,99 ----
  
  	  	case 'forum':
! 			$sql = "SELECT MAX(p.post_id) AS last_post, COUNT(p.post_id) AS total 
! 				FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE  . " t 
! 				WHERE p.forum_id = $id 
! 					AND t.topic_id = p.topic_id 
! 					AND t.topic_status <> " . TOPIC_MOVED;
  			if ( !$result = $db->sql_query($sql) )
  			{
***************
*** 119,137 ****
  			}
  
! 			if ( $row = $db->sql_fetchrow($result) )
! 			{
! 				$total_topics = ($row['total']) ? $row['total'] : 0;
! 			}
! 			else
! 			{
! 				$total_topics = 0;
! 			}
  
  			$sql = "UPDATE " . FORUMS_TABLE . "
  				SET forum_last_post_id = $last_post, forum_posts = $total_posts, forum_topics = $total_topics
  				WHERE forum_id = $id";
! 			if ( !$result = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, "Could not update forum $id", '', __LINE__, __FILE__, $sql);
  			}
  			break;
--- 121,132 ----
  			}
  
! 			$total_topics = ( $row = $db->sql_fetchrow($result) ) ? ( ( $row['total'] ) ? $row['total'] : 0 ) : 0;
  
  			$sql = "UPDATE " . FORUMS_TABLE . "
  				SET forum_last_post_id = $last_post, forum_posts = $total_posts, forum_topics = $total_topics
  				WHERE forum_id = $id";
! 			if ( !$db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not update forum', '', __LINE__, __FILE__, $sql);
  			}
  			break;
***************
*** 143,147 ****
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, "Could not get post ID", '', __LINE__, __FILE__, $sql);
  			}
  
--- 138,142 ----
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
  			}
  
***************
*** 151,157 ****
  					SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " 
  					WHERE topic_id = $id";
! 				if ( !($result = $db->sql_query($sql)) )
  				{
! 					message_die(GENERAL_ERROR, "Could not update topic $id", '', __LINE__, __FILE__, $sql);
  				}
  			}
--- 146,152 ----
  					SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " 
  					WHERE topic_id = $id";
! 				if ( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not update topic', '', __LINE__, __FILE__, $sql);
  				}
  			}

Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/prune.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** prune.php	22 Mar 2002 17:54:33 -0000	1.15
--- prune.php	2 Apr 2002 14:02:27 -0000	1.16
***************
*** 27,30 ****
--- 27,31 ----
  
  require($phpbb_root_path . 'includes/functions_search.'.$phpEx);
+ require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
  
  function prune($forum_id, $prune_date)
***************
*** 39,43 ****
  		WHERE t.forum_id = $forum_id
  			AND t.topic_vote = 0 
! 			AND t.topic_type <> " . POST_ANNOUNCE . "
  			AND p.post_id = t.topic_last_post_id";
  	if ( $prune_date != '' )
--- 40,44 ----
  		WHERE t.forum_id = $forum_id
  			AND t.topic_vote = 0 
! 			AND t.topic_type <> " . POST_ANNOUNCE . " 
  			AND p.post_id = t.topic_last_post_id";
  	if ( $prune_date != '' )
***************
*** 45,48 ****
--- 46,50 ----
  		$sql .= " AND p.post_time < $prune_date";
  	}
+ 
  	if ( !($result = $db->sql_query($sql)) )
  	{
***************
*** 77,81 ****
  			$sql = "DELETE FROM " . TOPICS_TABLE . " 
  				WHERE topic_id IN ($sql_topics)";
! 			if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete topics during prune', '', __LINE__, __FILE__, $sql);
--- 79,83 ----
  			$sql = "DELETE FROM " . TOPICS_TABLE . " 
  				WHERE topic_id IN ($sql_topics)";
! 			if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete topics during prune', '', __LINE__, __FILE__, $sql);
***************
*** 86,90 ****
  			$sql = "DELETE FROM " . POSTS_TABLE . " 
  				WHERE post_id IN ($sql_post)";
! 			if ( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete post_text during prune', '', __LINE__, __FILE__, $sql);
--- 88,92 ----
  			$sql = "DELETE FROM " . POSTS_TABLE . " 
  				WHERE post_id IN ($sql_post)";
! 			if ( !$db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete post_text during prune', '', __LINE__, __FILE__, $sql);
***************
*** 95,99 ****
  			$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
  				WHERE post_id IN ($sql_post)";
! 			if ( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete post during prune', '', __LINE__, __FILE__, $sql);
--- 97,101 ----
  			$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
  				WHERE post_id IN ($sql_post)";
! 			if ( !$db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete post during prune', '', __LINE__, __FILE__, $sql);
***************
*** 102,106 ****
  			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " 
  				WHERE post_id IN ($sql_post)";
! 			if ( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete search matches', '', __LINE__, __FILE__, $sql);
--- 104,108 ----
  			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " 
  				WHERE post_id IN ($sql_post)";
! 			if ( !$db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, 'Could not delete search matches', '', __LINE__, __FILE__, $sql);
***************
*** 109,119 ****
  			remove_search_post($sql_post);
  
! 			$sql = "UPDATE " . FORUMS_TABLE . "
! 				SET forum_topics = forum_topics - $pruned_topics, forum_posts = forum_posts - $pruned_posts
! 				WHERE forum_id = $forum_id";
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not update forum data after prune', '', __LINE__, __FILE__, $sql);
! 			}
  
  			return array ('topics' => $pruned_topics, 'posts' => $pruned_posts);
--- 111,115 ----
  			remove_search_post($sql_post);
  
! 			sync('forum', $forum_id);
  
  			return array ('topics' => $pruned_topics, 'posts' => $pruned_posts);
***************
*** 145,154 ****
  		{
  			$prune_date = time() - ( $row['prune_days'] * 86400 );
- 			prune($forum_id, $prune_date);
- 
  			$next_prune = time() + ( $row['prune_freq'] * 86400 );
  
  			$sql = "UPDATE " . FORUMS_TABLE . " 
! 				SET prune_next = $next_prune
  				WHERE forum_id = $forum_id";
  			if ( !$db->sql_query($sql) )
--- 141,150 ----
  		{
  			$prune_date = time() - ( $row['prune_days'] * 86400 );
  			$next_prune = time() + ( $row['prune_freq'] * 86400 );
  
+ 			$pruned = prune($forum_id, $prune_date);
+ 
  			$sql = "UPDATE " . FORUMS_TABLE . " 
! 				SET prune_next = $next_prune 
  				WHERE forum_id = $forum_id";
  			if ( !$db->sql_query($sql) )

Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_activate.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** usercp_activate.php	19 Mar 2002 21:54:47 -0000	1.4
--- usercp_activate.php	2 Apr 2002 14:02:27 -0000	1.5
***************
*** 24,28 ****
  if ( !defined('IN_PHPBB') )
  {
! 	die("Hacking attempt");
  	exit;
  }
--- 24,28 ----
  if ( !defined('IN_PHPBB') )
  {
! 	die('Hacking attempt');
  	exit;
  }
***************
*** 35,39 ****
  	if ( $row = $db->sql_fetchrow($result) )
  	{
! 		$sql_update_pass = ( $row['user_newpasswd'] != "" ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : "";
  
  		$sql = "UPDATE " . USERS_TABLE . "
--- 35,39 ----
  	if ( $row = $db->sql_fetchrow($result) )
  	{
! 		$sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : "";
  
  		$sql = "UPDATE " . USERS_TABLE . "
***************
*** 47,53 ****
  				$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("admin_welcome_activated", $row['user_lang']);
  				$emailer->email_address($row['user_email']);
  				$emailer->set_subject();//$lang['Account_activated_subject']
--- 47,53 ----
  				$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('admin_welcome_activated', $row['user_lang']);
  				$emailer->email_address($row['user_email']);
  				$emailer->set_subject();//$lang['Account_activated_subject']
***************
*** 55,62 ****
  
  				$emailer->assign_vars(array(
! 					"SITENAME" => $board_config['sitename'], 
! 					"USERNAME" => $username,
! 					"PASSWORD" => $password_confirm,
! 					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']))
  				);
  				$emailer->send();
--- 55,62 ----
  
  				$emailer->assign_vars(array(
! 					'SITENAME' => $board_config['sitename'], 
! 					'USERNAME' => $username,
! 					'PASSWORD' => $password_confirm,
! 					'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']))
  				);
  				$emailer->send();
***************
*** 64,68 ****
  
  				$template->assign_vars(array(
! 					"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  				);
  
--- 64,68 ----
  
  				$template->assign_vars(array(
! 					'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  				);
  
***************
*** 72,79 ****
  			{
  				$template->assign_vars(array(
! 					"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  				);
  
! 				$message = ( $sql_update_pass == "" ) ? $lang['Account_active'] : $lang['Password_activated']; 
  				message_die(GENERAL_MESSAGE, $message);
  			}
--- 72,79 ----
  			{
  				$template->assign_vars(array(
! 					'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  				);
  
! 				$message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; 
  				message_die(GENERAL_MESSAGE, $message);
  			}
***************
*** 81,85 ****
  		else
  		{
! 			message_die(GENERAL_ERROR, "Couldn't update users table", "", __LINE__, __FILE__, $sql_update);
  		}
  	}
--- 81,85 ----
  		else
  		{
! 			message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update);
  		}
  	}
***************
*** 91,96 ****
  else
  {
! 	message_die(GENERAL_ERROR, "Couldn't obtain user information", "", __LINE__, __FILE__, $sql);
  }
  
! ?>
--- 91,96 ----
  else
  {
! 	message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql);
  }
  
! ?>
\ No newline at end of file