phpbb-checkins Mailing List for phpBB (Page 570)

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

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

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

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 568 569 570 571 572 .. 629 > >> (Page 570 of 629)

[Phpbb-checkins] CVS: phpBB2 common.php,1.69,1.70

From: Bart v. B. <ba...@us...> - 2002-02-18 07:35:22

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

Modified Files:
	common.php 
Log Message:
Fixed some problems with last checkin ( for Email links etc)

Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** common.php	17 Feb 2002 17:02:03 -0000	1.69
--- common.php	18 Feb 2002 07:35:18 -0000	1.70
***************
*** 156,186 ****
  // Set some server variables related to the current URL, mostly used for Email
  //
! if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
  {
! 	$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
  }
! else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
  {
! 	$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
  }
! else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
  {
! 	$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
  }
  
- $server_name = $board_config['server_name'];
  $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
  
! if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
  {
! 	$server_protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
  }
! else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
  {
! 	$server_protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
  }
! else
  {
! 	$server_protocol = "http://";
  }
  
--- 156,206 ----
  // Set some server variables related to the current URL, mostly used for Email
  //
! if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
  {
! 	$server_protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
  }
! else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
  {
! 	$server_protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
  }
! else
  {
! 	$server_protocol = "http://";
! }
! 
! if ( !empty($board_config['server_name']) )
! {
! 	$server_name = $board_config['server_name'];
! }
! else if ( !empty($board_config['cookie_domain']) )
! {
! 	$server_name = $board_config['cookie_domain'];
! }
! else if( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
! {
! 	$server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
! }
! else if( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
! {
! 	$server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
! }
! else
! {
! 	$server_name = "";
  }
  
  $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
  
! if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
  {
! 	$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
  }
! else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
  {
! 	$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
  }
! else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
  {
! 	$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
  }

[Phpbb-checkins] CVS: phpBB2/language/lang_dutch lang_admin.php,1.3,1.4

From: Bart v. B. <ba...@us...> - 2002-02-17 22:38:03

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

Modified Files:
	lang_admin.php 
Log Message:
Missed SMTP user/pass in Dutch admin file

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/lang_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** lang_admin.php	15 Feb 2002 15:00:05 -0000	1.3
--- lang_admin.php	17 Feb 2002 22:18:40 -0000	1.4
***************
*** 243,246 ****
--- 243,247 ----
  $lang['Server_port_explain'] = "De poort waarop de HTTP server draait, normaal 80.";
  $lang['Site_name'] = "Site naam";
+ $lang['Site_name_explain'] = "No html tags allowed!";
  $lang['Site_desc'] = "Site omschrijving";
  $lang['Board_disable'] = "Board uitschakelen";
***************
*** 306,309 ****
--- 307,315 ----
  $lang['Use_SMTP_explain'] = "Vul 'yes' in als de email via een benoemde server wilt of moet versturen in plaats van de 'local mail' functie";
  $lang['SMTP_server'] = "SMTP Server Adres";
+ $lang['SMTP_username'] = "SMTP Gebruikersnaam";
+ $lang['SMTP_username_explain'] = "Vul alleen een gebruikersnaam in als dit nodig is";
+ $lang['SMTP_password'] = "SMTP Wachtwoord";
+ $lang['SMTP_password_explain'] = "Vul alleen een wachtwoord in als dit nodig is";
+ 
  
  $lang['Disable_privmsg'] = "Prive Berichten";

[Phpbb-checkins] CVS: phpBB2/includes post.php,1.14,1.15

From: Bart v. B. <ba...@us...> - 2002-02-17 17:25:35

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

Modified Files:
	post.php 
Log Message:
Some updates on the smiley display code, also fixed :\ smileys (#518428)

Index: post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/post.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** post.php	9 Feb 2002 15:54:40 -0000	1.14
--- post.php	17 Feb 2002 17:25:31 -0000	1.15
***************
*** 108,111 ****
--- 108,116 ----
  	global $userdata;
  
+ 	$inline_columns = 4;
+ 	$inline_rows = 6;
+ 
+ 	$window_columns = 8;
+ 
  	if( $mode == "window" )
  	{
***************
*** 130,147 ****
  		if( $db->sql_numrows($result) )
  		{
  			$rowset = array();
  			while( $row = $db->sql_fetchrow($result) )
  			{
  				if( empty($rowset[$row['smile_url']]) )
  				{
! 					$rowset[$row['smile_url']]['code'] = $row['code'];
  					$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
  				}
  			}
  
- 			$num_smilies = count($rowset);
- 
  			$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
! 			$smilies_split_row = ( $mode == "inline" ) ? 3 : 7;
  
  			$s_colspan = 0;
--- 135,153 ----
  		if( $db->sql_numrows($result) )
  		{
+ 			$num_smilies = 0;
  			$rowset = array();
  			while( $row = $db->sql_fetchrow($result) )
  			{
+ 				// If this is the first time that we encounter this smiley:
  				if( empty($rowset[$row['smile_url']]) )
  				{
! 					$rowset[$row['smile_url']]['code'] = str_replace("\\", "\\\\", str_replace("'", "\\'", $row['code']));
  					$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
+ 					$num_smilies++;
  				}
  			}
  
  			$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
! 			$smilies_split_row = ( $mode == "inline" ) ? $inline_columns - 1 : $window_columns - 1;
  
  			$s_colspan = 0;
***************
*** 166,170 ****
  				if( $col == $smilies_split_row )
  				{
! 					if( $mode == "inline" && $row == 4 )
  					{
  						break;
--- 172,176 ----
  				if( $col == $smilies_split_row )
  				{
! 					if( $mode == "inline" && $row == $inline_rows - 1 )
  					{
  						break;
***************
*** 179,183 ****
  			}
  
! 			if( $mode == "inline" && $num_smilies > 20)
  			{
  				$template->assign_block_vars("switch_smilies_extra", array());
--- 185,189 ----
  			}
  
! 			if( $mode == "inline" && $num_smilies > $inline_columns * $inline_rows)
  			{
  				$template->assign_block_vars("switch_smilies_extra", array());

[Phpbb-checkins] CVS: phpBB2 common.php,1.68,1.69 groupcp.php,1.44,1.45 posting.php,1.143,1.144 privmsg.php,1.80,1.81 profile.php,1.178,1.179

From: Bart v. B. <ba...@us...> - 2002-02-17 17:02:06

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

Modified Files:
	common.php groupcp.php posting.php privmsg.php profile.php 
Log Message:
Cleaned up  stuff (for Email)

Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** common.php	14 Dec 2001 02:41:33 -0000	1.68
--- common.php	17 Feb 2002 17:02:03 -0000	1.69
***************
*** 154,157 ****
--- 154,192 ----
  
  //
+ // Set some server variables related to the current URL, mostly used for Email
+ //
+ if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
+ {
+ 	$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
+ }
+ else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
+ {
+ 	$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
+ }
+ else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
+ {
+ 	$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
+ }
+ 
+ $server_name = $board_config['server_name'];
+ $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
+ 
+ if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
+ {
+ 	$server_protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
+ }
+ else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
+ {
+ 	$server_protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
+ }
+ else
+ {
+ 	$server_protocol = "http://";
+ }
+ 
+ $script_url = $server_protocol . $server_name . $server_port . $script_name;
+ 
+ 
+ //
  // Setup forum wide options, if this fails
  // then we output a CRITICAL_ERROR since
***************
*** 177,179 ****
  }
  
! ?>
\ No newline at end of file
--- 212,214 ----
  }
  
! ?>

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** groupcp.php	17 Feb 2002 16:42:06 -0000	1.44
--- groupcp.php	17 Feb 2002 17:02:03 -0000	1.45
***************
*** 59,72 ****
  
  //
- // Set default email variables
- //
- $script_name = preg_replace("/^(\/)(.*?)(\/)$/", "\\2", $board_config['script_path']) . '/groupcp.'.$phpEx;
- $server_name = $board_config['server_name'];
- $server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://";
- $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
- 
- $server_url = $server_protocol . $server_name . $server_port . $script_name;
- 
- //
  // Default var values
  //
--- 59,62 ----
***************
*** 208,212 ****
  		"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 		"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
  	$emailer->send();
--- 198,202 ----
  		"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 		"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
  	$emailer->send();
***************
*** 414,418 ****
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 					"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id")
  				);
  				$emailer->send();
--- 404,408 ----
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 					"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id")
  				);
  				$emailer->send();
***************
*** 520,524 ****
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id")
  					);
  					$emailer->send();
--- 510,514 ----
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id")
  					);
  					$emailer->send();

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -r1.143 -r1.144
*** posting.php	2 Feb 2002 18:03:44 -0000	1.143
--- posting.php	17 Feb 2002 17:02:03 -0000	1.144
***************
*** 975,1022 ****
  									$emailer = new emailer($board_config['smtp_delivery']);
  
- 									if( isset($HTTP_SERVER_VARS['PHP_SELF']) || isset($HTTP_ENV_VARS['PHP_SELF']) )
- 									{
- 										$script_name = ( isset($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
- 									}
- 									else if( isset($HTTP_SERVER_VARS['SCRIPT_NAME']) || isset($HTTP_ENV_VARS['SCRIPT_NAME']) )
- 									{
- 										$script_name = ( isset($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
- 									}
- 									else if( isset($HTTP_SERVER_VARS['PATH_INFO']) || isset($HTTP_ENV_VARS['PATH_INFO']) )
- 									{
- 										$script_name = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
- 									}
- 									else
- 									{
- 										$script_name = "viewtopic.$phpEx";
- 									}
- 									$script_name = str_replace("posting.$phpEx", "viewtopic.$phpEx", $script_name);
- 
- 									if( isset($HTTP_SERVER_VARS['SERVER_NAME']) || isset($HTTP_ENV_VARS['SERVER_NAME']) )
- 									{
- 										$server_name = ( isset($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
- 									}
- 									else if( isset($HTTP_SERVER_VARS['HTTP_HOST']) || isset($HTTP_ENV_VARS['HTTP_HOST']) )
- 									{
- 										$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
- 									}
- 									else
- 									{
- 										$server_name = "";
- 									}
- 
- 									if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
- 									{
- 										$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
- 									}
- 									else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
- 									{
- 										$protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
- 									}
- 									else
- 									{
- 										$protocol = "http://";
- 									}
- 
  									$orig_word = array();
  									$replacement_word = array();
--- 975,978 ----
***************
*** 1046,1051 ****
  												"TOPIC_TITLE" => $topic_title,
  
! 												"U_TOPIC" => $protocol . $server_name . $script_name . "?" . POST_POST_URL . "=$new_post_id#$new_post_id",
! 												"U_STOP_WATCHING_TOPIC" => $protocol . $server_name . $script_name . "?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
  											);
  
--- 1002,1007 ----
  												"TOPIC_TITLE" => $topic_title,
  
! 												"U_TOPIC" => $script_url . "?" . POST_POST_URL . "=$new_post_id#$new_post_id",
! 												"U_STOP_WATCHING_TOPIC" => $script_url . "?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
  											);
  

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** privmsg.php	13 Feb 2002 01:42:38 -0000	1.80
--- privmsg.php	17 Feb 2002 17:02:03 -0000	1.81
***************
*** 1083,1133 ****
  				if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) )
  				{
- 					if( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
- 					{
- 						$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
- 					}
- 					else if( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
- 					{
- 						$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
- 					}
- 					else if( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
- 					{
- 						$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
- 					}
- 					else
- 					{
- 						$script_name = "privmsg.$phpEx";
- 					}
- 
- 					if ( !empty($board_config['cookie_domain']) )
- 					{
- 						$server_name = $board_config['cookie_domain'];
- 					}
- 					else if( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
- 					{
- 						$server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
- 					}
- 					else if( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
- 					{
- 						$server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
- 					}
- 					else
- 					{
- 						$server_name = "";
- 					}
- 
- 					if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
- 					{
- 						$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
- 					}
- 					else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
- 					{
- 						$protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
- 					}
- 					else
- 					{
- 						$protocol = "http://";
- 					}
- 
  					$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
--- 1083,1086 ----
***************
*** 1148,1152 ****
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_INBOX" => $protocol . $server_name . $script_name . "?folder=inbox")
  					);
  
--- 1101,1105 ----
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_INBOX" => $script_url . "?folder=inbox")
  					);
  

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -r1.178 -r1.179
*** profile.php	13 Feb 2002 01:11:57 -0000	1.178
--- profile.php	17 Feb 2002 17:02:03 -0000	1.179
***************
*** 36,89 ****
  //
  
- //
- // Set default email variables
- //
- if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
- {
- 	$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
- }
- else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
- {
- 	$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
- }
- else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
- {
- 	$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
- }
- else
- {
- 	$script_name = "profile.$phpEx";
- }
- 
- if ( !empty($board_config['cookie_domain']) )
- {
- 	$server_name = $board_config['cookie_domain'];
- }
- else if ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
- {
- 	$server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
- }
- else if ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
- {
- 	$server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
- }
- else
- {
- 	$server_name = "";
- }
- 
- if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
- {
- 	$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
- }
- else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
- {
- 	$protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
- }
- else
- {
- 	$protocol = "http://";
- }
- 
  // -----------------------
  // Page specific functions
--- 36,39 ----
***************
*** 1116,1120 ****
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
  							);
  							$emailer->send();
--- 1066,1070 ----
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
  							);
  							$emailer->send();
***************
*** 1214,1218 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey",
  										"FAX_INFO" => $board_config['coppa_fax'],
  										"MAIL_INFO" => $board_config['coppa_mail'],
--- 1164,1168 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey",
  										"FAX_INFO" => $board_config['coppa_fax'],
  										"MAIL_INFO" => $board_config['coppa_mail'],
***************
*** 1236,1240 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  	
! 										"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
  									);
  								}
--- 1186,1190 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  	
! 										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
  									);
  								}
***************
*** 1255,1259 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
  									);
  									$emailer->send();
--- 1205,1209 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
  									);
  									$emailer->send();
