[mxbb-commits] mx_profilecp/profilcp functions_profile.php,1.8,1.9 profilcp_activate.php,1.4,1.5 profilcp_board_config.php,1.2,1.3 profilcp_buddy.php,1.4,1.5 profilcp_email.php,1.6,1.7 profilcp_home_buddy.php,1.2,1.3 profilcp_home_privmsgs.php,1.2,1.3 profilcp_home_wtopics.php,1.2,1.3 profilcp_privmsg.php,1.5,1.6 profilcp_privmsg_popup.php,1.3,1.4 profilcp_profil_groups.php,1.2,1.3 profilcp_profil_signature.php,1.3,1.4 profilcp_public_base.php,1.3,1.4 profilcp_public_groups.php,1.3,1.4 profilcp_register.php,1.6,1.7 profilcp_sendpassword.php,1.3,1.4 uacp.php,1.3,1.4

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_profilecp/profilcp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp/profilcp

Modified Files:
	functions_profile.php profilcp_activate.php 
	profilcp_board_config.php profilcp_buddy.php 
	profilcp_email.php profilcp_home_buddy.php 
	profilcp_home_privmsgs.php profilcp_home_wtopics.php 
	profilcp_privmsg.php profilcp_privmsg_popup.php 
	profilcp_profil_groups.php profilcp_profil_signature.php 
	profilcp_public_base.php profilcp_public_groups.php 
	profilcp_register.php profilcp_sendpassword.php uacp.php 
Log Message:
replaced all message_die with mx_message_die

Index: profilcp_activate.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_activate.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** profilcp_activate.php	1 Oct 2005 14:16:27 -0000	1.4
--- profilcp_activate.php	24 Oct 2005 20:18:06 -0000	1.5
***************
*** 32,36 ****
  if ( !($result = $db->sql_query($sql)) )
  {
! 	message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql);
  }
  
--- 32,36 ----
  if ( !($result = $db->sql_query($sql)) )
  {
! 	mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql);
  }
  
***************
*** 43,47 ****
  		);
  
! 		message_die(GENERAL_MESSAGE, $lang['Already_activated']);
  	}
  	else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != ''))
--- 43,47 ----
  		);
  
! 		mx_message_die(GENERAL_MESSAGE, $lang['Already_activated']);
  	}
  	else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != ''))
***************
*** 49,53 ****
  		if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $userdata['user_level'] != ADMIN)
  		{
! 			message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
  		}
  		
--- 49,53 ----
  		if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $userdata['user_level'] != ADMIN)
  		{
! 			mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
  		}
  		
***************
*** 59,63 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update);
  		}
  
--- 59,63 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update);
  		}
  
***************
*** 92,96 ****
  			);
  
! 			message_die(GENERAL_MESSAGE, $lang['Account_active_admin']);
  		}
  		else
--- 92,96 ----
  			);
  
! 			mx_message_die(GENERAL_MESSAGE, $lang['Account_active_admin']);
  		}
  		else
***************
*** 102,116 ****
  
  			$message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; 
! 			message_die(GENERAL_MESSAGE, $message);
  		}
  	}
  	else
  	{
! 		message_die(GENERAL_MESSAGE, $lang['Wrong_activation']);
  	}
  }
  else
  {
! 	message_die(GENERAL_MESSAGE, $lang['No_such_user']);
  }
  
--- 102,116 ----
  
  			$message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; 
! 			mx_message_die(GENERAL_MESSAGE, $message);
  		}
  	}
  	else
  	{
! 		mx_message_die(GENERAL_MESSAGE, $lang['Wrong_activation']);
  	}
  }
  else
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['No_such_user']);
  }
  

Index: profilcp_home_privmsgs.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_privmsgs.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** profilcp_home_privmsgs.php	1 Oct 2005 14:16:27 -0000	1.2
--- profilcp_home_privmsgs.php	24 Oct 2005 20:18:06 -0000	1.3
***************
*** 66,70 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql);
  		}
  		$privmsgs_sql = $sql;
--- 66,70 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql);
  		}
  		$privmsgs_sql = $sql;
***************
*** 93,97 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql);
  		}
  		while ( $row = $db->sql_fetchrow($result) )
--- 93,97 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql);
  		}
  		while ( $row = $db->sql_fetchrow($result) )

Index: profilcp_board_config.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_board_config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** profilcp_board_config.php	1 Oct 2005 14:16:27 -0000	1.2
--- profilcp_board_config.php	24 Oct 2005 20:18:06 -0000	1.3
***************
*** 295,299 ****
  					else
  					{
! 						message_die(GENERAL_ERROR, 'Unknown type of config data : ' . $field_name, '', __LINE__, __FILE__, '');
  					}
  					break;
--- 295,299 ----
  					else
  					{
! 						mx_message_die(GENERAL_ERROR, 'Unknown type of config data : ' . $field_name, '', __LINE__, __FILE__, '');
  					}
  					break;
***************
*** 306,310 ****
  				);
  				$message = $error_msg . '<br /><br />' . sprintf($lang['Click_return_preferences'], '<a href="' . $ret_link . '">', '</a>') . '<br /><br />';
! 				message_die(GENERAL_MESSAGE, $message);
  			}
  		}
--- 306,310 ----
  				);
  				$message = $error_msg . '<br /><br />' . sprintf($lang['Click_return_preferences'], '<a href="' . $ret_link . '">', '</a>') . '<br /><br />';
! 				mx_message_die(GENERAL_MESSAGE, $message);
  			}
  		}
***************
*** 325,329 ****
  			if ( !$db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Failed to update user configuration for ' . $field['user'], '', __LINE__, __FILE__, $sql);
  			}
  		}
