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

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.2,1.3

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

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

Modified Files:
	lang_main.php 
Log Message:
Wow. Rank administration is FINALLY here. Enjoy\!

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lang_main.php	2001/10/11 22:01:11	1.2
--- lang_main.php	2001/10/14 14:27:07	1.3
***************
*** 1008,1011 ****
--- 1008,1029 ----
  $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
+ 
+ //
+ // Ranks admin
+ //
+ $lang['Must_select_rank'] = "Sorry, you didn't select a rank.  Please go back and try again.";
+ $lang['Ranks_title'] = "Rank Administration";
+ $lang['Ranks_explain'] = "Here you can add, edit, view, and delete ranks. This is also a place to create custom ranks.";
+ $lang['Rank_title'] = "Rank Title";
+ $lang['Rank_special'] = "Special rank?";
+ $lang['Rank_minimum'] = "Minimum Posts";
+ $lang['Rank_maximum'] = "Maximum Posts";
+ $lang['Rank_updated'] = "The rank was successfully updated.";
+ $lang['Rank_added'] = "The rank was successfully added.";
+ $lang['Rank_removed'] = "The rank was successfully deleted.";
+ $lang['Add_new_rank'] = "Add new rank";
+ $lang['Rank_image'] = "Rank Image";
+ $lang['Rank_image_explain'] = "This is the place to set a custom image for everyone in the rank. Please enter a URL, beginning with http://";
+ 
  //
  // End

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin admin_smile.tpl,1.1,NONE admin_upgrade.tpl,1.2,NONE admin_upgrade_results.tpl,1.2,NONE

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

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

Removed Files:
	admin_smile.tpl admin_upgrade.tpl admin_upgrade_results.tpl 
Log Message:
Not needed

--- admin_smile.tpl DELETED ---

--- admin_upgrade.tpl DELETED ---

--- admin_upgrade_results.tpl DELETED ---

[Phpbb-checkins] CVS: phpBB2/db mssql_basic.sql,1.10,1.11 mysql_basic.sql,1.62,1.63 postgres_basic.sql,1.12,1.13

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

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

Modified Files:
	mssql_basic.sql mysql_basic.sql postgres_basic.sql 
Log Message:
Updated basic, includes default avatar gallery path

Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql_basic.sql,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** mssql_basic.sql	2001/10/09 23:29:51	1.10
--- mssql_basic.sql	2001/10/11 22:26:00	1.11
***************
*** 50,53 ****
--- 50,54 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql_basic.sql,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** mysql_basic.sql	2001/10/09 23:29:51	1.62
--- mysql_basic.sql	2001/10/11 22:26:00	1.63
***************
*** 44,47 ****
--- 44,48 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');

Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/postgres_basic.sql,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** postgres_basic.sql	2001/10/09 23:29:51	1.12
--- postgres_basic.sql	2001/10/11 22:26:01	1.13
***************
*** 44,47 ****
--- 44,48 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');

[Phpbb-checkins] CVS: phpBB2 profile.php,1.115,1.116

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

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

Modified Files:
	profile.php 