***************
*** 1769,1773 ****
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  					
! 					"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
  				);
  				$emailer->send();
--- 1719,1723 ----
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  					
! 					"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
  				);
  				$emailer->send();

[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.43,1.44

From: Bart v. B. <ba...@us...> - 2002-02-17 16:42:11

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

Modified Files:
	groupcp.php 
Log Message:
Fixed malformed URL in Emails

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** groupcp.php	15 Feb 2002 22:13:59 -0000	1.43
--- groupcp.php	17 Feb 2002 16:42:06 -0000	1.44
***************
*** 61,70 ****
  // Set default email variables
  //
! $script_name = preg_replace("/^(\/)(.*?)(\/)$/", "\\2", $board_config['script_path']) . '/profile.'.$phpEx;
  $server_name = $board_config['server_name'];
  $server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://";
  $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
  
! $server_url = $server_protocol . $script_name . $server_name . $server_port;
  
  //
--- 61,70 ----
  // Set default email variables
  //
! $script_name = preg_replace("/^(\/)(.*?)(\/)$/", "\\2", $board_config['script_path']) . '/groupcp.'.$phpEx;
  $server_name = $board_config['server_name'];
  $server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://";
  $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
  
! $server_url = $server_protocol . $server_name . $server_port . $script_name;
  
  //

[Phpbb-checkins] CVS: phpBB2/admin admin_board.php,1.46,1.47

From: Bart v. B. <ba...@us...> - 2002-02-17 16:10:45

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

Modified Files:
	admin_board.php 
Log Message:
Cookie domain string was missing, thanks, Jerry (#516599)

Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** admin_board.php	15 Feb 2002 15:45:07 -0000	1.46
--- admin_board.php	17 Feb 2002 16:10:41 -0000	1.47
***************
*** 153,156 ****
--- 153,157 ----
  	"L_COOKIE_SETTINGS" => $lang['Cookie_settings'], 
  	"L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], 
+ 	"L_COOKIE_DOMAIN" => $lang['Cookie_domain'],
  	"L_COOKIE_NAME" => $lang['Cookie_name'], 
  	"L_COOKIE_PATH" => $lang['Cookie_path'],

[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.31,1.32

From: Bart v. B. <ba...@us...> - 2002-02-17 16:05:22

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

Modified Files:
	bbcode.php 
Log Message:
Fixed #506066, [img] didn't work with multiple instances directly following each other

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** bbcode.php	12 Feb 2002 17:55:52 -0000	1.31
--- bbcode.php	17 Feb 2002 16:05:18 -0000	1.32
***************
*** 278,282 ****
  
  	// [img]image_url_here[/img] code..
! 	$text = preg_replace("#\[img\](([a-z]+?)://([^, \n\r]+))\[/img\]#si", "[img:$uid]\\1[/img:$uid]", $text);
  
  	// Remove our padding from the string..
--- 278,282 ----
  
  	// [img]image_url_here[/img] code..
! 	$text = preg_replace("#\[img\](([a-z]+?)://([^ \n\r]+?))\[/img\]#si", "[img:$uid]\\1[/img:$uid]", $text);
  
  	// Remove our padding from the string..
***************
*** 765,767 ****
  }
  
! ?>
\ No newline at end of file
--- 765,767 ----
  }
  
! ?>

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

From: Bart v. B. <ba...@us...> - 2002-02-17 15:27:14

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

Modified Files:
	posting_preview.tpl 
Log Message:
Fixed #506371, fontchange after quote in NS4.x.

Index: posting_preview.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_preview.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** posting_preview.tpl	8 Jan 2002 18:33:13 -0000	1.4
--- posting_preview.tpl	17 Feb 2002 15:27:11 -0000	1.5
***************
*** 8,12 ****
    </tr>
    <tr> 
! 	<td class="row1"><span class="postbody">{MESSAGE}</span></td>
    </tr>
    <tr> 
--- 8,20 ----
    </tr>
    <tr> 
! 	<td class="row1">
! 		<table width="100%" border="0" cellspacing="0" cellpadding="0">
! 		<tr>
! 			<td>
! 				<span class="postbody">{MESSAGE}</span>
! 			</td>
! 		</tr>
! 		</table>
! 	</td>
    </tr>
    <tr>

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

From: Bart v. B. <ba...@us...> - 2002-02-16 22:27:38

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

Added Files:
	icon_frown.gif 
Log Message:
Fixed #502588, missing smiley after conversion of 1.x board

--- NEW FILE ---
GIF89a
U&¸Ý³LÅ@73,m

[Phpbb-checkins] CVS: phpBB2/includes constants.php,1.43,1.44

From: Paul S. O. <ps...@us...> - 2002-02-16 20:35:40

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

Modified Files:
	constants.php 
Log Message:
Further privmsg constant

Index: constants.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/constants.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** constants.php	25 Jan 2002 00:39:16 -0000	1.43
--- constants.php	16 Feb 2002 20:35:36 -0000	1.44
***************
*** 90,93 ****
--- 90,94 ----
  define('PRIVMSGS_SAVED_IN_MAIL', 3);
  define('PRIVMSGS_SAVED_OUT_MAIL', 4);
+ define('PRIVMSGS_UNREAD_MAIL', 5);

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.21,1.22

From: Paul S. O. <ps...@us...> - 2002-02-16 20:34:27

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

Modified Files:
	admin_styles.php 
Log Message:
Fixed error preventing drop down displaying

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** admin_styles.php	13 Feb 2002 21:56:31 -0000	1.21
--- admin_styles.php	16 Feb 2002 20:34:23 -0000	1.22
***************
*** 42,46 ****
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
  
! if( !$HTTP_POST_VARS['send_file'] )
  {
  	$no_page_header = ( $cancel ) ? TRUE : FALSE;
--- 42,46 ----
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
  
! if( empty($HTTP_POST_VARS['send_file']) )
  {
  	$no_page_header = ( $cancel ) ? TRUE : FALSE;
***************
*** 799,803 ****
  					}
  				}
! 				$s_template_select = '</select>';
  			}
  			else
