[Phpbb-checkins] CVS: phpBB2/includes emailer.php,1.7,1.8

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

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

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

Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** emailer.php	2001/10/11 12:17:15	1.7
--- emailer.php	2001/11/13 16:07:42	1.8
***************
*** 85,96 ****
  	}
  
! 	function use_template($template_file)
  	{
! 		global $board_config;
  
! 		$phpbb_root_path = "./";
! 		$template_file = $phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/email/" . $template_file . ".tpl";
! 		if (!file_exists($template_file))
  		{
  			message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__);
  		}
--- 85,100 ----
  	}
  
! 	function use_template($template_file, $template_lang = "")
  	{
! 		global $board_config, $phpbb_root_path;
  
! 		if( $template_lang == "" )
  		{
+ 			$template_lang = $board_config['default_lang'];
+ 		}
+ 
+ 		$template_file = $phpbb_root_path . "language/lang_" . $template_lang . "/email/" . $template_file . ".tpl";
+ 		if( !file_exists($template_file) )
+ 		{
  			message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__);
  		}
***************
*** 98,105 ****
  		{
  			$this->tpl_file = $template_file;
! 			//
! 			// Load the email text into the $this->msg variable
! 			//
! 			if(!$this->load_msg())
  			{
  				message_die(GENERAL_ERROR, "Couldn't load template file: $template_file", "", __LINE__, __FILE__);
--- 102,106 ----
  		{
  			$this->tpl_file = $template_file;
! 			if( !$this->load_msg() )
  			{
  				message_die(GENERAL_ERROR, "Couldn't load template file: $template_file", "", __LINE__, __FILE__);