--- 325,329 ----
  			if ( !$db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Failed to update user configuration for ' . $field['user'], '', __LINE__, __FILE__, $sql);
  			}
  		}
***************
*** 336,340 ****
  	);
  	$message = $lang['Profile_updated'] . "<br /><br />" . sprintf($lang['Click_return_profilcp'], '<a href="' . $ret_link . '">', '</a>') . '<br /><br />';
! 	message_die(GENERAL_MESSAGE, $message);
  }
  else
--- 336,340 ----
  	);
  	$message = $lang['Profile_updated'] . "<br /><br />" . sprintf($lang['Click_return_profilcp'], '<a href="' . $ret_link . '">', '</a>') . '<br /><br />';
! 	mx_message_die(GENERAL_MESSAGE, $message);
  }
  else

Index: profilcp_sendpassword.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_sendpassword.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** profilcp_sendpassword.php	1 Oct 2005 14:16:27 -0000	1.3
--- profilcp_sendpassword.php	24 Oct 2005 20:18:06 -0000	1.4
***************
*** 32,36 ****
  	if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  	{
! 		message_die(GENERAL_ERROR, 'Invalid_session');
  	}
  
--- 32,36 ----
  	if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Invalid_session');
  	}
  
***************
*** 48,52 ****
  			if ( !$row['user_active'] )
  			{
! 				message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']);
  			}
  
--- 48,52 ----
  			if ( !$row['user_active'] )
  			{
! 				mx_message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']);
  			}
  
***************
*** 65,69 ****
  			if ( !$db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not update new password information', '', __LINE__, __FILE__, $sql);
  			}
  
--- 65,69 ----
  			if ( !$db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not update new password information', '', __LINE__, __FILE__, $sql);
  			}
  
***************
*** 98,111 ****
  			$message = $lang['Password_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'],  '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>');
  
! 			message_die(GENERAL_MESSAGE, $message);
  		}
  		else
  		{
! 			message_die(GENERAL_MESSAGE, $lang['No_email_match']);
  		}
  	}
  	else
  	{
! 		message_die(GENERAL_ERROR, 'Could not obtain user information for sendpassword', '', __LINE__, __FILE__, $sql);
  	}
  }
--- 98,111 ----
  			$message = $lang['Password_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'],  '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>');
  
! 			mx_message_die(GENERAL_MESSAGE, $message);
  		}
  		else
  		{
! 			mx_message_die(GENERAL_MESSAGE, $lang['No_email_match']);
  		}
  	}
  	else
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not obtain user information for sendpassword', '', __LINE__, __FILE__, $sql);
  	}
  }

Index: profilcp_privmsg.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_privmsg.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** profilcp_privmsg.php	1 Oct 2005 14:16:27 -0000	1.5
--- profilcp_privmsg.php	24 Oct 2005 20:18:06 -0000	1.6
***************
*** 96,100 ****
  	else
  	{
! 		message_die(GENERAL_ERROR, $lang['No_post_id']);
  	}
  
--- 96,100 ----
  	else
  	{
! 		mx_message_die(GENERAL_ERROR, $lang['No_post_id']);
  	}
  
***************
*** 141,145 ****
  			break;
  		default:
! 			message_die(GENERAL_ERROR, $lang['No_such_folder']);
  			break;
  	}
--- 141,145 ----
  			break;
  		default:
! 			mx_message_die(GENERAL_ERROR, $lang['No_such_folder']);
  			break;
  	}
***************
*** 157,161 ****
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql);
  	}
  
--- 157,161 ----
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 167,171 ****
  		$ret_link = append_sid(this_profile_mxurl("mode=privmsg&sub=inbox"));
  		$message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />';
! 		message_die(GENERAL_MESSAGE, $message);
  	}
  
--- 167,171 ----
  		$ret_link = append_sid(this_profile_mxurl("mode=privmsg&sub=inbox"));
  		$message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />';
! 		mx_message_die(GENERAL_MESSAGE, $message);
  	}
  
***************
*** 194,198 ****
  		if ( !$db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not update private message read status for user', '', __LINE__, __FILE__, $sql);
  		}
  
--- 194,198 ----
  		if ( !$db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not update private message read status for user', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 202,206 ****
  		if ( !$db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not update private message read status', '', __LINE__, __FILE__, $sql);
  		}
  
--- 202,206 ----
  		if ( !$db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not update private message read status', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 212,216 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql);
  		}
  
--- 212,216 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 227,231 ****
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not find oldest privmsgs', '', __LINE__, __FILE__, $sql);
  				}
  				$old_privmsgs_id = $db->sql_fetchrow($result);
--- 227,231 ----
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not find oldest privmsgs', '', __LINE__, __FILE__, $sql);
  				}
  				$old_privmsgs_id = $db->sql_fetchrow($result);
***************
*** 236,240 ****
  				if ( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (sent)', '', __LINE__, __FILE__, $sql);
  				}
  
--- 236,240 ----
  				if ( !$db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (sent)', '', __LINE__, __FILE__, $sql);
  				}
  
***************
*** 243,247 ****
  				if ( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (sent)', '', __LINE__, __FILE__, $sql);
  				}
  			}
--- 243,247 ----
  				if ( !$db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (sent)', '', __LINE__, __FILE__, $sql);
  				}
  			}
***************
*** 257,261 ****
  		if ( !$db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql);
  		}
  
--- 257,261 ----
  		if ( !$db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 266,270 ****
  		if ( !$db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not insert private message sent text', '', __LINE__, __FILE__, $sql);
  		}
  	}
--- 266,270 ----
  		if ( !$db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not insert private message sent text', '', __LINE__, __FILE__, $sql);
  		}
  	}
