[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.40,1.41

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

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

Modified Files:
	privmsg.php 
Log Message:
Added global PM disable + modded emailer to allow lang select + re-added back box limits my dumbness removed recently

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** privmsg.php	2001/11/09 13:15:35	1.40
--- privmsg.php	2001/11/13 16:07:42	1.41
***************
*** 28,31 ****
--- 28,39 ----
  
  //
+ // Is PM disabled?
+ //
+ if( !empty($board_config['privmsg_disable']) )
+ {
+ 	message_die(GENERAL_MESSAGE, 'PM_disabled');
+ }
+ 
+ //
  // Var definitions
  //
***************
*** 818,822 ****
  			$to_username = $HTTP_POST_VARS['username'];
  
! 			$sql = "SELECT user_id, user_notify_pm, user_email
  				FROM " . USERS_TABLE . "
  				WHERE username = '" . $to_username . "'
--- 826,830 ----
  			$to_username = $HTTP_POST_VARS['username'];
  
! 			$sql = "SELECT user_id, user_notify_pm, user_email, user_lang 
  				FROM " . USERS_TABLE . "
  				WHERE username = '" . $to_username . "'
***************
*** 978,982 ****
  					$emailer = new emailer($board_config['smtp_delivery']);
  					
! 					$emailer->use_template("privmsg_notify");
  
  					$emailer->extra_headers($email_headers);
--- 986,993 ----
  					$emailer = new emailer($board_config['smtp_delivery']);
  					
! 					//
! 					// Attempt to use language setting for recipient
! 					//
! 					$emailer->use_template("privmsg_notify", $to_userdata['user_lang']);
  
  					$emailer->extra_headers($email_headers);