Log Message:
That stupid broken is_die and filetype ... ran fine under Win2K, failed under Linux, workaround in place

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** profile.php	2001/10/11 22:01:10	1.115
--- profile.php	2001/10/11 22:22:28	1.116
***************
*** 1260,1264 ****
  				while( $file = @readdir($dir) )
  				{
! 					if( @filetype($file) == "dir" && !preg_match("/\.\.|\./", $file) )
  					{
  						$sub_dir = @opendir($board_config['avatar_gallery_path'] . "/" . $file);
--- 1260,1264 ----
  				while( $file = @readdir($dir) )
  				{
! 					if( $file != "." && $file != ".." && !is_file($file) && !is_link($file) )
  					{
  						$sub_dir = @opendir($board_config['avatar_gallery_path'] . "/" . $file);
***************
*** 1370,1373 ****
--- 1370,1382 ----
  		else
  		{
+ 			if( $mode == "editprofile" )
+ 			{
+ 				if( $user_id != $userdata['user_id'] )
+ 				{
+ 					$error = TRUE;
+ 					$error_msg = $lang['Wrong_Profile'];
+ 				}
+ 			}
+ 
  			if( !isset($coppa) )
  			{

[Phpbb-checkins] CVS: phpBB2/includes constants.php,1.34,1.35

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

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

Modified Files:
	constants.php 
Log Message:
Preliminary avatar gallery support

Index: constants.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/constants.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** constants.php	2001/09/25 18:42:36	1.34
--- constants.php	2001/10/11 22:05:36	1.35
***************
*** 37,44 ****
  
  
! // User Activation
  define(USER_ACTIVATION_NONE, 0);
  define(USER_ACTIVATION_SELF, 1);
  define(USER_ACTIVATION_ADMIN, 2);
  
  
--- 37,49 ----
  
  
! // User related
  define(USER_ACTIVATION_NONE, 0);
  define(USER_ACTIVATION_SELF, 1);
  define(USER_ACTIVATION_ADMIN, 2);
+ 
+ define(USER_AVATAR_NONE, 0);
+ define(USER_AVATAR_UPLOAD, 1);
+ define(USER_AVATAR_REMOTE, 2);
+ define(USER_AVATAR_GALLERY, 3);
  
  

[Phpbb-checkins] CVS: phpBB2/db mssql_schema.sql,1.17,1.18 mysql_schema.sql,1.81,1.82 postgres_schema.sql,1.54,1.55

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

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

Modified Files:
	mssql_schema.sql mysql_schema.sql postgres_schema.sql 
Log Message:
Preliminary avatar gallery support

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql_schema.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** mssql_schema.sql	2001/10/01 23:22:18	1.17
--- mssql_schema.sql	2001/10/11 22:01:11	1.18
***************
*** 434,438 ****
  	[user_regdate] [int] NOT NULL ,
  	[user_rank] [int] NULL ,
! 	[user_avatar] [varchar] (100) NULL ,
  	[user_email] [varchar] (25) NULL ,
  	[user_icq] [varchar] (15) NULL ,
--- 434,439 ----
  	[user_regdate] [int] NOT NULL ,
  	[user_rank] [int] NULL ,
! 	[user_avatar] [varchar] (100) NULL , 
! 	[user_avatar_type] [smallint] NOT NULL, 
  	[user_email] [varchar] (25) NULL ,
  	[user_icq] [varchar] (15) NULL ,
***************
*** 653,657 ****
  	CONSTRAINT [DF_phpbb_users_user_allow_viewonline] DEFAULT (1) FOR [user_allow_viewonline],
  	CONSTRAINT [DF_phpbb_users_user_notify] DEFAULT (1) FOR [user_notify],
! 	CONSTRAINT [DF_phpbb_users_user_notify_pm] DEFAULT (1) FOR [user_notify_pm]
  GO
  
--- 654,659 ----
  	CONSTRAINT [DF_phpbb_users_user_allow_viewonline] DEFAULT (1) FOR [user_allow_viewonline],
  	CONSTRAINT [DF_phpbb_users_user_notify] DEFAULT (1) FOR [user_notify],
! 	CONSTRAINT [DF_phpbb_users_user_notify_pm] DEFAULT (1) FOR [user_notify_pm], 
! 	CONSTRAINT [DF_phpbb_users_user_avatar_type] DEFAULT (0) FOR [user_avatar_type]
  GO
  

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql_schema.sql,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** mysql_schema.sql	2001/10/04 23:56:03	1.81
--- mysql_schema.sql	2001/10/11 22:01:11	1.82
***************
*** 472,475 ****
--- 472,476 ----
     user_rank int(11) DEFAULT '0',
     user_avatar varchar(100),
+    user_avatar_type tinyint(4) DEFAULT '0' NOT NULL, 
     user_email varchar(255),
     user_icq varchar(15),

Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/postgres_schema.sql,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** postgres_schema.sql	2001/10/01 23:22:18	1.54
--- postgres_schema.sql	2001/10/11 22:01:11	1.55
***************
*** 449,453 ****
     user_allow_viewonline int2 DEFAULT '1' NOT NULL,
     user_rank int4 DEFAULT '0',
!    user_avatar varchar(100),
     user_level int4 DEFAULT '1',
     user_lang varchar(255),
--- 449,454 ----
     user_allow_viewonline int2 DEFAULT '1' NOT NULL,
     user_rank int4 DEFAULT '0',
!    user_avatar varchar(100), 
!    user_avatar_type int2 DEFAULT '0' NOT NULL, 
     user_level int4 DEFAULT '1',
     user_lang varchar(255),

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

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

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

Modified Files:
	admin_board.php admin_users.php 
Log Message:
Preliminary avatar gallery support

Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** admin_board.php	2001/10/11 12:32:05	1.26
--- admin_board.php	2001/10/11 22:01:11	1.27
***************
*** 154,157 ****
--- 154,158 ----
  	"AVATAR_MAX_WIDTH" => $new['avatar_max_width'],
  	"AVATAR_PATH" => $new['avatar_path'], 
+ 	"AVATAR_GALLERY_PATH" => $new['avatar_gallery_path'], 
  	"SMILIES_PATH" => $new['smilies_path'], 
  	"INBOX_PRIVMSGS" => $new['max_inbox_privmsgs'], 

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** admin_users.php	2001/09/25 18:18:47	1.22
--- admin_users.php	2001/10/11 22:01:11	1.23
***************
*** 35,38 ****
--- 35,40 ----
  include($phpbb_root_path . 'extension.inc');
  include($phpbb_root_path . 'common.'.$phpEx);
+ include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
+ include($phpbb_root_path . 'includes/post.'.$phpEx);
  
  
***************
*** 139,181 ****
  	// Let's find out a little about them...
  	//
! 	$userdata = get_userdata_from_id($HTTP_GET_VARS[POST_USERS_URL]);
  
  	//
  	// Now parse and display it as a template
  	//
! 	$user_id = $userdata['user_id'];
! 	$username = $userdata['username'];
! 	$email = $userdata['user_email'];
  	$password = "";
  	$password_confirm = "";
  
! 	$icq = $userdata['user_icq'];
! 	$aim = $userdata['user_aim'];
! 	$msn = $userdata['user_msnm'];
! 	$yim = $userdata['user_yim'];
! 
! 	$website = $userdata['user_website'];
! 	$location = $userdata['user_from'];
! 	$occupation = $userdata['user_occ'];
! 	$interests = $userdata['user_interests'];
! 	$signature = $userdata['user_sig'];
! 
! 	$viewemail = $userdata['user_viewemail'];
! 	$notifypm = $userdata['user_notify_pm'];
! 	$attachsig = $userdata['user_attachsig'];
! 	$allowhtml = $userdata['user_allowhtml'];
! 	$allowbbcode = $userdata['user_allowbbcode'];
! 	$allowsmilies = $userdata['user_allowsmile'];
! 	$allowviewonline = $userdata['user_allow_viewonline'];
! 
! 	$user_avatar = $userdata['user_avatar'];
! 	$user_style = $userdata['user_style'];
! 	$user_lang = $userdata['user_lang'];
! 	$user_timezone = $userdata['user_timezone'];
! 	$user_dateformat = $userdata['user_dateformat'];
! 	
! 	$user_status = $userdata['user_active'];
! 	$user_allowavatar = $userdata['user_allowavatar'];
! 	$user_allowpm = $userdata['user_allow_pm'];
  	
  	$COPPA = false;
--- 141,184 ----
  	// Let's find out a little about them...
  	//
! 	$this_userdata = get_userdata_from_id($HTTP_GET_VARS[POST_USERS_URL]);
  
  	//
  	// Now parse and display it as a template
  	//
! 	$user_id = $this_userdata['user_id'];
! 	$username = $this_userdata['username'];
! 	$email = $this_userdata['user_email'];
  	$password = "";
  	$password_confirm = "";
  
! 	$icq = $this_userdata['user_icq'];
! 	$aim = $this_userdata['user_aim'];
! 	$msn = $this_userdata['user_msnm'];
! 	$yim = $this_userdata['user_yim'];
! 
! 	$website = $this_userdata['user_website'];
! 	$location = $this_userdata['user_from'];
! 	$occupation = $this_userdata['user_occ'];
! 	$interests = $this_userdata['user_interests'];
! 	$signature = $this_userdata['user_sig'];
! 
! 	$viewemail = $this_userdata['user_viewemail'];
! 	$notifypm = $this_userdata['user_notify_pm'];
! 	$attachsig = $this_userdata['user_attachsig'];
! 	$allowhtml = $this_userdata['user_allowhtml'];
! 	$allowbbcode = $this_userdata['user_allowbbcode'];
! 	$allowsmilies = $this_userdata['user_allowsmile'];
! 	$allowviewonline = $this_userdata['user_allow_viewonline'];
! 
! 	$user_avatar = $this_userdata['user_avatar'];
! 	$user_avatar_type = $this_userdata['user_avatar_type'];
! 	$user_style = $this_userdata['user_style'];
! 	$user_lang = $this_userdata['user_lang'];
! 	$user_timezone = $this_userdata['user_timezone'];
! 	$user_dateformat = $this_userdata['user_dateformat'];
! 	
! 	$user_status = $this_userdata['user_active'];
! 	$user_allowavatar = $this_userdata['user_allowavatar'];
! 	$user_allowpm = $this_userdata['user_allow_pm'];
  	
  	$COPPA = false;
***************
*** 186,195 ****
  
  	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
! 	$s_hidden_fields .= '<input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" />';
  	
! 	if( $user_avatar != "" )
  	{
! 		$avatar = (strstr($user_avatar, 'http') && $board_config['allow_avatar_remote']) ? "<br /><img src=\"" . $user_avatar . "\"><br />" : "<br /><img src=\"../" . $board_config['avatar_path'] . "/" . $user_avatar . "\" alt=\"\" /><br />";
! 		$s_hidden_fields .= '<input type="hidden" name="user_avatar" value="' . $user_avatar . '" />';
  	}
  	else
--- 189,208 ----
  
  	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
! 	$s_hidden_fields .= '<input type="hidden" name="user_id" value="' . $this_userdata['user_id'] . '" />';
  	
! 	if( $user_avatar_type )
  	{
! 		switch( $user_avatar_type )
! 		{
! 			case USER_AVATAR_UPLOAD:
! 				$avatar = "<img src=\"" . $board_config['avatar_path'] . "/" . $user_avatar . "\" alt=\"\" />";
! 				break;
! 			case USER_AVATAR_REMOTE:
! 				$avatar = "<img src=\"$user_avatar\" alt=\"\" />";
! 				break;
! 			case USER_AVATAR_GALLERY:
! 				$avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $user_avatar . "\" alt=\"\" />";
! 				break;
! 		}
  	}
  	else
***************
*** 198,201 ****
--- 211,216 ----
  	}
  
+ 	$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
+ 
  	$template->set_filenames(array(
  		"body" => "admin/user_edit_body.tpl")
***************
*** 334,358 ****
  	validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
  
! 	$viewemail = (isset($HTTP_POST_VARS['viewemail'])) ? $HTTP_POST_VARS['viewemail'] : 0;
  	$allowviewonline = (isset($HTTP_POST_VARS['hideonline'])) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : 1 ) : 1;
! 	$notifypm = (isset($HTTP_POST_VARS['notifypm'])) ? $HTTP_POST_VARS['notifypm'] : 1;
! 	$attachsig = (isset($HTTP_POST_VARS['attachsig'])) ? $HTTP_POST_VARS['attachsig'] : 0;
  
! 	$allowhtml = (isset($HTTP_POST_VARS['allowhtml'])) ? $HTTP_POST_VARS['allowhtml'] : $board_config['allow_html'];
! 	$allowbbcode = (isset($HTTP_POST_VARS['allowbbcode'])) ? $HTTP_POST_VARS['allowbbcode'] : $board_config['allow_bbcode'];
! 	$allowsmilies = (isset($HTTP_POST_VARS['allowsmilies'])) ? $HTTP_POST_VARS['allowsmilies'] : $board_config['allow_smilies'];
  
! 	$user_style = ($HTTP_POST_VARS['style']) ? $HTTP_POST_VARS['style'] : $board_config['default_style'];
  	$user_lang = ($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
! 	$user_timezone = (isset($HTTP_POST_VARS['timezone'])) ? $HTTP_POST_VARS['timezone'] : $board_config['board_timezone'];
  	$user_template = ($HTTP_POST_VARS['template']) ? $HTTP_POST_VARS['template'] : $board_config['board_template'];
  	$user_dateformat = ($HTTP_POST_VARS['dateformat']) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
  
! 	$user_avatar = ( isset($HTTP_POST_VARS['user_avatar']) ) ? $HTTP_POST_VARS['user_avatar'] : "";
  
- 	$user_status = (!empty($HTTP_POST_VARS['user_status'])) ? $HTTP_POST_VARS['user_status'] : 0;
- 	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? $HTTP_POST_VARS['usr_allowpm'] : 0;
- 	$user_allowavatar = (!empty($HTTP_POST_VARS['usr_allowavatar'])) ? $HTTP_POST_VARS['user_allowavatar'] : 0;
- 
  	if(isset($HTTP_POST_VARS['submit']))
  	{
--- 349,371 ----
  	validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
  
! 	$viewemail = (isset($HTTP_POST_VARS['viewemail'])) ? intval($HTTP_POST_VARS['viewemail']) : 0;
  	$allowviewonline = (isset($HTTP_POST_VARS['hideonline'])) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : 1 ) : 1;
! 	$notifypm = (isset($HTTP_POST_VARS['notifypm'])) ? intval($HTTP_POST_VARS['notifypm']) : 1;
! 	$attachsig = (isset($HTTP_POST_VARS['attachsig'])) ? intval($HTTP_POST_VARS['attachsig']) : 0;
  
! 	$allowhtml = (isset($HTTP_POST_VARS['allowhtml'])) ? intval($HTTP_POST_VARS['allowhtml']) : $board_config['allow_html'];
! 	$allowbbcode = (isset($HTTP_POST_VARS['allowbbcode'])) ? intval($HTTP_POST_VARS['allowbbcode']) : $board_config['allow_bbcode'];
! 	$allowsmilies = (isset($HTTP_POST_VARS['allowsmilies'])) ? intval($HTTP_POST_VARS['allowsmilies']) : $board_config['allow_smilies'];
  
! 	$user_style = ($HTTP_POST_VARS['style']) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
  	$user_lang = ($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
! 	$user_timezone = (isset($HTTP_POST_VARS['timezone'])) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
  	$user_template = ($HTTP_POST_VARS['template']) ? $HTTP_POST_VARS['template'] : $board_config['board_template'];
  	$user_dateformat = ($HTTP_POST_VARS['dateformat']) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
  
! 	$user_status = (!empty($HTTP_POST_VARS['user_status'])) ? intval($HTTP_POST_VARS['user_status']) : 0;
! 	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
! 	$user_allowavatar = (!empty($HTTP_POST_VARS['usr_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
  
  	if(isset($HTTP_POST_VARS['submit']))
  	{
***************
*** 380,394 ****
  		$error_msg = $lang['Password_mismatch'];
  	}
  
  	if( isset($HTTP_POST_VARS['avatardel']) )
  	{
! 		if( !eregi("http", $user_avatar) )
  		{
! 			if(file_exists("./../" . $board_config['avatar_path'] . "/" . $user_avatar))
  			{
  				@unlink("./../" . $board_config['avatar_path'] . "/" . $user_avatar);
  			}
  		}
! 		$avatar_sql = ", user_avatar = ''";
  	}
  
--- 393,430 ----
  		$error_msg = $lang['Password_mismatch'];
  	}
+ 	else if(!$password && $password_confirm)
+ 	{
+ 		$error = TRUE;
+ 		$error_msg = $lang['Password_mismatch'];
+ 	}
+ 
+ 	if( $signature != "" )
+ 	{
+ 		if( strlen($signature) > $board_config['max_sig_chars'] )
+ 		{
+ 			$error = TRUE;
+ 			if(isset($error_msg))
+ 			{
+ 				$error_msg .= "<br />";
+ 			}
+ 			$error_msg .= $lang['Signature_too_long'];
+ 		}
+ 		else
+ 		{
+ 			$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
+ 			$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
+ 		}
+ 	}
  
  	if( isset($HTTP_POST_VARS['avatardel']) )
  	{
! 		if( $user_avatar_type == USER_AVATAR_UPLOAD )
  		{
! 			if( file_exists("./../" . $board_config['avatar_path'] . "/" . $user_avatar) )
  			{
  				@unlink("./../" . $board_config['avatar_path'] . "/" . $user_avatar);
  			}
  		}
! 		$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
  	}
  
***************
*** 458,463 ****
  		else
  		{
! 			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey'" . $avatar_sql . "
  				WHERE user_id = $user_id";
  			if($result = $db->sql_query($sql))
--- 494,499 ----
  		else
  		{
! 			echo $sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey'" . $avatar_sql . "
  				WHERE user_id = $user_id";
  			if($result = $db->sql_query($sql))

[Phpbb-checkins] CVS: phpBB2 profile.php,1.114,1.115 viewtopic.php,1.117,1.118

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

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

Modified Files:
	profile.php viewtopic.php 
Log Message:
Preliminary avatar gallery support

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** profile.php	2001/10/11 11:05:06	1.114
--- profile.php	2001/10/11 22:01:10	1.115
***************
*** 272,282 ****
  		}
  
! 		if( $profiledata['user_avatar'] != "" && $profiledata['user_id'] != ANONYMOUS )
  		{
! 			$avatar_img = (eregi("http", $profiledata['user_avatar']) && $board_config['allow_avatar_remote']) ? "<img src=\"" . $profiledata['user_avatar'] . "\">" : "<img src=\"" . $board_config['avatar_path'] . "/" . $profiledata['user_avatar'] . "\" alt=\"\" />";;
  		}
  		else
  		{
! 			$avatar_img = "&nbsp;";
  		}
[...1154 lines suppressed...]
+ 			if( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] )
+ 			{
+ 				$template->assign_block_vars("avatarblock", array() );
+ 
+ 				if($board_config['allow_avatar_upload'])
+ 				{
+ 					$template->assign_block_vars("avatarblock.avatarupload", array() );
+ 				}
+ 				if($board_config['allow_avatar_remote'])
+ 				{
+ 					$template->assign_block_vars("avatarblock.avatarremote", array() );
+ 				}
+ 				if($board_config['allow_avatar_local'])
+ 				{
+ 					$template->assign_block_vars("avatarblock.avatargallery", array() );
+ 				}
+ 
+ 			}
  		}
  

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -r1.117 -r1.118
*** viewtopic.php	2001/10/10 23:18:13	1.117
--- viewtopic.php	2001/10/11 22:01:10	1.118
***************
*** 382,386 ****
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, p.*,  pt.post_text, pt.post_subject
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
--- 382,386 ----
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, p.*,  pt.post_text, pt.post_subject
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
***************
*** 666,672 ****
  	$poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
  
! 	if($postrow[$i]['user_avatar'] != "" && $poster_id != ANONYMOUS)
  	{
! 		$poster_avatar = (eregi("http", $postrow[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "<br /><img src=\"" . $postrow[$i]['user_avatar'] . "\"><br />" : "<br /><img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" /><br />";
  	}
  	else
--- 666,683 ----
  	$poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
  
! 	if( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS )
  	{
! 		switch( $postrow[$i]['user_avatar_type'] )
! 		{
! 			case USER_AVATAR_UPLOAD:
! 				$poster_avatar = "<img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
! 				break;
! 			case USER_AVATAR_REMOTE:
! 				$poster_avatar = "<img src=\"" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
! 				break;
! 			case USER_AVATAR_GALLERY:
! 				$poster_avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
! 				break;
! 		}
  	}
  	else

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.1,1.2

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

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

Modified Files:
	lang_main.php 
Log Message:
Preliminary avatar gallery support

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_main.php	2001/10/11 12:14:55	1.1
--- lang_main.php	2001/10/11 22:01:11	1.2
***************
*** 409,412 ****
--- 409,413 ----
  $lang['Profile_info_warn'] = "This information will be publicly viewable";
  $lang['Avatar_panel'] = "Avatar control panel";
+ $lang['Avatar_gallery'] = "Avatar gallery";
  
  $lang['Website'] = "Website";
***************
*** 472,476 ****
  $lang['Avatar_URL'] = "URL of Avatar Image";
  $lang['Select_from_gallery'] = "Select Avatar from gallery";
! $lang['Avatar_gallery'] = "Show gallery";
  
  $lang['Delete_Image'] = "Delete Image";
--- 473,481 ----
  $lang['Avatar_URL'] = "URL of Avatar Image";
  $lang['Select_from_gallery'] = "Select Avatar from gallery";
! $lang['View_avatar_gallery'] = "Show gallery";
! 
! $lang['Select_avatar'] = "Select avatar";
! $lang['Return_profile'] = "Cancel avatar";
! $lang['Select_category'] = "Select category";
  
  $lang['Delete_Image'] = "Delete Image";

[Phpbb-checkins] CVS: phpBB2/develop convert_avatars.php,NONE,1.1

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

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

Added Files:
	convert_avatars.php 
Log Message:
Preliminary avatar gallery support

--- NEW FILE ---
<?php

$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/db.'.$phpEx);


$sql = "ALTER TABLE " . USERS_TABLE . " 
	ADD user_avatar_type TINYINT(4) DEFAULT '0' NOT NULL";
if( !$result = $db->sql_query($sql) )
{
	die("Couldn't alter users table");
}

$sql = "SELECT user_id, user_avatar 
	FROM " . USERS_TABLE;
if( $result = $db->sql_query($sql) )
{
	$rowset = $db->sql_fetchrowset($result);

	for($i = 0; $i < count($rowset); $i++)
	{
		if( ereg("^http", $rowset[$i]['user_avatar']))
		{
			$sql_type = USER_AVATAR_REMOTE;
		}
		else if( $rowset[$i]['user_avatar'] != "" )
		{
			$sql_type = USER_AVATAR_UPLOAD;
		}
		else
		{
			$sql_type = USER_AVATAR_NONE;
		}

		$sql = "UPDATE " . USERS_TABLE . " 
			SET user_avatar_type = $sql_type 
			WHERE user_id = " . $rowset[$i]['user_id'];
		if( !$result = $db->sql_query($sql) )
		{
			die("Couldn't update users table- " . $i);
		}
	}
}

echo "<BR><BR>COMPLETE<BR>";

?>

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

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

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

Modified Files:
	admin_config_body.tpl 
Log Message:
Preliminary avatar gallery support

Index: admin_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/admin_config_body.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** admin_config_body.tpl	2001/10/11 12:32:05	1.6
--- admin_config_body.tpl	2001/10/11 22:01:11	1.7
***************
*** 125,128 ****
--- 125,132 ----
  	</tr>
  	<tr>
+ 		<td class="row1">Avatar Gallery Path <br /><span class="gensmall">Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery</span></td>
+ 		<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_gallery_path" value="{AVATAR_GALLERY_PATH}" /></td>
+ 	</tr>
+ 	<tr>
  		<td class="catSides" colspan="2"><span class="cattitle">Email Settings</span></td>
  	</tr>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver profile_avatar_gallery.tpl,NONE,1.1 profile_add_body.tpl,1.5,1.6

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

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

Modified Files:
	profile_add_body.tpl 
Added Files:
	profile_avatar_gallery.tpl 
Log Message:
Preliminary avatar gallery support

--- NEW FILE ---

<form action="{S_PROFILE_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  <tr> 
	<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
  </tr>
</table>

<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
	<tr> 
	  <th class="thHead" colspan="{S_COLSPAN}" height="25" valign="middle">{L_AVATAR_GALLERY}</th>
	</tr>
	<tr> 
	  <td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_CATEGORY}:&nbsp;<select name="avatarcategory">{S_OPTIONS_CATEGORIES}</select>&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="avatargallery" /></span></td>
	</tr>
	<!-- BEGIN avatar_row -->
	<tr> 
	<!-- BEGIN avatar_column -->
		<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" /></td>
	<!-- END avatar_column -->
	</tr>
	<tr>
	<!-- BEGIN avatar_option_column -->
		<td class="row2" align="center"><input type="radio" name="avatarselect" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
	<!-- END avatar_option_column -->
	</tr>

	<!-- END avatar_row -->
	<tr> 
	  <td class="catBottom" colspan="{S_COLSPAN}" align="center" height="28">{S_HIDDEN_FIELDS} 
		<input type="submit" name="submitavatar" value="{L_SELECT_AVATAR}" class="mainoption" />
		&nbsp;&nbsp; 
		<input type="submit" name="cancelavatar" value="{L_RETURN_PROFILE}" class="liteoption" />
	  </td>
	</tr>
  </table>
</form>

Index: profile_add_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/profile_add_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** profile_add_body.tpl	2001/10/10 17:34:28	1.5
--- profile_add_body.tpl	2001/10/11 22:01:11	1.6
***************
*** 269,275 ****
    </table>
  </form>
- 
- <!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE || $S_ALLOW_AVATAR_LOCAL eq TRUE || $S_ALLOW_AVATAR_REMOTE eq TRUE -->
- <!-- IF $S_ALLOW_AVATAR_LOCAL eq TRUE -->
- <!-- IF $S_ALLOW_AVATAR_REMOTE eq TRUE -->
- <!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE -->
\ No newline at end of file
--- 269,270 ----

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

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

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

Added Files:
	icon_delete.gif 
Log Message:
Delete from viewtopic functionality for template + graphic

--- NEW FILE ---
GIF89a
ˆ
,•
,s£­£¥¸¹¸;"/À³!

[Phpbb-checkins] CVS: phpBB2/templates/subSilver viewtopic_body.tpl,1.5,1.6

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

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

Modified Files:
	viewtopic_body.tpl 
Log Message:
Delete from viewtopic functionality for template + graphic

Index: viewtopic_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewtopic_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** viewtopic_body.tpl	2001/10/06 16:04:36	1.5
--- viewtopic_body.tpl	2001/10/11 20:06:46	1.6
***************
*** 41,45 ****
  			{postrow.POST_SUBJECT}</span></td>
  		  <td nowrap="nowrap" valign="top" align="right">{postrow.IP_IMG} {postrow.QUOTE_IMG} 
! 			{postrow.EDIT_IMG}</td>
  		</tr>
  		<tr> 
--- 41,45 ----
  			{postrow.POST_SUBJECT}</span></td>
  		  <td nowrap="nowrap" valign="top" align="right">{postrow.IP_IMG} {postrow.QUOTE_IMG} 
! 			{postrow.EDIT_IMG} {postrow.DELETE_IMG}</td>
  		</tr>
  		<tr> 

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

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

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

Modified Files:
	admin_board.php 
Log Message:
Added configuration for allowed html tags

Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** admin_board.php	2001/10/01 23:47:19	1.25
--- admin_board.php	2001/10/11 12:32:05	1.26
***************
*** 67,70 ****
--- 67,71 ----
  $lang_select = language_select($new['default_lang'], 'default_lang', "../language");
  $timezone_select = tz_select($new['board_timezone'], 'board_timezone');
+ $html_tags = $new['allow_html_tags'];
  
  $override_user_style_yes = ($new['override_user_style']) ? "checked=\"checked\"" : "";
***************
*** 130,134 ****
  	"GZIP_NO" => $gzip_no,
  	"PRUNE_YES" => $prune_yes,
! 	"PRUNE_NO" => $prune_no,
  	"HTML_YES" => $html_yes,
  	"HTML_NO" => $html_no,
--- 131,136 ----
  	"GZIP_NO" => $gzip_no,
  	"PRUNE_YES" => $prune_yes,
! 	"PRUNE_NO" => $prune_no, 
! 	"HTML_TAGS" => $html_tags, 
  	"HTML_YES" => $html_yes,
  	"HTML_NO" => $html_no,

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

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

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

Modified Files:
	admin_config_body.tpl 
Log Message:
Added configuration for allowed html tags

Index: admin_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/admin_config_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** admin_config_body.tpl	2001/10/09 13:37:48	1.5
--- admin_config_body.tpl	2001/10/11 12:32:05	1.6
***************
*** 68,71 ****
--- 68,75 ----
  	</tr>
  	<tr>
+ 		<td class="row1">Allowed HTML tags<br /><span class="gensmall">Seperate tags with commas</span></td>
+ 		<td class="row2"><input type="text" size="30" maxlength="255" name="allow_html_tags" value="{HTML_TAGS}"></td>
+ 	</tr>
+ 	<tr>
  		<td class="row1">Allow BBCode</td>
  		<td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td>

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

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

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

Modified Files:
	install.php 
Log Message:
Changed paths for language

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** install.php	2001/10/11 05:52:15	1.5
--- install.php	2001/10/11 12:18:37	1.6
***************
*** 161,165 ****
  // Import language file, setup template ...
  //
! include($phpbb_root_path.'language/lang_' . $language . '.'.$phpEx);
  
  $template = new Template($phpbb_root_path . "templates/" . $default_template);
--- 161,165 ----
  // Import language file, setup template ...
  //
! include($phpbb_root_path.'language/lang_' . $language . '/lang_main.'.$phpEx);
  
  $template = new Template($phpbb_root_path . "templates/" . $default_template);
***************
*** 508,510 ****
  	}
  }
! ?>
--- 508,511 ----
  	}
  }
! 
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.72,1.73 emailer.php,1.6,1.7

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

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

Modified Files:
	functions.php emailer.php 
Log Message:
Changed paths for language

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** functions.php	2001/10/06 17:50:28	1.72
--- functions.php	2001/10/11 12:17:15	1.73
***************
*** 269,279 ****
  	}
  
! 	if(file_exists("language/lang_".$board_config['default_lang'].".".$phpEx) )
  	{
! 		include($phpbb_root_path . 'language/lang_'.$board_config['default_lang'].'.'.$phpEx);
  	}
  	else
  	{
! 		include($phpbb_root_path . 'language/lang_english.'.$phpEx);
  	}
  
--- 269,279 ----
  	}
  
! 	if(file_exists("language/lang_".$board_config['default_lang']."/lang_main.".$phpEx) )
  	{
! 		include($phpbb_root_path . 'language/lang_'.$board_config['default_lang'].'/lang_main.'.$phpEx);
  	}
  	else
  	{
! 		include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
  	}
  
***************
*** 334,338 ****
  	for($i = 0; $i < 8; $i++)
  	{
! 		$act_key .= $chars[rand(0,$max_elements)];
  	}
  	$act_key_md = md5($act_key);
--- 334,338 ----
  	for($i = 0; $i < 8; $i++)
  	{
! 		$act_key .= $chars[rand(0, $max_elements)];
  	}
  	$act_key_md = md5($act_key);
***************
*** 710,717 ****
  		{
  			$filename = str_replace("lang_", "", $file);
! 			$filename = str_replace(".$phpEx", "", $filename);
  			$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
  			$selected = (strtolower($default) == strtolower($filename)) ? " selected=\"selected\"" : "";
! 			$lang_select .= "<option value=\"$filename\"$selected>".ucwords($displayname)."</option>";
  		}
  	}
--- 710,718 ----
  		{
  			$filename = str_replace("lang_", "", $file);
! 
  			$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
+ 
  			$selected = (strtolower($default) == strtolower($filename)) ? " selected=\"selected\"" : "";
! 			$lang_select .= "<option value=\"$filename\"$selected>" . ucwords($displayname) . "</option>";
  		}
  	}
***************
*** 1049,1057 ****
  			if( !empty($board_config['default_lang']) )
  			{
! 				include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '.'.$phpEx);
  			}
  			else
  			{
! 				include($phpbb_root_path . 'language/lang_english.'.$phpEx);
  			}
  		}