***************
*** 412,416 ****
  	// re-read the user_to to have all the fields
  	$sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id=$user_id_to";
! 	if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read from user info', '', __LINE__, __FILE__, $sql);
  	$user_to = $db->sql_fetchrow($result);
  
--- 412,416 ----
  	// re-read the user_to to have all the fields
  	$sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id=$user_id_to";
! 	if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read from user info', '', __LINE__, __FILE__, $sql);
  	$user_to = $db->sql_fetchrow($result);
  
***************
*** 418,426 ****
  	$view_user_id = $user_to['user_id'];
  	$sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$view_user_id AND buddy_id=$user_id";
! 	if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read from user buddy info', '', __LINE__, __FILE__, $sql);
  	$buddys = $db->sql_fetchrow($result);
  
  	$sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$user_id AND buddy_id=$view_user_id";
! 	if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read my buddies info', '', __LINE__, __FILE__, $sql);
  	$my_buddys = $db->sql_fetchrow($result);
  
--- 418,426 ----
  	$view_user_id = $user_to['user_id'];
  	$sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$view_user_id AND buddy_id=$user_id";
! 	if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read from user buddy info', '', __LINE__, __FILE__, $sql);
  	$buddys = $db->sql_fetchrow($result);
  
  	$sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$user_id AND buddy_id=$view_user_id";
! 	if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read my buddies info', '', __LINE__, __FILE__, $sql);
  	$my_buddys = $db->sql_fetchrow($result);
  
***************
*** 459,472 ****
  	// re-read the user_from to have all the fields
  	$sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id=$user_id_from";
! 	if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read from user info', '', __LINE__, __FILE__, $sql);
  	$user_from = $db->sql_fetchrow($result);
  
  	// get user relational status
  	$sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$view_user_id AND buddy_id=$user_id";
! 	if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read from user buddy info', '', __LINE__, __FILE__, $sql);
  	$buddys = $db->sql_fetchrow($result);
  
  	$sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$user_id AND buddy_id=$view_user_id";
! 	if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read my buddies info', '', __LINE__, __FILE__, $sql);
  	$my_buddys = $db->sql_fetchrow($result);
  
--- 459,472 ----
  	// re-read the user_from to have all the fields
  	$sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id=$user_id_from";
! 	if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read from user info', '', __LINE__, __FILE__, $sql);
  	$user_from = $db->sql_fetchrow($result);
  
  	// get user relational status
  	$sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$view_user_id AND buddy_id=$user_id";
! 	if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read from user buddy info', '', __LINE__, __FILE__, $sql);
  	$buddys = $db->sql_fetchrow($result);
  
  	$sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$user_id AND buddy_id=$view_user_id";
! 	if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read my buddies info', '', __LINE__, __FILE__, $sql);
  	$my_buddys = $db->sql_fetchrow($result);
  
***************
*** 609,613 ****
  	if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  	{
! 		message_die(GENERAL_ERROR, 'Invalid_session');
  	}
  
--- 609,613 ----
  	if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Invalid_session');
  	}
  
***************
*** 684,688 ****
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not obtain id list to delete all messages', '', __LINE__, __FILE__, $sql);
  			}
  
--- 684,688 ----
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not obtain id list to delete all messages', '', __LINE__, __FILE__, $sql);
  			}
  
***************
*** 724,728 ****
  				if ( !($result = $db->sql_query($sql)) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql);
  				}
  
--- 724,728 ----
  				if ( !($result = $db->sql_query($sql)) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql);
  				}
  
***************
*** 779,783 ****
  								if ( !$db->sql_query($sql) )
  								{
! 									message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql);
  								}
  							}
--- 779,783 ----
  								if ( !$db->sql_query($sql) )
  								{
! 									mx_message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql);
  								}
  							}
***************
*** 822,835 ****
  			if ( !$db->sql_query($delete_sql, BEGIN_TRANSACTION) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql);
  			}
  
  			if ( !$db->sql_query($delete_text_sql, END_TRANSACTION) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql);
  			}
  		}
  		$msg = $lang['Deleted'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=$folder")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>');
! 		message_die(GENERAL_MESSAGE, $msg);
  	}
  }
--- 822,835 ----
  			if ( !$db->sql_query($delete_sql, BEGIN_TRANSACTION) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql);
  			}
  
  			if ( !$db->sql_query($delete_text_sql, END_TRANSACTION) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql);
  			}
  		}
  		$msg = $lang['Deleted'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=$folder")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>');
! 		mx_message_die(GENERAL_MESSAGE, $msg);
  	}
  }
***************
*** 848,852 ****
  	if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  	{
! 		message_die(GENERAL_ERROR, 'Invalid_session');
  	}
  	
--- 848,852 ----
  	if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Invalid_session');
  	}
  	
***************
*** 862,866 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql);
  		}
  
--- 862,866 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 879,883 ****
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (save)', '', __LINE__, __FILE__, $sql);
  				}
  				$old_privmsgs_id = $db->sql_fetchrow($result);
--- 879,883 ----
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (save)', '', __LINE__, __FILE__, $sql);
  				}
  				$old_privmsgs_id = $db->sql_fetchrow($result);
***************
*** 888,892 ****
  				if ( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (save)', '', __LINE__, __FILE__, $sql);
  				}
  
--- 888,892 ----
  				if ( !$db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (save)', '', __LINE__, __FILE__, $sql);
  				}
  
***************
*** 895,899 ****
  				if ( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (save)', '', __LINE__, __FILE__, $sql);
  				}
  			}
--- 895,899 ----
  				if ( !$db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (save)', '', __LINE__, __FILE__, $sql);
  				}
  			}
***************
*** 931,935 ****
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql);
  			}
  
--- 931,935 ----
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql);
  			}
  
