[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.48,1.49 privmsg.php,1.85,1.86 profile.php,1.185,1.186

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

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

Modified Files:
	groupcp.php privmsg.php profile.php 
Log Message:
Changed way subject is sent to email ... handled by templates where necessary

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** groupcp.php	19 Feb 2002 16:06:25 -0000	1.48
--- groupcp.php	2 Mar 2002 18:12:03 -0000	1.49
***************
*** 198,202 ****
  	$emailer->use_template("group_request", $moderator['user_lang']);
  	$emailer->email_address($moderator['user_email']);
! 	$emailer->set_subject($lang['Group_request']);
  	$emailer->extra_headers($email_headers);
  
--- 198,202 ----
  	$emailer->use_template("group_request", $moderator['user_lang']);
  	$emailer->email_address($moderator['user_email']);
! 	$emailer->set_subject();//$lang['Group_request']
  	$emailer->extra_headers($email_headers);
  
***************
*** 404,408 ****
  				$emailer->use_template("group_added", $row['user_lang']);
  				$emailer->email_address($row['user_email']);
! 				$emailer->set_subject($lang['Group_added']);
  				$emailer->extra_headers($email_headers);
  
--- 404,408 ----
  				$emailer->use_template("group_added", $row['user_lang']);
  				$emailer->email_address($row['user_email']);
! 				$emailer->set_subject();//$lang['Group_added']
  				$emailer->extra_headers($email_headers);
  
***************
*** 510,514 ****
  					$emailer->use_template("group_approved");
  					$emailer->email_address($email_addresses);
! 					$emailer->set_subject($lang['Group_approved']);
  					$emailer->extra_headers($email_headers);
  
--- 510,514 ----
  					$emailer->use_template("group_approved");
  					$emailer->email_address($email_addresses);
! 					$emailer->set_subject();//$lang['Group_approved']
  					$emailer->extra_headers($email_headers);
  
***************
*** 1186,1188 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 1186,1188 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** privmsg.php	23 Feb 2002 17:49:13 -0000	1.85
--- privmsg.php	2 Mar 2002 18:12:03 -0000	1.86
***************
*** 1126,1130 ****
  					$emailer->extra_headers($email_headers);
  					$emailer->email_address($to_userdata['user_email']);
! 					$emailer->set_subject($lang['Notification_subject']);
  					
  					$emailer->assign_vars(array(
--- 1126,1130 ----
  					$emailer->extra_headers($email_headers);
  					$emailer->email_address($to_userdata['user_email']);
! 					$emailer->set_subject(); //$lang['Notification_subject']
  					
  					$emailer->assign_vars(array(
***************
*** 1206,1219 ****
  			{
  				message_die(GENERAL_ERROR, "Couldn't obtain post and post text", "", __LINE__, __FILE__, $sql);
- 			}
- 		}
- 
- 		//
- 		// Process the username list operations
- 		//
- 		if( $submit_search )
- 		{
- 			if( !empty($HTTP_POST_VARS['username_search']) )
- 			{
  			}
  		}
--- 1206,1209 ----

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -r1.185 -r1.186
*** profile.php	1 Mar 2002 18:04:26 -0000	1.185
--- profile.php	2 Mar 2002 18:12:03 -0000	1.186
***************
*** 60,64 ****
  	if ( $email != "" )
  	{
! 		if ( preg_match("/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is", $email) )
  		{
  			$sql = "SELECT ban_email
--- 60,64 ----
  	if ( $email != "" )
  	{
! 		if ( preg_match('/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) )
  		{
[...1157 lines suppressed...]
  
! 				if( $userdata['user_sig'] != "" )
  				{
  					$template->assign_block_vars("signature_checkbox", array());
--- 1964,1968 ----
  				}
  
! 				if ( $userdata['user_sig'] != "" )
  				{
  					$template->assign_block_vars("signature_checkbox", array());
***************
*** 2016,2018 ****
  }
  
! ?>
--- 2003,2005 ----
  }
  
! ?>
\ No newline at end of file