--- 799,803 ----
  					}
  				}
! 				$s_template_select .= '</select>';
  			}
  			else

[Phpbb-checkins] CVS: phpBB2/language/lang_danish lang_admin.php,1.2,1.3 lang_bbcode.php,1.1,1.2 lang_faq.php,1.1,1.2 lang_main.php,1.3,1.4

From: Paul S. O. <ps...@us...> - 2002-02-16 15:45:10

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

Modified Files:
	lang_admin.php lang_bbcode.php lang_faq.php lang_main.php 
Log Message:
Should bring Danish up to RC-3 standard

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/lang_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lang_admin.php	31 Jan 2002 01:29:29 -0000	1.2
--- lang_admin.php	16 Feb 2002 15:45:06 -0000	1.3
***************
*** 240,243 ****
--- 240,249 ----
  
  $lang['General_settings'] = "Generelle forumindstillinger";
+ $lang['Server_name'] = "Domænenavn";
+ $lang['Server_name_explain'] = "Domænet dette forum ligger på";
+ $lang['Script_path'] = "Script Adresse";
+ $lang['Script_path_explain'] = "Adressen til phpBB2 på domænenavnet";
+ $lang['Server_port'] = "Server Port";
+ $lang['Server_port_explain'] = "Porten hvorpå din server kører. Det er normalt 80, ændre kun hvis nødvendigt";
  $lang['Site_name'] = "Sidens navn";
  $lang['Site_desc'] = "Beskrivelse af siden";