***************
*** 986,990 ****
  							if ( !$db->sql_query($sql) )
  							{
! 								message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql);
  							}
  						}
--- 986,990 ----
  							if ( !$db->sql_query($sql) )
  							{
! 								mx_message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql);
  							}
  						}
***************
*** 1024,1032 ****
  		if ( !$db->sql_query($saved_sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not save private messages', '', __LINE__, __FILE__, $saved_sql);
  		}
  	}
  		$msg = $lang['Deleted'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=savebox")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>');
! 		message_die(GENERAL_MESSAGE, $msg);
  }
  else if ( $submit || $refresh || $mode != '' )
--- 1024,1032 ----
  		if ( !$db->sql_query($saved_sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not save private messages', '', __LINE__, __FILE__, $saved_sql);
  		}
  	}
  		$msg = $lang['Deleted'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=savebox")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>');
! 		mx_message_die(GENERAL_MESSAGE, $msg);
  }
  else if ( $submit || $refresh || $mode != '' )
***************
*** 1092,1096 ****
  			if ( ( $current_time - $last_post_time ) < $board_config['flood_interval'])
  			{
! 				message_die(GENERAL_MESSAGE, $lang['Flood_Error']);
  			}
  		}
--- 1092,1096 ----
  			if ( ( $current_time - $last_post_time ) < $board_config['flood_interval'])
  			{
! 				mx_message_die(GENERAL_MESSAGE, $lang['Flood_Error']);
  			}
  		}
***************
*** 1105,1109 ****
  		if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  		{
! 			message_die(GENERAL_ERROR, 'Invalid_session');
  		}
  
--- 1105,1109 ----
  		if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Invalid_session');
  		}
  
***************
*** 1114,1118 ****
  					WHERE username = '" . str_replace("\'", "''", $to_username) . "' 
  						AND user_id <> " . ANONYMOUS;
! 			if ( !$result = $db->sql_query($sql) ) message_die(GENERAL_ERROR, 'Could not access users table', '', __LINE__, __FILE__, $sql);
  			if ( !$to_userdata = $db->sql_fetchrow($result) )
  			{
--- 1114,1118 ----
  					WHERE username = '" . str_replace("\'", "''", $to_username) . "' 
  						AND user_id <> " . ANONYMOUS;
! 			if ( !$result = $db->sql_query($sql) ) mx_message_die(GENERAL_ERROR, 'Could not access users table', '', __LINE__, __FILE__, $sql);
  			if ( !$to_userdata = $db->sql_fetchrow($result) )
  			{
***************
*** 1138,1142 ****
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not access buddy list', '', __LINE__, __FILE__, $sql);
  			}
  			if ( $urow = $db->sql_fetchrow($result) )
--- 1138,1142 ----
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not access buddy list', '', __LINE__, __FILE__, $sql);
  			}
  			if ( $urow = $db->sql_fetchrow($result) )
***************
*** 1157,1161 ****
  					if ( !$result = $db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Could not access buddy list', '', __LINE__, __FILE__, $sql);
  					}
  					if ( !$row = $db->sql_fetchrow($result) || $row['buddy_ignore'] || ( ($to_userdata['user_viewpm'] == NO) && !$row['buddy_visible'] ) )
--- 1157,1161 ----
  					if ( !$result = $db->sql_query($sql) )
  					{
! 						mx_message_die(GENERAL_ERROR, 'Could not access buddy list', '', __LINE__, __FILE__, $sql);
  					}
  					if ( !$row = $db->sql_fetchrow($result) || $row['buddy_ignore'] || ( ($to_userdata['user_viewpm'] == NO) && !$row['buddy_visible'] ) )
***************
*** 1208,1212 ****
  		{
  			$message = $lang['Cannot_send_privmsg'];
! 			message_die(GENERAL_MESSAGE, $message);
  		}
  
--- 1208,1212 ----
  		{
  			$message = $lang['Cannot_send_privmsg'];
! 			mx_message_die(GENERAL_MESSAGE, $message);
  		}
  
***************
*** 1226,1230 ****
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_MESSAGE, $lang['No_such_user']);
  			}
  
--- 1226,1230 ----
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				mx_message_die(GENERAL_MESSAGE, $lang['No_such_user']);
  			}
  
***************
*** 1243,1247 ****
  					if ( !$result = $db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql);
  					}
  					$old_privmsgs_id = $db->sql_fetchrow($result);
--- 1243,1247 ----
  					if ( !$result = $db->sql_query($sql) )
  					{
! 						mx_message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql);
  					}
  					$old_privmsgs_id = $db->sql_fetchrow($result);
***************
*** 1252,1256 ****
  					if ( !$db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql);
  					}
  
--- 1252,1256 ----
  					if ( !$db->sql_query($sql) )
  					{
! 						mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql);
  					}
  
***************
*** 1259,1263 ****
  					if ( !$db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql);
  					}
  				}
--- 1259,1263 ----
  					if ( !$db->sql_query($sql) )
  					{
! 						mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql);
  					}
  				}
***************
*** 1276,1280 ****
  		if ( !($result = $db->sql_query($sql_info, BEGIN_TRANSACTION)) )
  		{
! 			message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info);
  		}
  
--- 1276,1280 ----
  		if ( !($result = $db->sql_query($sql_info, BEGIN_TRANSACTION)) )
  		{
! 			mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info);
  		}
  
***************
*** 1295,1299 ****
  		if ( !$db->sql_query($sql, END_TRANSACTION) )
  		{
! 			message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info);
  		}
  
--- 1295,1299 ----
  		if ( !$db->sql_query($sql, END_TRANSACTION) )
  		{
! 			mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info);
  		}
  