--- 1050,1058 ----
  			if( !empty($board_config['default_lang']) )
  			{
! 				include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx);
  			}
  			else
  			{
! 				include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
  			}
  		}
***************
*** 1112,1116 ****
  			// available so we're going to dump out a simple echo'd statement
  			//
! 			include($phpbb_root_path . 'language/lang_english.'.$phpEx);
  
  			if($msg_text == "")
--- 1113,1117 ----
  			// available so we're going to dump out a simple echo'd statement
  			//
! 			include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
  
  			if($msg_text == "")

Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** emailer.php	2001/09/25 18:18:47	1.6
--- emailer.php	2001/10/11 12:17:15	1.7
***************
*** 90,94 ****
  
  		$phpbb_root_path = "./";
! 		$template_file = $phpbb_root_path . "language/email/" . $template_file . "_" . $board_config['default_lang'] . ".tpl";
  		if (!file_exists($template_file))
  		{
--- 90,94 ----
  
  		$phpbb_root_path = "./";
! 		$template_file = $phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/email/" . $template_file . ".tpl";
  		if (!file_exists($template_file))
  		{

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

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

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

Modified Files:
	faq.php 
Log Message:
Changed paths for language

Index: faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/faq.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** faq.php	2001/10/05 08:29:32	1.5
--- faq.php	2001/10/11 12:17:15	1.6
***************
*** 35,39 ****
  
  include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! include($phpbb_root_path . 'language/faq_' . $board_config['default_lang'] . '.' . $phpEx);
  
  $template->set_filenames(array(
--- 35,39 ----
  
  include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_faq.' . $phpEx);
  
  $template->set_filenames(array(

[Phpbb-checkins] CVS: phpBB2/language/lang_english/email admin_activate.tpl,NONE,1.1 admin_welcome_activated.tpl,NONE,1.1 admin_welcome_inactive.tpl,NONE,1.1 coppa_welcome_inactive.tpl,NONE,1.1 group_added.tpl,NONE,1.1 group_approved.tpl,NONE,1.1 group_request.tpl,NONE,1.1 privmsg_notify.tpl,NONE,1.1 topic_notify.tpl,NONE,1.1 user_activate_passwd.tpl,NONE,1.1 user_activate.tpl,NONE,1.1 user_welcome_inactive.tpl,NONE,1.1 user_welcome.tpl,NONE,1.1

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

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

Added Files:
	admin_activate.tpl admin_welcome_activated.tpl 
	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_passwd.tpl 
	user_activate.tpl user_welcome_inactive.tpl user_welcome.tpl 
Log Message:
New directory structure

--- NEW FILE ---
Hello,

The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and activate it using the following link:

{U_ACTIVATE}

{EMAIL_SIG}
--- NEW FILE ---
Hello {USERNAME},

Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous email.

{EMAIL_SIG}
--- NEW FILE ---
{WELCOME_MSG}

Please keep this email for your records. Your account information is as follows:

----------------------------
Username: {USERNAME}
Password: {PASSWORD}
----------------------------

Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another email when this has occured.

Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.

Thank you for registering.

{EMAIL_SIG}
--- NEW FILE ---
{WELCOME_MSG}

In compliance with the COPPA act your account is currently inactive.

Please print this message out and have your parent or guardian sign and date it. Then fax it to:

{FAX_INFO}

OR mail it to:

{MAIL_INFO}

------------------------------ CUT HERE ------------------------------
Permission to Participate at {SITENAME}

Username: {USERNAME}
Password: {PASSWORD}
Email: {EMAIL_ADDRESS}

ICQ Number: {ICQ}
AIM Address: {AIM}
MSN Messenger: {MSN}
Yahoo Messenger: {YIM}
Web Site: {WEB_SITE}
From: {FROM}
Occupation: {OCC}
Interests: {INTERESTS}

I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION. 
I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
I UNDERSTAND THAT MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.


Parent or Guardian 
(print your name here): _____________________

(sign here): __________________ 

Date: _______________

------------------------------ CUT HERE ------------------------------


Once the administrator has recived the above form via fax or regular mail your account will be activated.

Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.

Thank you for registering.

{EMAIL_SIG}
--- NEW FILE ---
Congratulations,

You have been added to the "{GROUP_NAME}" group on {SITENAME}.
This action was done by the group moderator or the site administrator, contact them for more information.

You can view your groups information here:
{U_GROUPCP}

{EMAIL_SIG}

--- NEW FILE ---
Congratulations,

Your request to join the "{GROUP_NAME}" group on {SITENAME} has been approved.
Click on the following link to see your group membership.

{U_GROUPCP}

{EMAIL_SIG}

--- NEW FILE ---
Dear {GROUP_MODERATOR},

A user has requested to join a group you moderator on {SITENAME}.
To approve to deny this request for group membership please visit the following link:

{U_GROUPCP}

{EMAIL_SIG}

--- NEW FILE ---
Hello {USERNAME},

You have received a new private message to your account on "{SITENAME}" and you have requested that you be notified on this event. You can view your new message by clicking on the following link:

{U_INBOX}

Remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.

{EMAIL_SIG}
--- NEW FILE ---
Hello {USERNAME},

You are receiving this email because you are watching the topic, "{TOPIC_TITLE}" at {SITENAME}. This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.

{U_TOPIC}

If you no longer wish to watch this topic you can either click the "Stop watching this topic link" found at the bottom of the topic above, or by clicking the following link:

{U_STOP_WATCHING_TOPIC}

{EMAIL_SIG}
--- NEW FILE ---
Hello {USERNAME}

You are receiving this email because you have (or someone pretending to be you has) requested a new password be sent for your account on {SITENAME}. If you did not request this email then please ignore it, if you keep receiving it please contact the board administrator.

To use the new password you need to activate it. To do this click the link provided below.

{U_ACTIVATE}

If sucessful you will be able to login using the following password:

Password: {PASSWORD}

You can of course change this password yourself via the profile page. If you have any difficulties please contact the board administrator.

{EMAIL_SIG}
--- NEW FILE ---
Hello {USERNAME},

Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:

{U_ACTIVATE}

{EMAIL_SIG}
--- NEW FILE ---
{WELCOME_MSG}

Please keep this email for your records. Your account information is as follows:

----------------------------
Username: {USERNAME}
Password: {PASSWORD}
----------------------------

Your account is currently inactive. You cannot use it until you visit the following link:

{U_ACTIVATE}

Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.

Thank you for registering.

{EMAIL_SIG}
--- NEW FILE ---
{WELCOME_MSG}

Please keep this email for your records. Your account information is as follows:

----------------------------
Username: {USERNAME}
Password: {PASSWORD}
----------------------------

Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.

Thank you for registering.

{EMAIL_SIG}

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_faq.php,NONE,1.1 lang_main.php,NONE,1.1

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

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

Added Files:
	lang_faq.php lang_main.php 
Log Message:
New directory structure

--- NEW FILE ---
<?php
/***************************************************************************
 *                                  faq-english.php
 *                            -------------------
 *   begin                : Wednesday Oct 3, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : su...@ph...
 *
 *   $Id: lang_faq.php,v 1.1 2001/10/11 12:14:55 psotfx Exp $
 *
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/
 
 // 
 // To add an entry to your FAQ simply add a line to this file in this format:
 // $faq[] = array("question", "answer");
 // DO NOT forget the ; at the end of the line.
 // Do not put double quotes (") in your FAQ entries, or if you do escape them ie: \"something\"
 //
 // The FAQ items will appear on the FAQ page in the same order they are listed in this file
 //
 
  
 $faq[] = array("Why do email addresses look like 'name at domain.com'?", "They look this way in order to reduce the possibility of email address gathering programs from finding your email address. These 'bots' look for email addresses in web pages and store them where they are often used to send you spam email. In order to send email to someone you will need to remove the ' at ' in the address and replace it with usual '@'");
 $faq[] = array("Why do I get logged off automatically?", "If you do not check the 'Log me in automatically' box when you login the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in check the box during login, this is not recommended if you access the board from a shared computer, eg. library, internet cafe, university cluster, etc.");
 $faq[] = array("Why can't I upload an avatar image?", "An avatar is a small image generally unique to a user displayed next to their posts. It is up to the board administrator to enable avatars (and the way in which avatars can be set). If you are unable to use avatars then this is the decision of the board admin, you should ask them their reasons (we're sure they'll be good!)");
 $faq[] = array("Why am I showing up more than once in the online listing?", "You shouldn't! phpBB 2.0 includes controls to prevent a user being logged in twice from different machines. However, if the connection between your machine and the system serving this board is interrupted mid-transmission it may possibly corrupt the cookie data used to identify you. In this case the session management code will interpret you as a 'returning user' (if you checked the automatic login box) and create a new session. If you suspect this is not the problem you should contact the board administrator as soon as possible.");
 $faq[] = array("Why can't I login?", "Have you registered?! Seriously, you must register in order to login. Have you been banned from the board (a message will be displayed if you have)? If so then you should contact the webmaster or board administrator to find out why. If you have registered and are not banned and you still cannot login then check and double check your username and password. Usually this is the problem, if not then contact the board administrator they may have incorrect configuration settings for the board.");
 $faq[] = array("I keep getting unwanted private messages!", "In the future we will be adding an ignore list to the private messaging system. For now though if you keep receiving unwanted private messages from someone inform the board admin, they have the power to prevent a user from sending private messages at all.");
 $faq[] = array("How do I become a usergroup moderator?", "Usergroups are initially created by the board admin, they also assign a board moderator. If you are interested in creating a usergroup then your first point of contact should be the admin.");
 $faq[] = array("How do I join a usergroup?", "To join a usergroup click the usergroup link on the page header (dependent on template design), you can then view all usergroups and request to join one. The board administrator will need to approve your request, they may ask why you want to join the group. Please don't pester a group moderator if they turn your request down, they'll have their reasons.");
 $faq[] = array("Why can't I access X forum?", "Some groups may be limited to certain users or groups. To view, read, post, etc. you may need special authorisation, only the forum moderator and board admin can grant this access, you should contact them.");
 $faq[] = array("How do I prevent my username appearing in the online user listings?", "In your profile you will find an option 'Hide your online status', if you switch this 'on' you'll only appear to board admins.");
 ?>
 
--- NEW FILE ---
<?php
/***************************************************************************
 *                               lang_english.php
 *                              -------------------
 *     begin                : Sat Dec 16 2000
 *     copyright            : (C) 2001 The phpBB Group
 *     email                : su...@ph...
 *
 *     $Id: lang_main.php,v 1.1 2001/10/11 12:14:55 psotfx Exp $
 *
 ****************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
[...970 lines suppressed...]
$lang['Default_lang'] = "Default board language";
$lang['DB_Host'] = "Database Server Hostname";
$lang['DB_Name'] = "Your Database Name";
$lang['Database'] = "Your Database";
$lang['Install_lang'] = "Choose Language for Installation";
$lang['dbms'] = "Database Type";
$lang['Inst_Step_1'] = "Your database tables have been created and filled with some basic default data.  Please enter your chosen phpBB Admin Username and Password.";
$lang['Create_User'] = "Create User";
$lang['Inst_Step_2'] = "Your admin username has been created.  At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.";
$lang['Finish_Install'] = "Finish Installation";
$lang['Install_db_error'] = "An error occured trying to update the database";
$lang['ODBC_Instructs'] = "Someone please write some odbc instructions in the \$lang['ODBC_Instructs'] variable!";
$lang['Table_Prefix'] = "Prefix for tables in database";
$lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
$lang['Download_config'] = "Download Config";
//
// End
// -------------------------------------------------

?>

[Phpbb-checkins] CVS: phpBB2/language/lang_english/email - New directory

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

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

Log Message:
Directory /cvsroot/phpbb/phpBB2/language/lang_english/email added to the repository

[Phpbb-checkins] CVS: phpBB2/language/lang_english - New directory

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

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

Log Message:
Directory /cvsroot/phpbb/phpBB2/language/lang_english added to the repository

[Phpbb-checkins] CVS: phpBB2/language/email admin_activate_english.tpl,1.1,NONE admin_welcome_activated_english.tpl,1.2,NONE admin_welcome_inactive_english.tpl,1.1,NONE coppa_welcome_inactive_english.tpl,1.1,NONE group_added_english.tpl,1.1,NONE group_approved_english.tpl,1.2,NONE group_request_english.tpl,1.2,NONE privmsg_notify_english.tpl,1.4,NONE topic_notify_english.tpl,1.3,NONE user_activate_english.tpl,1.1,NONE user_activate_passwd_english.tpl,1.1,NONE user_welcome_english.tpl,1.1,NONE user_welcome_inactive_english.tpl,1.1,NONE

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

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

Removed Files:
	admin_activate_english.tpl admin_welcome_activated_english.tpl 
	admin_welcome_inactive_english.tpl 
	coppa_welcome_inactive_english.tpl group_added_english.tpl 
	group_approved_english.tpl group_request_english.tpl 
	privmsg_notify_english.tpl topic_notify_english.tpl 
	user_activate_english.tpl user_activate_passwd_english.tpl 
	user_welcome_english.tpl user_welcome_inactive_english.tpl 
Log Message:
Moved into its very own directory

--- admin_activate_english.tpl DELETED ---

--- admin_welcome_activated_english.tpl DELETED ---

--- admin_welcome_inactive_english.tpl DELETED ---

--- coppa_welcome_inactive_english.tpl DELETED ---

--- group_added_english.tpl DELETED ---

--- group_approved_english.tpl DELETED ---

--- group_request_english.tpl DELETED ---

--- privmsg_notify_english.tpl DELETED ---

--- topic_notify_english.tpl DELETED ---

--- user_activate_english.tpl DELETED ---

--- user_activate_passwd_english.tpl DELETED ---

--- user_welcome_english.tpl DELETED ---

--- user_welcome_inactive_english.tpl DELETED ---

[Phpbb-checkins] CVS: phpBB2/language faq_english.php,1.1,NONE lang_english.php,1.157,NONE

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

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

Removed Files:
	faq_english.php lang_english.php 
Log Message:
Moved into its very own directory

--- faq_english.php DELETED ---

--- lang_english.php DELETED ---