[Phpbb-checkins] CVS: phpBB2 posting.php,1.135,1.136 profile.php,1.164,1.165

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	posting.php profile.php 
Log Message:
Updates to hopefully fix bug #500212 

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -r1.135 -r1.136
*** posting.php	2002/01/03 11:06:22	1.135
--- posting.php	2002/01/07 18:50:30	1.136
***************
*** 959,963 ****
  							if( $mode == "reply" )
  							{
! 								$sql = "SELECT u.user_id, u.username, u.user_email, t.topic_title
  									FROM " . TOPICS_WATCH_TABLE . " tw, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u
  									WHERE tw.topic_id = $new_topic_id
--- 959,963 ----
  							if( $mode == "reply" )
  							{
! 								$sql = "SELECT u.user_id, u.username, u.user_email, u.user_lang, t.topic_title
  									FROM " . TOPICS_WATCH_TABLE . " tw, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u
  									WHERE tw.topic_id = $new_topic_id
***************
*** 1002,1006 ****
  										if( $email_set[$i]['user_email'] != "")
  										{
! 											$emailer->use_template("topic_notify");
  											$emailer->email_address($email_set[$i]['user_email']);
  											$emailer->set_subject($lang['Topic_reply_notification']);
--- 1002,1006 ----
  										if( $email_set[$i]['user_email'] != "")
  										{
! 											$emailer->use_template("topic_notify", $email_set[$i]['user_lang']);
  											$emailer->email_address($email_set[$i]['user_email']);
  											$emailer->set_subject($lang['Topic_reply_notification']);

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -r1.164 -r1.165
*** profile.php	2002/01/02 14:39:35	1.164
--- profile.php	2002/01/07 18:50:30	1.165
***************
*** 1028,1037 ****
  							if( $board_config['require_activation'] == USER_ACTIVATION_SELF )
  							{
! 								$emailer->use_template("user_activate");
  								$emailer->email_address($email);
  							}
  							else
  							{
! 								$emailer->use_template("admin_activate");
  								$emailer->email_address($board_config['board_email']);
  							}
--- 1028,1037 ----
  							if( $board_config['require_activation'] == USER_ACTIVATION_SELF )
  							{
! 								$emailer->use_template("user_activate", stripslashes($user_lang));
  								$emailer->email_address($email);
  							}
  							else
  							{
! 								$emailer->use_template("admin_activate", stripslashes($user_lang));
  								$emailer->email_address($board_config['board_email']);
  							}
***************
*** 1144,1148 ****
  								$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";

! 								$emailer->use_template($email_template);
  								$emailer->email_address($email);
  								$emailer->set_subject(sprintf($lang['Welcome_subject'], $board_config['sitename']));
--- 1144,1148 ----
  								$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";

! 								$emailer->use_template($email_template, stripslashes($user_lang));
  								$emailer->email_address($email);
  								$emailer->set_subject(sprintf($lang['Welcome_subject'], $board_config['sitename']));
***************
*** 1188,1192 ****
  								if( $board_config['require_activation'] == USER_ACTIVATION_ADMIN )
  								{
! 									$emailer->use_template("admin_activate");
  									$emailer->email_address($board_config['board_email']);
  									$emailer->set_subject($lang['New_account_subject']);
--- 1188,1192 ----
  								if( $board_config['require_activation'] == USER_ACTIVATION_ADMIN )
  								{
! 									$emailer->use_template("admin_activate", stripslashes($user_lang));
  									$emailer->email_address($board_config['board_email']);
  									$emailer->set_subject($lang['New_account_subject']);
***************
*** 1666,1670 ****
  			$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";

! 			$sql = "SELECT user_id, username, user_email, user_active
  				FROM " . USERS_TABLE . " 
  				WHERE user_email = '" . str_replace("\'", "''", $email) . "' 
--- 1666,1670 ----
  			$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";

! 			$sql = "SELECT user_id, username, user_email, user_active, user_lang 
  				FROM " . USERS_TABLE . " 
  				WHERE user_email = '" . str_replace("\'", "''", $email) . "' 
***************
*** 1717,1721 ****
  				$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";

! 				$emailer->use_template("user_activate_passwd");
  				$emailer->email_address($row['user_email']);
  				$emailer->set_subject($lang['New_password_activation']);
--- 1717,1721 ----
  				$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";

! 				$emailer->use_template("user_activate_passwd", $row['user_lang']);
  				$emailer->email_address($row['user_email']);
  				$emailer->set_subject($lang['New_password_activation']);
***************
*** 1790,1794 ****
  	else if( $mode == "activate" )
  	{
! 		$sql = "SELECT user_id, user_email, user_newpasswd 
  			FROM " . USERS_TABLE . "
  			WHERE user_actkey = '" . str_replace("\'", "''", $HTTP_GET_VARS['act_key']) . "'";
--- 1790,1794 ----
  	else if( $mode == "activate" )
  	{
! 		$sql = "SELECT user_id, user_email, user_newpasswd, user_lang  
  			FROM " . USERS_TABLE . "
  			WHERE user_actkey = '" . str_replace("\'", "''", $HTTP_GET_VARS['act_key']) . "'";
***************
*** 1797,1809 ****
  				if( $row = $db->sql_fetchrow($result) )
  				{
! 					if( $row['user_newpasswd'] != "" )
! 					{
! 						$sql_update_pass = ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''";
! 					}
! 					else
! 					{
! 						$sql_update_pass = "";
! 					}
! 
  					$sql = "UPDATE " . USERS_TABLE . "
  						SET user_active = 1, user_actkey = ''" . $sql_update_pass . " 
--- 1797,1802 ----
  				if( $row = $db->sql_fetchrow($result) )
  				{
! 					$sql_update_pass = ( $row['user_newpasswd'] != "" ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : "";
! 	
  					$sql = "UPDATE " . USERS_TABLE . "
  						SET user_active = 1, user_actkey = ''" . $sql_update_pass . " 
***************
*** 1818,1822 ****
  							$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";

! 							$emailer->use_template("admin_welcome_activated");
  							$emailer->email_address($row['user_email']);
  							$emailer->set_subject($lang['Account_activated_subject']);
--- 1811,1815 ----
  							$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";

! 							$emailer->use_template("admin_welcome_activated", $row['user_lang']);
  							$emailer->email_address($row['user_email']);
  							$emailer->set_subject($lang['Account_activated_subject']);

[Phpbb-checkins] CVS: phpBB2 posting.php,1.135,1.136 profile.php,1.164,1.165

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

[Phpbb-checkins] CVS: phpBB2 posting.php,1.135,1.136 profile.php,1.164,1.165