***************
*** 1308,1312 ****
  			if ( !$status = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql);
  			}
  
--- 1308,1312 ----
  			if ( !$status = $db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql);
  			}
  
***************
*** 1353,1357 ****
  		$msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=inbox")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid($phpbb_root_path . "index.$phpEx") . '">', '</a>');
  
! 		message_die(GENERAL_MESSAGE, $msg);
  	}
  	else if ( $preview || $refresh || $error )
--- 1353,1357 ----
  		$msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=inbox")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid($phpbb_root_path . "index.$phpEx") . '">', '</a>');
  
! 		mx_message_die(GENERAL_MESSAGE, $msg);
  	}
  	else if ( $preview || $refresh || $error )
***************
*** 1399,1403 ****
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, "Could not obtain post and post text", "", __LINE__, __FILE__, $sql);
  			}
  
--- 1399,1403 ----
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				mx_message_die(GENERAL_ERROR, "Could not obtain post and post text", "", __LINE__, __FILE__, $sql);
  			}
  
***************
*** 1406,1410 ****
  				if ( $userdata['user_id'] != $postrow['user_id'] )
  				{
! 					message_die(GENERAL_MESSAGE, $lang['Edit_own_posts']);
  				}
  
--- 1406,1410 ----
  				if ( $userdata['user_id'] != $postrow['user_id'] )
  				{
! 					mx_message_die(GENERAL_MESSAGE, $lang['Edit_own_posts']);
  				}
  
***************
*** 1417,1421 ****
  		if ( !$privmsg_id && ( $mode == 'reply' || $mode == 'edit' || $mode == 'quote' ) )
  		{
! 			message_die(GENERAL_ERROR, $lang['No_post_id']);
  		}
  
--- 1417,1421 ----
  		if ( !$privmsg_id && ( $mode == 'reply' || $mode == 'edit' || $mode == 'quote' ) )
  		{
! 			mx_message_die(GENERAL_ERROR, $lang['No_post_id']);
  		}
  
***************
*** 1453,1457 ****
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql);
  			}
  
--- 1453,1457 ----
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql);
  			}
  
***************
*** 1460,1464 ****
  				$ret_link = append_sid( this_profile_mxurl("mode=privmsg&sub=$folder"));
  				$message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_privmsg'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />';
! 				message_die(GENERAL_MESSAGE, $message);
  			}
  
--- 1460,1464 ----
  				$ret_link = append_sid( this_profile_mxurl("mode=privmsg&sub=$folder"));
  				$message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_privmsg'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />';
! 				mx_message_die(GENERAL_MESSAGE, $message);
  			}
  
***************
*** 1491,1495 ****
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql);
  			}
  
--- 1491,1495 ----
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql);
  			}
  
***************
*** 1498,1502 ****
  				$ret_link = append_sid( this_profile_mxurl("mode=privmsg&sub=$folder"));
  				$message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_privmsg'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />';
! 				message_die(GENERAL_MESSAGE, $message);
  			}
  
--- 1498,1502 ----
  				$ret_link = append_sid( this_profile_mxurl("mode=privmsg&sub=$folder"));
  				$message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_privmsg'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />';
! 				mx_message_die(GENERAL_MESSAGE, $message);
  			}
  
***************
*** 1530,1534 ****
  	{
  		$message = $lang['Cannot_send_privmsg'];
! 		message_die(GENERAL_MESSAGE, $message);
  	}
  
--- 1530,1534 ----
  	{
  		$message = $lang['Cannot_send_privmsg'];
! 		mx_message_die(GENERAL_MESSAGE, $message);
  	}
  
***************
*** 1636,1640 ****
  	if ($error)
  	{
! 		message_die(GENERAL_MESSAGE, $error_msg);
  	}
  
--- 1636,1640 ----
  	if ($error)
  	{
! 		mx_message_die(GENERAL_MESSAGE, $error_msg);
  	}
  
***************
*** 1839,1843 ****
  	if ( !$db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql);
  	}
  
--- 1839,1843 ----
  	if ( !$db->sql_query($sql) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 1848,1852 ****
  	if ( !$db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not update private message new/read status (2) for user', '', __LINE__, __FILE__, $sql);
  	}
  
--- 1848,1852 ----
  	if ( !$db->sql_query($sql) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not update private message new/read status (2) for user', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 1935,1939 ****
  
  		default:
! 			message_die(GENERAL_MESSAGE, $lang['No_such_folder']);
  			break;
  	}
--- 1935,1939 ----
  
  		default:
! 			mx_message_die(GENERAL_MESSAGE, $lang['No_such_folder']);
  			break;
  	}
***************
*** 1970,1974 ****
  	if ( !($result = $db->sql_query($sql_tot)) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot);
  	}
  
--- 1970,1974 ----
  	if ( !($result = $db->sql_query($sql_tot)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot);
  	}
  
***************
*** 1977,1981 ****
  	if ( !($result = $db->sql_query($sql_all_tot)) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot);
  	}
  
--- 1977,1981 ----
  	if ( !($result = $db->sql_query($sql_all_tot)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot);
  	}
  
***************
*** 2094,2098 ****
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not query private messages', '', __LINE__, __FILE__, $sql);
  	}
  
--- 2094,2098 ----
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not query private messages', '', __LINE__, __FILE__, $sql);
  	}
  

Index: profilcp_home_buddy.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_buddy.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** profilcp_home_buddy.php	1 Oct 2005 14:16:27 -0000	1.2
--- profilcp_home_buddy.php	24 Oct 2005 20:18:06 -0000	1.3
***************
*** 105,109 ****
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not obtain Buddy online list information', '', __LINE__, __FILE__, $sql);
  		}
  