***************
*** 260,264 ****
  $lang['Default_style'] = "Standard layout";
  $lang['Override_style'] = "Overskriv brugers valg";
! $lang['Override_style_explain'] = "Erstatter brugernes valg med det der er standard";
  $lang['Default_language'] = "Standard Sprog";
  $lang['Date_format'] = "Dato Format";
--- 266,270 ----
  $lang['Default_style'] = "Standard layout";
  $lang['Override_style'] = "Overskriv brugers valg";
! $lang['Override_style_explain'] = "Erstatter brugernes valg med det, der er standard";
  $lang['Default_language'] = "Standard Sprog";
  $lang['Date_format'] = "Dato Format";
***************
*** 304,307 ****
--- 310,317 ----
  $lang['Use_SMTP_explain'] = "Vælg ja hvis du vil, eller skal, sende email via en specifik server istedet for den normale email funktion.";
  $lang['SMTP_server'] = "SMTP Server Adresse";
+ $lang['SMTP_username'] = "SMTP Brugernavn";
+ $lang['SMTP_username_explain'] = "Indtast kun et brugernavn, hvis din smtp server kræver det";
+ $lang['SMTP_password'] = "SMTP Kodeord";
+ $lang['SMTP_password_explain'] = "Indtast kun et kodeord, hvis din smtp server kræver det";
  
  $lang['Disable_privmsg'] = "Private Beskeder";
***************
*** 317,320 ****
--- 327,331 ----
  $lang['Session_length'] = "Længde på Session [ sekunder ]";
  $lang['Cookie_secure'] = "Cookie sikkerhed [ https ]";
+ $lang['Cookie_secure_explain'] = "Slå dette til hvis din server kører via SSL ellers lad det være slået fra";
  
  

Index: lang_bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/lang_bbcode.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_bbcode.php	23 Jan 2002 19:05:15 -0000	1.1
--- lang_bbcode.php	16 Feb 2002 15:45:06 -0000	1.2
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                          lang_bbcode.php [Danish]
   *                            -------------------
   *   begin                : Wednesday Oct 3, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                         lang_bbcode.php [english]
   *                            -------------------
   *   begin                : Wednesday Oct 3, 2001
***************
*** 21,28 ****
   ***************************************************************************/
   
  //
! // Translation done by Ken Christensen (Dalixam)
  //
- 
    
  $faq[] = array("--","Introduktion");
--- 21,41 ----
   ***************************************************************************/
   
+ // 
+ // To add an entry to your BBCode guide simply add a line to this file in this format:
+ // $faq[] = array("question", "answer");
+ // If you want to separate a section enter $faq[] = array("--","Block heading goes here if wanted");
+ // Links will be created automatically
  //
