[Phpbb-checkins] CVS: phpBB2/admin admin_db_utilities.php,1.26,1.27 admin_groups.php,1.13,1.14 admin_mass_email.php,1.6,1.7

[James A. <th...@us...>]

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

Modified Files:
	admin_db_utilities.php admin_groups.php admin_mass_email.php 
Log Message:
Checked all calls to message_die and made sure that if they would be outputted to a user
without a major error that they got their error string from the lang file
Also made sure all calls had the right arguments in teh right place


Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** admin_db_utilities.php	2001/10/14 15:46:53	1.26
--- admin_db_utilities.php	2001/11/09 08:57:37	1.27
***************
*** 957,962 ****
  							if(!$result && ( !(SQL_LAYER == 'postgres' && eregi("drop table", $sql) ) ) )
  							{
! 								include('page_header_admin.'.$phpEx);
! 								echo "~~$sql~~";
  								message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql);
  							}
--- 957,962 ----
  							if(!$result && ( !(SQL_LAYER == 'postgres' && eregi("drop table", $sql) ) ) )
  							{
! 								//include('page_header_admin.'.$phpEx);
! 								// echo "~~$sql~~";
  								message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql);
  							}

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** admin_groups.php	2001/11/03 19:17:06	1.13
--- admin_groups.php	2001/11/09 08:57:37	1.14
***************
*** 64,68 ****
  		if( !$db->sql_numrows($result) )
  		{
! 			message_die(GENERAL_MESSAGE, "That user group does not exist");
  		}
  		$group_info = $db->sql_fetchrow($result);
--- 64,68 ----
  		if( !$db->sql_numrows($result) )
  		{
! 			message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
  		}
  		$group_info = $db->sql_fetchrow($result);
***************
*** 200,204 ****
  			if( !$db->sql_numrows($result) )
  			{
! 				message_die(GENERAL_MESSAGE, "That user group does not exist");
  			}
  			$group_info = $db->sql_fetchrow($result);		
--- 200,204 ----
  			if( !$db->sql_numrows($result) )
  			{
! 				message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
  			}
  			$group_info = $db->sql_fetchrow($result);		

Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** admin_mass_email.php	2001/10/14 15:46:53	1.6
--- admin_mass_email.php	2001/11/09 08:57:37	1.7
***************
*** 44,48 ****
  // Set VERBOSE to 1  for debugging info..
  //
! define("VERBOSE", 0);
  
  //
--- 44,55 ----
  // Set VERBOSE to 1  for debugging info..
  //
! if(DEBUG)
! {
! 	define("VERBOSE", 1);
! }
! else
! {
! 	define("VERBOSE", 0);
! }
  
  //
***************
*** 89,92 ****
--- 96,100 ----
  		$email_headers .= $g_list[$i]['user_email'];
  	}
+ 	
  	mail($board_config['board_email'],$HTTP_POST_VARS["$f_title"],$HTTP_POST_VARS["$f_msg"],$email_headers);
  	$notice = $lang['Messages'].' '.$lang['Sent'].'!';