--- 105,109 ----
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not obtain Buddy online list information', '', __LINE__, __FILE__, $sql);
  		}
  

Index: profilcp_profil_signature.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_profil_signature.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** profilcp_profil_signature.php	1 Oct 2005 14:16:27 -0000	1.3
--- profilcp_profil_signature.php	24 Oct 2005 20:18:06 -0000	1.4
***************
*** 64,68 ****
  	if ( $error )
  	{
! 		message_die(GENERAL_ERROR, $error_msg);
  	}
  	if (!$error && !$preview)
--- 64,68 ----
  	if ( $error )
  	{
! 		mx_message_die(GENERAL_ERROR, $error_msg);
  	}
  	if (!$error && !$preview)
***************
*** 76,80 ****
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql);
  		}
  	}
--- 76,80 ----
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql);
  		}
  	}

Index: profilcp_privmsg_popup.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_privmsg_popup.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** profilcp_privmsg_popup.php	1 Oct 2005 14:16:27 -0000	1.3
--- profilcp_privmsg_popup.php	24 Oct 2005 20:18:06 -0000	1.4
***************
*** 31,35 ****
  if ( !empty($board_config['privmsg_disable']) )
  {
! 	message_die(GENERAL_MESSAGE, 'PM_disabled');
  }
  //
--- 31,35 ----
  if ( !empty($board_config['privmsg_disable']) )
  {
! 	mx_message_die(GENERAL_MESSAGE, 'PM_disabled');
  }
  //

Index: profilcp_home_wtopics.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_wtopics.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** profilcp_home_wtopics.php	1 Oct 2005 14:16:27 -0000	1.2
--- profilcp_home_wtopics.php	24 Oct 2005 20:18:06 -0000	1.3
***************
*** 99,103 ****
  			if ( !$db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not unwatched topics', '', __LINE__, __FILE__, $sql);
  			}
  		}
--- 99,103 ----
  			if ( !$db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not unwatched topics', '', __LINE__, __FILE__, $sql);
  			}
  		}
***************
*** 140,144 ****
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql);
  			}
  			$topics_watched_total = $db->sql_numrows($result);
--- 140,144 ----
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql);
  			}
  			$topics_watched_total = $db->sql_numrows($result);
***************
*** 169,173 ****
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql);
  		}
  		while ($row = $db->sql_fetchrow($result) ) 
--- 169,173 ----
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql);
  		}
  		while ($row = $db->sql_fetchrow($result) ) 

Index: profilcp_email.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_email.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** profilcp_email.php	1 Oct 2005 14:16:27 -0000	1.6
--- profilcp_email.php	24 Oct 2005 20:18:06 -0000	1.7
***************
*** 39,43 ****
  else
  {
! 	message_die(GENERAL_MESSAGE, $lang['No_user_specified']);
  }
  
--- 39,43 ----
  else
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['No_user_specified']);
  }
  
***************
*** 67,71 ****
  		if ( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] )
  		{
! 			message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']);
  		}
  
--- 67,71 ----
  		if ( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] )
  		{
! 			mx_message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']);
  		}
  
***************
*** 75,79 ****
  			if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  			{
! 				message_die(GENERAL_ERROR, 'Invalid_session');
  			}
  
--- 75,79 ----
  			if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Invalid_session');
  			}
  
***************
*** 185,193 ****
  					$message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_index'],  '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
! 					message_die(GENERAL_MESSAGE, $message);
  				}
  				else
  				{
! 					message_die(GENERAL_ERROR, 'Could not update last email time', '', __LINE__, __FILE__, $sql);
  				}
  			}
--- 185,193 ----
  					$message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_index'],  '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
! 					mx_message_die(GENERAL_MESSAGE, $message);
  				}
  				else
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not update last email time', '', __LINE__, __FILE__, $sql);
  				}
  			}
***************
*** 244,253 ****
  	else
  	{
! 		message_die(GENERAL_MESSAGE, $lang['User_prevent_email']);
  	}
  }
  else
  {
! 	message_die(GENERAL_MESSAGE, $lang['User_not_exist']);
  }
  
--- 244,253 ----
  	else
  	{
! 		mx_message_die(GENERAL_MESSAGE, $lang['User_prevent_email']);
  	}
  }
  else
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['User_not_exist']);
  }
  

Index: uacp.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/uacp.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** uacp.php	1 Oct 2005 14:16:27 -0000	1.3
--- uacp.php	24 Oct 2005 20:18:06 -0000	1.4
***************
*** 78,82 ****
  // if ($sid == '' || $sid != $userdata['session_id'])
  // {
! // 	message_die(GENERAL_ERROR, 'Invalid_session');
  // }
  //-- fin mod : profile cp --------------------------------------------------------------------------
--- 78,82 ----
  // if ($sid == '' || $sid != $userdata['session_id'])
  // {
! // 	mx_message_die(GENERAL_ERROR, 'Invalid_session');
  // }
  //-- fin mod : profile cp --------------------------------------------------------------------------
***************
*** 91,95 ****
  else
  {
! 	message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  }
  
--- 91,95 ----
  else
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  }
  
***************
*** 110,114 ****
  if ( ($profiledata['user_id'] != $userdata['user_id']) && ($userdata['user_level'] != ADMIN) )
  {
! 	message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
  }
  
--- 110,114 ----
  if ( ($profiledata['user_id'] != $userdata['user_id']) && ($userdata['user_level'] != ADMIN) )
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
  }
  
***************
*** 304,308 ****
  		);
  		$message = $lang['Profile_updated'] . '<br /><br />' . $l_from . '<br /><br />';
! 		message_die(GENERAL_MESSAGE, $message);
  
  	exit;