! // DO NOT forget the ; at the end of the line.
! // Do NOT put double quotes (") in your BBCode guide entries, if you absolutely must then escape them ie. \"something\"
! //
! // The BBCode guide items will appear on the BBCode guide page in the same order they are listed in this file
! //
! // If just translating this file please do not alter the actual HTML unless absolutely necessary, thanks :)
! //
! // In addition please do not translate the colours referenced in relation to BBCode any section, if you do
! // users browsing in your language may be confused to find they're BBCode doesn't work :D You can change
! // references which are 'in-line' within the text though.
  //
    
  $faq[] = array("--","Introduktion");
***************
*** 55,57 ****
  //
  
! ?>
\ No newline at end of file
--- 68,70 ----
  //
  
! ?>

Index: lang_faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/lang_faq.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_faq.php	23 Jan 2002 19:05:15 -0000	1.1
--- lang_faq.php	16 Feb 2002 15:45:06 -0000	1.2
***************
*** 1,5 ****
  <?php
  /***************************************************************************
!  *                           lang_faq.php [Danish]
   *                            -------------------
   *   begin                : Wednesday Oct 3, 2001
--- 1,5 ----
  <?php
  /***************************************************************************
!  *                          lang_faq.php [english]
   *                            -------------------
   *   begin                : Wednesday Oct 3, 2001
***************
*** 21,28 ****
   ***************************************************************************/
   
  //
! // Translation done by Ken Christensen (Dalixam)
  //
! 
    
  $faq[] = array("--","Login og Tilmeldings problemer");
--- 21,36 ----
   ***************************************************************************/
   
+ // 
+ // To add an entry to your FAQ simply add a line to this file in this format:
+ // $faq[] = array("question", "answer");
+ // If you want to separate a section enter $faq[] = array("--","Block heading goes here if wanted");
+ // Links will be created automatically
  //
! // DO NOT forget the ; at the end of the line.
! // Do NOT put double quotes (") in your FAQ entries, if you absolutely must then 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("--","Login og Tilmeldings problemer");
***************
*** 91,93 ****
  //
  
! ?>
\ No newline at end of file
--- 99,101 ----
  //
  
! ?>

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/lang_main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** lang_main.php	31 Jan 2002 01:29:29 -0000	1.3
--- lang_main.php	16 Feb 2002 15:45:06 -0000	1.4
***************
*** 251,255 ****
  
  $lang['Guest'] = 'Gæst';
! $lang['Post_subject'] = "Skriv Emne";
  $lang['View_next_topic'] = "Vis næste Emne";
  $lang['View_previous_topic'] = "Vis forrige Emne";
--- 251,255 ----
  
  $lang['Guest'] = 'Gæst';
! $lang['Post_subject'] = "Emne:";
  $lang['View_next_topic'] = "Vis næste Emne";
  $lang['View_previous_topic'] = "Vis forrige Emne";

[Phpbb-checkins] CVS: phpBB2 index.php,1.94,1.95

From: Bart v. B. <ba...@us...> - 2002-02-16 15:04:45

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

Modified Files:
	index.php 
Log Message:
Fixed <> vs != problem with MSSQL, missed this one

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** index.php	15 Feb 2002 15:08:48 -0000	1.94
--- index.php	16 Feb 2002 15:04:42 -0000	1.95
***************
*** 231,235 ****
  		WHERE aa.auth_mod = " . TRUE . " 
  			AND g.group_single_user = 0
! 			AND g.group_type != " . GROUP_HIDDEN . "
  			AND ug.group_id = aa.group_id 
  			AND g.group_id = aa.group_id 
--- 231,235 ----
  		WHERE aa.auth_mod = " . TRUE . " 
  			AND g.group_single_user = 0
! 			AND g.group_type <> " . GROUP_HIDDEN . "
  			AND ug.group_id = aa.group_id 
  			AND g.group_id = aa.group_id

[Phpbb-checkins] CVS: phpBB2/develop bbcode_conversion.php,1.3,1.4 benchmark.php,1.5,1.6 convert_avatars.php,1.1,1.2 convert_bbcodeuid.php,1.1,1.2 convert_conf.php,1.2,1.3 convert_privmsgs.php,1.1,1.2 convert_sigs.php,1.2,1.3 convert_user_regdates.php,1.1,1.2 most_users_update.php,1.1,1.2 nuke-db.php,1.2,1.3 search_fill.php,1.8,1.9

From: Bart v. B. <ba...@us...> - 2002-02-16 10:35:45

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

Modified Files:
	bbcode_conversion.php benchmark.php convert_avatars.php 
	convert_bbcodeuid.php convert_conf.php convert_privmsgs.php 
	convert_sigs.php convert_user_regdates.php 
	most_users_update.php nuke-db.php search_fill.php 
Log Message:
Fixed some security problems for those people that didn't remove or disable the /develop/ dir in their CVS install

Index: bbcode_conversion.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/bbcode_conversion.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bbcode_conversion.php	2 May 2001 17:46:45 -0000	1.3
--- bbcode_conversion.php	16 Feb 2002 10:35:40 -0000	1.4
***************
*** 1,5 ****
  <?php
  /***************************************************************************  
!  *                               config.php  
   *                            -------------------                         
   *   begin                : Tuesday, March 20, 2001 
--- 1,5 ----
  <?php
  /***************************************************************************  
!  *                           bbcode_conversion.php  
   *                            -------------------                         
   *   begin                : Tuesday, March 20, 2001 
***************
*** 22,25 ****
--- 22,38 ----
   * 
   ***************************************************************************/ 
+ 
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
   
  include('../extension.inc');
***************
*** 203,205 ****
  
   
! ?>
\ No newline at end of file
--- 216,218 ----
  
   
! ?>

Index: benchmark.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/benchmark.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** benchmark.php	5 Oct 2001 20:01:54 -0000	1.5
--- benchmark.php	16 Feb 2002 10:35:40 -0000	1.6
***************
*** 1,3 ****
--- 1,18 ----
  <?php
+ 
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
+ 
  $phpbb_root_path = "../";
  include($phpbb_root_path . 'extension.inc');

Index: convert_avatars.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/convert_avatars.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** convert_avatars.php	11 Oct 2001 22:01:11 -0000	1.1
--- convert_avatars.php	16 Feb 2002 10:35:40 -0000	1.2
***************
*** 1,4 ****
--- 1,18 ----
  <?php
  
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
+ 
  $phpbb_root_path = "../";
  

Index: convert_bbcodeuid.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/convert_bbcodeuid.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** convert_bbcodeuid.php	24 Nov 2001 17:17:06 -0000	1.1
--- convert_bbcodeuid.php	16 Feb 2002 10:35:40 -0000	1.2
***************
*** 1,4 ****
--- 1,18 ----
  <?php
  
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
+ 
  $phpbb_root_path = "../";
  

Index: convert_conf.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/convert_conf.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** convert_conf.php	8 Sep 2001 22:58:10 -0000	1.2
--- convert_conf.php	16 Feb 2002 10:35:40 -0000	1.3
***************
*** 1,4 ****
--- 1,18 ----
  <?php
  
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
+ 
  $phpbb_root_path = "../";
  

Index: convert_privmsgs.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/convert_privmsgs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** convert_privmsgs.php	1 Oct 2001 23:22:18 -0000	1.1
--- convert_privmsgs.php	16 Feb 2002 10:35:40 -0000	1.2
***************
*** 1,4 ****
--- 1,18 ----
  <?php
  
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
+ 
  $phpbb_root_path = "../";
  

Index: convert_sigs.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/convert_sigs.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** convert_sigs.php	8 Sep 2001 22:58:10 -0000	1.2
--- convert_sigs.php	16 Feb 2002 10:35:40 -0000	1.3
***************
*** 1,4 ****
--- 1,17 ----
  <?php
  
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
  $phpbb_root_path = "../";
  

Index: convert_user_regdates.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/convert_user_regdates.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** convert_user_regdates.php	2 May 2001 22:14:32 -0000	1.1
--- convert_user_regdates.php	16 Feb 2002 10:35:40 -0000	1.2
***************
*** 3,6 ****
--- 3,20 ----
  <?php
  
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
+ 
  chdir("../");
  
***************
*** 68,70 ****
  ?>
  </body>
! </html>
\ No newline at end of file
--- 82,84 ----
  ?>
  </body>
! </html>

Index: most_users_update.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/most_users_update.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** most_users_update.php	25 Jan 2002 23:21:38 -0000	1.1
--- most_users_update.php	16 Feb 2002 10:35:40 -0000	1.2
***************
*** 3,6 ****
--- 3,19 ----
  <?php
  
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
  	$phpbb_root_path = "../";
  
***************
*** 27,29 ****
  ?>
  </body>
! </html>
\ No newline at end of file
--- 40,42 ----
  ?>
  </body>
! </html>

Index: nuke-db.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/nuke-db.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** nuke-db.php	9 Apr 2001 19:57:07 -0000	1.2
--- nuke-db.php	16 Feb 2002 10:35:40 -0000	1.3
***************
*** 1,3 ****
--- 1,18 ----
  <?php
+ 
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
+ 
  // Just a handy script to completely wipe out the contents of a 
  // database.. Use with caution :)

Index: search_fill.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/search_fill.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** search_fill.php	25 Jan 2002 01:31:42 -0000	1.8
--- search_fill.php	16 Feb 2002 10:35:40 -0000	1.9
***************
*** 1,4 ****
--- 1,17 ----
  <?php 
  
+ //
+ // Security message:
+ //
+ // This script is potentially dangerous.
+ // Remove or comment the next line (die(".... ) to enable this script.
+ // Do NOT FORGET to either remove this script or disable it after you have used it.
+ //
+ die("Please read the first lines of this script for instructions on how to enable it");
+ 
+ //
+ // Do not change anything below this line.
+ //
+ 
  set_time_limit(0);
  $common_percent = 0.4; // Percentage of posts in which a word has to appear to be marked as common

[Phpbb-checkins] CVS: phpBB2 modcp.php,1.59,1.60

From: Bart v. B. <ba...@us...> - 2002-02-15 23:52:46

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

Modified Files:
	modcp.php 
Log Message:
Added 'return to forum' to (un)lock

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** modcp.php	13 Feb 2002 21:08:34 -0000	1.59
--- modcp.php	15 Feb 2002 23:52:41 -0000	1.60
***************
*** 573,576 ****
--- 573,578 ----
  		}
  