--- 304,308 ----
  		);
  		$message = $lang['Profile_updated'] . '<br /><br />' . $l_from . '<br /><br />';
! 		mx_message_die(GENERAL_MESSAGE, $message);
  
  	exit;
***************
*** 421,425 ****
  if ( !($result = attach_sql_query($sql)) )
  {
! 	message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql);
  }
  
--- 421,425 ----
  if ( !($result = attach_sql_query($sql)) )
  {
! 	mx_message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql);
  }
  
***************
*** 444,448 ****
  	if ( !($result = attach_sql_query($sql)) )
  	{
! 		message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql);
  	}
  
--- 444,448 ----
  	if ( !($result = attach_sql_query($sql)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 474,478 ****
  		if ( !($result = attach_sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql);
  		}
  
--- 474,478 ----
  		if ( !($result = attach_sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 491,495 ****
  				if ( !($result = attach_sql_query($sql)) )
  				{
! 					message_die(GENERAL_ERROR, 'Couldn\'t query topic', '', __LINE__, __FILE__, $sql);
  				}
  
--- 491,495 ----
  				if ( !($result = attach_sql_query($sql)) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Couldn\'t query topic', '', __LINE__, __FILE__, $sql);
  				}
  
***************
*** 516,520 ****
  				if ( !($result = attach_sql_query($sql)) )
  				{
! 					message_die(GENERAL_ERROR, 'Couldn\'t get Privmsgs Type', '', __LINE__, __FILE__, $sql);
  				}
  
--- 516,520 ----
  				if ( !($result = attach_sql_query($sql)) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Couldn\'t get Privmsgs Type', '', __LINE__, __FILE__, $sql);
  				}
  

Index: profilcp_register.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_register.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** profilcp_register.php	1 Oct 2005 14:16:27 -0000	1.6
--- profilcp_register.php	24 Oct 2005 20:18:06 -0000	1.7
***************
*** 252,260 ****
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
  		}
  		if ( !$row = $db->sql_fetchrow($result) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
  		}
  		$userrow['user_id'] = $row['total'] + 1;
--- 252,260 ----
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
  		}
  		if ( !$row = $db->sql_fetchrow($result) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
  		}
  		$userrow['user_id'] = $row['total'] + 1;
***************
*** 286,290 ****
  		if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not insert data into users table', '', __LINE__, __FILE__, $sql);
  		}
  
--- 286,290 ----
  		if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not insert data into users table', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 293,297 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not insert data into groups table', '', __LINE__, __FILE__, $sql);
  		}
  
--- 293,297 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not insert data into groups table', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 302,306 ****
  		if( !($result = $db->sql_query($sql, END_TRANSACTION)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not insert data into user_group table', '', __LINE__, __FILE__, $sql);
  		}
  
--- 302,306 ----
  		if( !($result = $db->sql_query($sql, END_TRANSACTION)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not insert data into user_group table', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 386,390 ****
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql);
  			}
  			if ( $username_changed )
--- 386,390 ----
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql);
  			}
  			if ( $username_changed )
***************
*** 395,399 ****
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql);
  				}
  			}
--- 395,399 ----
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql);
  				}
  			}
***************
*** 467,471 ****
  			"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid(this_profile_mxurl()) . '">')
  		);
! 		message_die(GENERAL_MESSAGE, $message);
  	}
  }
--- 467,471 ----
  			"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid(this_profile_mxurl()) . '">')
  		);
! 		mx_message_die(GENERAL_MESSAGE, $message);
  	}
  }
***************
*** 524,528 ****
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not update session robot', '', __LINE__, __FILE__, $sql);
  		}
  
--- 524,528 ----
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not update session robot', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 559,563 ****
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not read forum rules post', '', __LINE__, __FILE__, $sql);
  		}
  		if ($row=$db->sql_fetchrow($result))
--- 559,563 ----
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not read forum rules post', '', __LINE__, __FILE__, $sql);
  		}
  		if ($row=$db->sql_fetchrow($result))

Index: profilcp_profil_groups.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_profil_groups.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** profilcp_profil_groups.php	1 Oct 2005 14:16:27 -0000	1.2
--- profilcp_profil_groups.php	24 Oct 2005 20:18:06 -0000	1.3
***************
*** 57,61 ****
  if ( !$result = $db->sql_query($sql) ) 
  {
! 	message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql);	
  }
  $select_avail = false;
--- 57,61 ----
  if ( !$result = $db->sql_query($sql) ) 
  {
! 	mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql);	
  }
  $select_avail = false;
***************
*** 245,249 ****
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not delete group memebership data', '', __LINE__, __FILE__, $sql);
  				}
  			}
--- 245,249 ----
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not delete group memebership data', '', __LINE__, __FILE__, $sql);
  				}
  			}
***************
*** 270,274 ****
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Error reading user group', '', __LINE__, __FILE__, $sql);
  				}
  				if ( $row = $db->sql_fetchrow($result) )
--- 270,274 ----
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Error reading user group', '', __LINE__, __FILE__, $sql);
  				}
  				if ( $row = $db->sql_fetchrow($result) )
***************
*** 280,284 ****
  					if ( !$db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Error updating user group subscription', '', __LINE__, __FILE__, $sql);
  					}
  				}
--- 280,284 ----
  					if ( !$db->sql_query($sql) )
  					{
! 						mx_message_die(GENERAL_ERROR, 'Error updating user group subscription', '', __LINE__, __FILE__, $sql);
  					}
  				}
***************
*** 292,296 ****
  					if ( !$db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Error inserting user group subscription', '', __LINE__, __FILE__, $sql);
  					}
  				}