+ 		$message = $message . "<br \><br \>" . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
+ 
  		$template->assign_vars(array(
  			"META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
***************
*** 613,616 ****
--- 615,620 ----
  			$message = sprintf($lang['Click_return_modcp'], '<a href="' . $redirect_page . '">', '</a>');
  		}
+ 
+ 		$message = $message . "<br \><br \>" . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
  
  		$template->assign_vars(array(

[Phpbb-checkins] CVS: phpBB2 login.php,1.41,1.42

From: Paul S. O. <ps...@us...> - 2002-02-15 23:34:35

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

Modified Files:
	login.php 
Log Message:
Minor updates, may fix bug #517876

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** login.php	5 Feb 2002 01:45:23 -0000	1.41
--- login.php	15 Feb 2002 23:34:32 -0000	1.42
***************
*** 55,71 ****
  
  		$sql = "SELECT user_id, username, user_password, user_active, user_level 
! 			FROM ".USERS_TABLE."
  			WHERE username = '" . str_replace("\'", "''", $username) . "'";
! 		$result = $db->sql_query($sql);
! 		if(!$result)
  		{
  			message_die(GENERAL_ERROR, "Error in obtaining userdata : login", "", __LINE__, __FILE__, $sql);
  		}
  
! 		$rowresult = $db->sql_fetchrow($result);
! 
! 		if( count($rowresult) )
  		{
! 			if( $rowresult['user_level'] != ADMIN && $board_config['board_disable'] )
  			{
  				header($header_location . append_sid("index.$phpEx", true));
--- 55,68 ----
  
  		$sql = "SELECT user_id, username, user_password, user_active, user_level 
! 			FROM " . USERS_TABLE . "
  			WHERE username = '" . str_replace("\'", "''", $username) . "'";
! 		if ( !($result = $db->sql_query($sql)) )
  		{
  			message_die(GENERAL_ERROR, "Error in obtaining userdata : login", "", __LINE__, __FILE__, $sql);
  		}
  
! 		if( $row = $db->sql_fetchrow($result) )
  		{
! 			if( $row['user_level'] != ADMIN && $board_config['board_disable'] )
  			{
  				header($header_location . append_sid("index.$phpEx", true));
***************
*** 73,81 ****
  			else
  			{
! 				if( md5($password) == $rowresult['user_password'] && $rowresult['user_active'] )
  				{
  					$autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0;
  
! 					$session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin);
  
  					if( $session_id )
--- 70,78 ----
  			else
  			{
! 				if( md5($password) == $row['user_password'] && $row['user_active'] )
  				{
  					$autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0;
  
! 					$session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin);
  
  					if( $session_id )

[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.42,1.43

From: Bart v. B. <ba...@us...> - 2002-02-15 22:14:03

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

Modified Files:
	groupcp.php 
Log Message:
Made hidden groups hidden, guess some extra security checks would be nice though (ppl guessing URLs)

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** groupcp.php	15 Feb 2002 14:03:39 -0000	1.42
--- groupcp.php	15 Feb 2002 22:13:59 -0000	1.43
***************
*** 1057,1063 ****
  else
  {
! 	$sql = "SELECT g.group_id, g.group_name, ug.user_pending 
  		FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 		WHERE ug.user_id = " . $userdata['user_id'] . "  
  			AND ug.group_id = g.group_id
  			AND g.group_single_user <> " . TRUE . "
--- 1057,1072 ----
  else
  {
! //
! // Show the main groupcp.php screen where the user can select a group.
! //
! 
! 	//
! 	// Select all group that the user is a member of or where the user has
! 	// a pending membership.
! 	//
! 	$sql = "SELECT g.group_id, g.group_name, g.group_type, ug.user_pending 
  		FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 		WHERE
! 			ug.user_id = " . $userdata['user_id'] . "  
  			AND ug.group_id = g.group_id
  			AND g.group_single_user <> " . TRUE . "
***************
*** 1073,1076 ****
--- 1082,1086 ----
  	while( $row = $db->sql_fetchrow($result) )
  	{
+ 		$in_group[] = $row['group_id'];
  		if ( $row['user_pending'] )
  		{
***************
*** 1081,1093 ****
  			$s_member_groups_opt .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
  		}
- 		$in_group[] = $row['group_id'];
  	}
  	$s_pending_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_pending_groups_opt . "</select>";
  	$s_member_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_member_groups_opt . "</select>";
  
  	$ignore_group_sql =	( count($in_group) ) ? "AND group_id NOT IN (" . implode(", ", $in_group) . ")" : ""; 
  	$sql = "SELECT group_id, group_name  
  		FROM " . GROUPS_TABLE . " g 
! 		WHERE group_single_user <> " . TRUE . " 
  			$ignore_group_sql 
  		ORDER BY g.group_name";
--- 1091,1107 ----
  			$s_member_groups_opt .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
  		}
  	}
  	$s_pending_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_pending_groups_opt . "</select>";
  	$s_member_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_member_groups_opt . "</select>";
  
+ 	//
+ 	// Select all other groups i.e. groups that this user is not a member of
+ 	//
  	$ignore_group_sql =	( count($in_group) ) ? "AND group_id NOT IN (" . implode(", ", $in_group) . ")" : ""; 
  	$sql = "SELECT group_id, group_name  
  		FROM " . GROUPS_TABLE . " g 
! 		WHERE
! 			group_single_user <> " . TRUE . " 
! 			AND group_type <> " . GROUP_HIDDEN . "
  			$ignore_group_sql 
  		ORDER BY g.group_name";
***************
*** 1174,1176 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 1188,1190 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

[Phpbb-checkins] CVS: phpBB2/includes search.php,1.9,1.10

From: Paul S. O. <ps...@us...> - 2002-02-15 21:59:04

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

Modified Files:
	search.php 
Log Message:
Fix bug #518159

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/search.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** search.php	14 Feb 2002 17:43:56 -0000	1.9
--- search.php	15 Feb 2002 21:59:01 -0000	1.10
***************
*** 196,200 ****
  					default:
  						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text) 
! 							VALUES ('" . $word[$i] . "', 0)"; 
  						if( !($result = $db->sql_query($sql)) )
  						{
--- 196,200 ----
  					default:
  						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text) 
! 							VALUES ('" . $word[$i] . "')"; 
  						if( !($result = $db->sql_query($sql)) )
  						{

[Phpbb-checkins] CVS: phpBB2/language/lang_arabic/email admin_activate.tpl,NONE,1.1 admin_send_email.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 index.htm,NONE,1.1 privmsg_notify.tpl,NONE,1.1 profile_send_email.tpl,NONE,1.1 topic_notify.tpl,NONE,1.1 user_activate.tpl,NONE,1.1 user_activate_passwd.tpl,NONE,1.1 user_welcome.tpl,NONE,1.1 user_welcome_inactive.tpl,NONE,1.1

From: Bart v. B. <ba...@us...> - 2002-02-15 21:40:26

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

Added Files:
	admin_activate.tpl admin_send_email.tpl 
	admin_welcome_activated.tpl admin_welcome_inactive.tpl 
	coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl 
	group_request.tpl index.htm privmsg_notify.tpl 
	profile_send_email.tpl topic_notify.tpl user_activate.tpl 
	user_activate_passwd.tpl user_welcome.tpl 
	user_welcome_inactive.tpl 
Log Message:
Made arabic translation usable (using english for missing files, my Arabic sucks)

--- 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 ---
The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:

{BOARD_EMAIL}

Include this full email (particularly the headers). 

Message sent to you follows:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

{MESSAGE}

--- 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 I 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 or deny this request for group membership please visit the following link:

{U_GROUPCP}

{EMAIL_SIG}

--- NEW FILE ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

--- 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 {TO_USERNAME},

The following is an email sent to you by {FROM_USERNAME} via your account on {SITENAME}. If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:

{BOARD_EMAIL}

Include this full email (particularly the headers). Please note that the reply address to this email has been set to that of {FROM_USERNAME}.

Message sent to you follows
~~~~~~~~~~~~~~~~~~~~~~~~~~~

{MESSAGE}

--- 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},

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 ---
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 ---
{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}
--- 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}

[Phpbb-checkins] CVS: phpBB2/admin admin_db_utilities.php,1.34,1.35

From: Jonathan H. <the...@us...> - 2002-02-15 21:39:00

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

Modified Files:
	admin_db_utilities.php 
Log Message:
Fix for #518056 in bug tracker... Me and my D@mned typos.... Amazing what a difference one little letter, and one extra space can make... :(


Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** admin_db_utilities.php	1 Feb 2002 15:07:42 -0000	1.34
--- admin_db_utilities.php	15 Feb 2002 21:38:57 -0000	1.35
***************
*** 226,230 ****
  		}
  
! 		$schema_create .= ", $crlf";
  
  	}
--- 226,230 ----
  		}
  
! 		$schema_create .= ",$crlf";
  
  	}
***************
*** 279,283 ****
  		while(list($idx_name, $props) = each($index_rows))
  		{
! 			$props['column_names'] = ereg_replace(", $", "" , $props['column_name']);
  			$index_create .= 'CREATE ' . $props['unique'] . " INDEX $idx_name ON $table (" . $props['column_names'] . ");$crlf";
  		}
--- 279,283 ----
  		while(list($idx_name, $props) = each($index_rows))
  		{
! 			$props['column_names'] = ereg_replace(", $", "" , $props['column_names']);
  			$index_create .= 'CREATE ' . $props['unique'] . " INDEX $idx_name ON $table (" . $props['column_names'] . ");$crlf";
  		}

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

From: Bart v. B. <ba...@us...> - 2002-02-15 21:38:52

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

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

[Phpbb-checkins] CVS: phpBB2/templates/subSilver viewforum_body.tpl,1.17,1.18

From: Jonathan H. <the...@us...> - 2002-02-15 19:58:20

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

Modified Files:
	viewforum_body.tpl 
Log Message:
Fix for bug #517896


Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewforum_body.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** viewforum_body.tpl	12 Feb 2002 23:13:08 -0000	1.17
--- viewforum_body.tpl	15 Feb 2002 19:58:16 -0000	1.18
***************
*** 3,12 ****
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{REQUEST_URI}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td>
  	  <td align="right" valign="bottom" nowrap><span class="gensmall"><b>{PAGINATION}</b></span></td>
  	</tr>
  	<tr> 
  	  <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" /></a></td>
! 	  <td align="left" valign="middle" class="nav" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{REQUEST_URI}">{FORUM_NAME}</a></span></td>
  	  <td align="right" valign="bottom" class="nav" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td>
  	</tr>
--- 3,12 ----
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td>
  	  <td align="right" valign="bottom" nowrap><span class="gensmall"><b>{PAGINATION}</b></span></td>
  	</tr>
  	<tr> 
  	  <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" /></a></td>
! 	  <td align="left" valign="middle" class="nav" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
  	  <td align="right" valign="bottom" class="nav" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td>
  	</tr>
***************
*** 47,51 ****
  	<tr> 
  	  <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" /></a></td>
! 	  <td align="left" valign="middle" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{REQUEST_URI}">{FORUM_NAME}</a></span></td>
  	  <td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span> 
  		</td>
--- 47,51 ----
  	<tr> 
  	  <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" /></a></td>
! 	  <td align="left" valign="middle" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
  	  <td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span> 
  		</td>

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.129,1.130

From: Jonathan H. <the...@us...> - 2002-02-15 19:58:20

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

Modified Files:
	viewforum.php 
Log Message:
Fix for bug #517896


Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -r1.129 -r1.130
*** viewforum.php	15 Feb 2002 15:08:48 -0000	1.129
--- viewforum.php	15 Feb 2002 19:58:15 -0000	1.130
***************
*** 429,432 ****
--- 429,434 ----
  	"S_AUTH_LIST" => $s_auth_can, 
  
+ 	"U_VIEW_FORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL ."=$forum_id"),
+ 
  	"U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;mark=topics"))
  );

[Phpbb-checkins] CVS: phpBB2/language/lang_dutch/email topic_notify.tpl,1.2,1.3

From: Bart v. B. <ba...@us...> - 2002-02-15 19:34:55

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

Modified Files:
	topic_notify.tpl 
Log Message:
Minor typos in Dutch translation

Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** topic_notify.tpl	2 Jan 2002 19:09:50 -0000	1.2
--- topic_notify.tpl	15 Feb 2002 19:34:51 -0000	1.3
***************
*** 9,13 ****
  {U_TOPIC}
  
! Als je geen emals wil ontvangen kan je op "Geen abonnement meer op dit
  onderwerp" klikken onderaan dat topic. Of klik op de volgende link:
  
--- 9,13 ----
  {U_TOPIC}
  
! Als je geen emails wilt ontvangen kan je op "Geen abonnement meer op dit
  onderwerp" klikken onderaan dat topic. Of klik op de volgende link:

[Phpbb-checkins] CVS: phpBB2/templates/Euclid/admin admin_config_body.tpl,1.2,1.3

From: Jonathan H. <the...@us...> - 2002-02-15 15:45:12

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

Modified Files:
	admin_config_body.tpl 
Log Message:
Rolling back changes for site_name_explain lang variable


Index: admin_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/admin/admin_config_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_config_body.tpl	15 Feb 2002 15:27:09 -0000	1.2
--- admin_config_body.tpl	15 Feb 2002 15:45:07 -0000	1.3
***************
*** 10,14 ****
  	</tr>
  	<tr>
! 		<td class="row1"><span class="gen">{L_SITE_NAME}:</span><br /><span class="gensmall">{L_SITE_NAME_EXPLAIN}</span></td>
  		<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
  	</tr>
--- 10,14 ----
  	</tr>
  	<tr>
! 		<td class="row1"><span class="gen">{L_SITE_NAME}:</span></td>
  		<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
  	</tr>

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

Flat | Threaded

<< < 1 .. 568 569 570 571 572 .. 629 > >> (Page 570 of 629)