--- 292,296 ----
  					if ( !$db->sql_query($sql) )
  					{
! 						mx_message_die(GENERAL_ERROR, 'Error inserting user group subscription', '', __LINE__, __FILE__, $sql);
  					}
  				}
***************
*** 310,314 ****
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql);
  		}
  
--- 310,314 ----
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 326,330 ****
  		if ( !$db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
  		}
  	}
--- 326,330 ----
  		if ( !$db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
  		}
  	}
***************
*** 346,350 ****
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not obtain owner informations', '', __LINE__, __FILE__, $sql);
  				}
  				while ( $row = $db->sql_fetchrow($result) )
--- 346,350 ----
  				if ( !$result = $db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not obtain owner informations', '', __LINE__, __FILE__, $sql);
  				}
  				while ( $row = $db->sql_fetchrow($result) )
***************
*** 361,365 ****
  					if ( !$result = $db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Could not obtain moderator informations', '', __LINE__, __FILE__, $sql);
  					}
  					while ( $row = $db->sql_fetchrow($result) )
--- 361,365 ----
  					if ( !$result = $db->sql_query($sql) )
  					{
! 						mx_message_die(GENERAL_ERROR, 'Could not obtain moderator informations', '', __LINE__, __FILE__, $sql);
  					}
  					while ( $row = $db->sql_fetchrow($result) )
***************
*** 443,447 ****
  		$message = $action_msg;
  		$message .=  '<br /><br />' . sprintf($lang['Click_return_profilcp'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />';
! 		message_die(GENERAL_MESSAGE, $message);
  	}
  	else
--- 443,447 ----
  		$message = $action_msg;
  		$message .=  '<br /><br />' . sprintf($lang['Click_return_profilcp'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />';
! 		mx_message_die(GENERAL_MESSAGE, $message);
  	}
  	else

Index: profilcp_public_groups.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_public_groups.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** profilcp_public_groups.php	1 Oct 2005 14:16:27 -0000	1.3
--- profilcp_public_groups.php	24 Oct 2005 20:18:06 -0000	1.4
***************
*** 57,61 ****
  if ( !$result = $db->sql_query($sql) ) 
  {
! 	message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql);	
  }
  while ($row = $db->sql_fetchrow($result))
--- 57,61 ----
  if ( !$result = $db->sql_query($sql) ) 
  {
! 	mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql);	
  }
  while ($row = $db->sql_fetchrow($result))
***************
*** 92,96 ****
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				message_die(GENERAL_ERROR, 'Couldn\'t obtain viewer group list', '', __LINE__, __FILE__, $sql);
  			}
  			$is_ok = ( $row = $db->sql_fetchrow($result) );
--- 92,96 ----
  			if ( !$result = $db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Couldn\'t obtain viewer group list', '', __LINE__, __FILE__, $sql);
  			}
  			$is_ok = ( $row = $db->sql_fetchrow($result) );

Index: profilcp_public_base.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_public_base.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** profilcp_public_base.php	1 Oct 2005 14:16:27 -0000	1.3
--- profilcp_public_base.php	24 Oct 2005 20:18:06 -0000	1.4
***************
*** 89,93 ****
  if ( !$result = $db->sql_query($sql) )
  {
! 	message_die(GENERAL_ERROR, 'Could not get buddy information', '', __LINE__, __FILE__, $sql);	
  }
  while ( $row = $db->sql_fetchrow($result) )
--- 89,93 ----
  if ( !$result = $db->sql_query($sql) )
  {
! 	mx_message_die(GENERAL_ERROR, 'Could not get buddy information', '', __LINE__, __FILE__, $sql);	
  }
  while ( $row = $db->sql_fetchrow($result) )

Index: profilcp_buddy.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_buddy.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** profilcp_buddy.php	1 Oct 2005 14:16:27 -0000	1.4
--- profilcp_buddy.php	24 Oct 2005 20:18:06 -0000	1.5
***************
*** 76,80 ****
  	if ( !$result = $db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, "Could not get user information", '', __LINE__, __FILE__, $sql);
  	}
  	if ( !$userrow = $db->sql_fetchrow($result) )
--- 76,80 ----
  	if ( !$result = $db->sql_query($sql) )
  	{
! 		mx_message_die(GENERAL_ERROR, "Could not get user information", '', __LINE__, __FILE__, $sql);
  	}
  	if ( !$userrow = $db->sql_fetchrow($result) )
***************
*** 82,86 ****
  		$set = '';
  		$buddy_id = -1;
! 		message_die(GENERAL_ERROR, $lang['No_such_user']);
  	}
  }
--- 82,86 ----
  		$set = '';
  		$buddy_id = -1;
! 		mx_message_die(GENERAL_ERROR, $lang['No_such_user']);
  	}
  }
***************
*** 129,133 ****
  	if ( !$result = $db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not update buddy information', '', __LINE__, __FILE__, $sql);
  	}
  }
--- 129,133 ----
  	if ( !$result = $db->sql_query($sql) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not update buddy information', '', __LINE__, __FILE__, $sql);
  	}
  }
***************
*** 146,150 ****
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not delete buddy list entries', '', __LINE__, __FILE__, $sql);
  		}
  	}
--- 146,150 ----
  		if ( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not delete buddy list entries', '', __LINE__, __FILE__, $sql);
  		}
  	}
***************
*** 157,161 ****
  		);
  		$message = $lang['Profile_updated'] . '<br /><br />' . $l_from . '<br /><br />';
! 		message_die(GENERAL_MESSAGE, $message);
  	}
  }
--- 157,161 ----
  		);
  		$message = $lang['Profile_updated'] . '<br /><br />' . $l_from . '<br /><br />';
! 		mx_message_die(GENERAL_MESSAGE, $message);
...
 
[truncated message content]