[mxbb-commits] mx_pafiledb/pafiledb/includes functions.php,1.16,1.17 functions_comment.php,1.13,1.14 functions_field.php,1.5,1.6 functions_mx.php,1.3,1.4 functions_pafiledb.php,1.20,1.21 template.php,1.7,1.8

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1468/modules/mx_pafiledb/pafiledb/includes

Modified Files:
	functions.php functions_comment.php functions_field.php 
	functions_mx.php functions_pafiledb.php template.php 
Log Message:
replaced all message_die with mx_message_die

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** functions.php	1 Oct 2005 14:15:19 -0000	1.16
--- functions.php	24 Oct 2005 20:16:56 -0000	1.17
***************
*** 35,39 ****
  		if ( !$db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );
  		}
  		// This beats me??? What for??
--- 35,39 ----
  		if ( !$db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );
  		}
  		// This beats me??? What for??
***************
*** 45,49 ****
  			if ( !$db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );
  			}
  		}
--- 45,49 ----
  			if ( !$db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 127,131 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query info', '', __LINE__, __FILE__, $sql );
  		}
  
--- 127,131 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query info', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 270,274 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt query Download configuration', '', __LINE__, __FILE__, $sql );
  		}
  
--- 270,274 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt query Download configuration', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 299,303 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt query Download URL', '', __LINE__, __FILE__, $sql );
  			}
  
--- 299,303 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt query Download URL', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 376,380 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not update filesize', '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 376,380 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not update filesize', '', __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 406,410 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt rating info for the giving file', '', __LINE__, __FILE__, $sql );
  		}
  
--- 406,410 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt rating info for the giving file', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 555,559 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, "Could not obtain ranks information.", '', __LINE__, __FILE__, $sql );
  			}
  
--- 555,559 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, "Could not obtain ranks information.", '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 896,900 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query User id', '', __LINE__, __FILE__, $sql );
  		}
  
--- 896,900 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query User id', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 905,909 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt Update Downloader Table Info', '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 905,909 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt Update Downloader Table Info', '', __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 926,930 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query User id', '', __LINE__, __FILE__, $sql );
  		}
  
--- 926,930 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query User id', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 935,944 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt Update Votes Table Info', '', __LINE__, __FILE__, $sql );
  			}
  		}
  		else
  		{
! 			message_die( GENERAL_MESSAGE, $lang['Rerror'] );
  		}
  
--- 935,944 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt Update Votes Table Info', '', __LINE__, __FILE__, $sql );
  			}
  		}
  		else
  		{
! 			mx_message_die( GENERAL_MESSAGE, $lang['Rerror'] );
  		}
  
***************
*** 1068,1072 ****
     if ( !($result = $db->sql_query($sql)) )
     {
!       message_die(GENERAL_MESSAGE, $lang['No_such_user']);
     }
  
--- 1068,1072 ----
     if ( !($result = $db->sql_query($sql)) )
     {
!       mx_message_die(GENERAL_MESSAGE, $lang['No_such_user']);
     }
  
***************
*** 1085,1089 ****
           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);
--- 1085,1089 ----
           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);
***************
*** 1094,1098 ****
           if ( !$db->sql_query($sql) )
           {
!             message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql);
           }
  
--- 1094,1098 ----
           if ( !$db->sql_query($sql) )
           {
!             mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql);
           }
  
***************
*** 1101,1105 ****
           if ( !$db->sql_query($sql) )
           {
!             message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql);
           }
        }
--- 1101,1105 ----
           if ( !$db->sql_query($sql) )
           {
!             mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql);
           }
        }
***************
*** 1111,1115 ****
     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);
     }
  
--- 1111,1115 ----
     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);
     }
  
***************
*** 1121,1125 ****
     if ( !$db->sql_query($sql, END_TRANSACTION) )
     {
!       message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql);
     }
  
--- 1121,1125 ----
     if ( !$db->sql_query($sql, END_TRANSACTION) )
     {
!       mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql);
     }
  
***************
*** 1132,1136 ****
     if ( !$status = $db->sql_query($sql) )
     {
!       message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql);
     }
  
--- 1132,1136 ----
     if ( !$status = $db->sql_query($sql) )
     {
!       mx_message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql);
     }
  
***************
*** 1169,1173 ****
     $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
!    message_die(GENERAL_MESSAGE, $msg);
  
  } // insert_pm()
--- 1169,1173 ----
     $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
!    mx_message_die(GENERAL_MESSAGE, $msg);
  
  } // insert_pm()
***************
*** 1320,1324 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query file info', '', __LINE__, __FILE__, $sql );
  		} 
  		// ===================================================
--- 1320,1324 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query file info', '', __LINE__, __FILE__, $sql );
  		} 
  		// ===================================================
***************
*** 1327,1331 ****
  		if ( !$file_data = $db->sql_fetchrow( $result ) )
  		{
! 			message_die( GENERAL_MESSAGE, $lang['File_not_exist'] );
  		}
  		$db->sql_freeresult( $result ); 
--- 1327,1331 ----
  		if ( !$file_data = $db->sql_fetchrow( $result ) )
  		{
! 			mx_message_die( GENERAL_MESSAGE, $lang['File_not_exist'] );
  		}
  		$db->sql_freeresult( $result ); 

Index: functions_mx.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_mx.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functions_mx.php	1 Oct 2005 14:15:19 -0000	1.3
--- functions_mx.php	24 Oct 2005 20:16:56 -0000	1.4
***************
*** 93,97 ****
  					if ( !( $result = $db->sql_query( $sql ) ) )
  					{
! 						message_die( GENERAL_ERROR, "Could not query group rights information", '', '', '', '' );
  					}			
  					
--- 93,97 ----
  					if ( !( $result = $db->sql_query( $sql ) ) )
  					{
! 						mx_message_die( GENERAL_ERROR, "Could not query group rights information", '', '', '', '' );
  					}			
  					
***************
*** 112,116 ****
  					if ( !( $result = $db->sql_query( $sql ) ) )
  					{
! 						message_die( GENERAL_ERROR, "Could not query group rights information", '', '', '', '' );
  					}				
  					
--- 112,116 ----
  					if ( !( $result = $db->sql_query( $sql ) ) )
  					{
! 						mx_message_die( GENERAL_ERROR, "Could not query group rights information", '', '', '', '' );
  					}				
  					

Index: functions_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_comment.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** functions_comment.php	1 Oct 2005 14:15:19 -0000	1.13
--- functions_comment.php	24 Oct 2005 20:16:56 -0000	1.14
***************
*** 52,56 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Couldnt select comments', '', __LINE__, __FILE__, $sql );
  	}
  
--- 52,56 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Couldnt select comments', '', __LINE__, __FILE__, $sql );
  	}
  

Index: template.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/template.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** template.php	1 Oct 2005 14:15:20 -0000	1.7
--- template.php	24 Oct 2005 20:16:56 -0000	1.8
***************
*** 111,115 ****
  			if ( empty( $filename ) )
  			{
! 				message_die( GENERAL_ERROR, "Template error - Empty filename specified for $handle" );
  			}
  
--- 111,115 ----
  			if ( empty( $filename ) )
  			{
! 				mx_message_die( GENERAL_ERROR, "Template error - Empty filename specified for $handle" );
  			}
  
***************
*** 173,177 ****
  		if ( !isset( $this->files[$handle] ) )
  		{
! 			message_die( GENERAL_ERROR, "Pafiledb Template->loadfile(): No file specified for handle $handle" );
  		}
  
--- 173,177 ----
  		if ( !isset( $this->files[$handle] ) )
  		{
! 			mx_message_die( GENERAL_ERROR, "Pafiledb Template->loadfile(): No file specified for handle $handle" );
  		}
  
***************
*** 180,184 ****
  		if ( !( $fp = @fopen( $this->files[$handle], 'r' ) ) )
  		{
! 			message_die( GENERAL_ERROR, "Pafiledb Template->_tpl_load(): File $filename does not exist or is empty" );
  		}
  
--- 180,184 ----
  		if ( !( $fp = @fopen( $this->files[$handle], 'r' ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, "Pafiledb Template->_tpl_load(): File $filename does not exist or is empty" );
  		}
  

Index: functions_field.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_field.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** functions_field.php	1 Oct 2005 14:15:19 -0000	1.5
--- functions_field.php	24 Oct 2005 20:16:56 -0000	1.6
***************
*** 41,45 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query Custom field', '', __LINE__, __FILE__, $sql );
  		}
  
--- 41,45 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query Custom field', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 56,60 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query Custom field', '', __LINE__, __FILE__, $sql );
  		}
  
--- 56,60 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query Custom field', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 130,134 ****
  						if ( !( $db->sql_query( $sql ) ) )
  						{
! 							message_die( GENERAL_ERROR, 'Could not delete custom data', '', __LINE__, __FILE__, $sql );
  						}
  					}
--- 130,134 ----
  						if ( !( $db->sql_query( $sql ) ) )
  						{
! 							mx_message_die( GENERAL_ERROR, 'Could not delete custom data', '', __LINE__, __FILE__, $sql );
  						}
  					}
***************
*** 337,346 ****
  		if ( empty( $field_name ) )
  		{
! 			message_die( GENERAL_ERROR, $lang['Missing_field'] );
  		}
  
  		if ( ( ( $field_type != INPUT && $field_type != TEXTAREA ) && empty( $data ) ) )
  		{
! 			message_die( GENERAL_ERROR, $lang['Missing_field'] );
  		}
  
--- 337,346 ----
  		if ( empty( $field_name ) )
  		{
! 			mx_message_die( GENERAL_ERROR, $lang['Missing_field'] );
  		}
  
  		if ( ( ( $field_type != INPUT && $field_type != TEXTAREA ) && empty( $data ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, $lang['Missing_field'] );
  		}
  
***************
*** 352,356 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not add the new fields', '', __LINE__, __FILE__, $sql );
  			}
  
--- 352,356 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not add the new fields', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 363,367 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not set the order for the giving field', '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 363,367 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not set the order for the giving field', '', __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 374,378 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not update information for the giving field', '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 374,378 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not update information for the giving field', '', __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 388,392 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Could not delete custom data', '', __LINE__, __FILE__, $sql );
  		}
  
--- 388,392 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Could not delete custom data', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 396,400 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Could not delete the selected field', '', __LINE__, __FILE__, $sql );
  		}
  	}
--- 396,400 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Could not delete the selected field', '', __LINE__, __FILE__, $sql );
  		}
  	}
***************
*** 446,450 ****
  				if ( !$db->sql_query( $sql ) )
  				{
! 					message_die( GENERAL_ERROR, 'Could not delete data from custom data table', '', __LINE__, __FILE__, $sql );
  				}
  
--- 446,450 ----
  				if ( !$db->sql_query( $sql ) )
  				{
! 					mx_message_die( GENERAL_ERROR, 'Could not delete data from custom data table', '', __LINE__, __FILE__, $sql );
  				}
  
***************
*** 456,460 ****
  					if ( !$db->sql_query( $sql ) )
  					{
! 						message_die( GENERAL_ERROR, 'Could not add additional data', '', __LINE__, __FILE__, $sql );
  					}
  				}
--- 456,460 ----
  					if ( !$db->sql_query( $sql ) )
  					{
! 						mx_message_die( GENERAL_ERROR, 'Could not add additional data', '', __LINE__, __FILE__, $sql );
  					}
  				}

Index: functions_pafiledb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** functions_pafiledb.php	22 Oct 2005 10:56:15 -0000	1.20
--- functions_pafiledb.php	24 Oct 2005 20:16:56 -0000	1.21
***************
*** 113,117 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql );
  		}
  		$cat_rowset = $db->sql_fetchrowset( $result );
--- 113,117 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql );
  		}
  		$cat_rowset = $db->sql_fetchrowset( $result );
***************
*** 272,276 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  			}
  
--- 272,276 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 291,295 ****
  				if ( !( $db->sql_query( $sql ) ) )
  				{
! 					message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  				}
  			}
--- 291,295 ----
  				if ( !( $db->sql_query( $sql ) ) )
  				{
! 					mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  				}
  			}
***************
*** 320,324 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 320,324 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 412,416 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  			}
  
--- 412,416 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 427,431 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 427,431 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 455,459 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  		}
  
--- 455,459 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 509,513 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Failed obtaining category access control lists', '', __LINE__, __FILE__, $sql );
  			}
  
--- 509,513 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Failed obtaining category access control lists', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 718,722 ****
  		if ( $this->cat_empty() )
  		{
! 			message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' );
  		}
  
--- 718,722 ----
  		if ( $this->cat_empty() )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' );
  		}
  
***************
*** 882,886 ****
  		if ( $this->cat_empty() )
  		{
! 			message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' );
  		}
  
--- 882,886 ----
  		if ( $this->cat_empty() )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' );
  		}
  
***************
*** 1090,1094 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1090,1094 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1139,1143 ****
  		if ( !( $result = $pafiledb_functions->sql_query_limit( $sql, $pafiledb_config['settings_file_page'], $start ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1139,1143 ----
  		if ( !( $result = $pafiledb_functions->sql_query_limit( $sql, $pafiledb_config['settings_file_page'], $start ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1160,1164 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldn\'t get number of file', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1160,1164 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldn\'t get number of file', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1375,1379 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1375,1379 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1422,1426 ****
  		if ( !( $result = $pafiledb_functions->sql_query_limit( $sql, $pafiledb_config['settings_file_page'], $start ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1422,1426 ----
  		if ( !( $result = $pafiledb_functions->sql_query_limit( $sql, $pafiledb_config['settings_file_page'], $start ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1443,1447 ****
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldn\'t get number of file', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1443,1447 ----
  		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldn\'t get number of file', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1650,1654 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldn\'t add a new category', '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 1650,1654 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldn\'t add a new category', '', __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 1661,1665 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldn\'t Edit this category', '', __LINE__, __FILE__, $sql );
  			}
  
--- 1661,1665 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldn\'t Edit this category', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 1717,1721 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt Query Info', '', __LINE__, __FILE__, $sql );
  			}
  
--- 1717,1721 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt Query Info', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 1758,1762 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt select files', '', __LINE__, __FILE__, $sql );
  			}
  
--- 1758,1762 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt select files', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 1777,1781 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt select files', '', __LINE__, __FILE__, $sql );
  			}
  
--- 1777,1781 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt select files', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 1792,1796 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt delete files', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1792,1796 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt delete files', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1802,1806 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt delete custom data', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1802,1806 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt delete custom data', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1810,1814 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt delete mirror for this file', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1810,1814 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt delete mirror for this file', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1849,1853 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt move files', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1849,1853 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt move files', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1874,1878 ****
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt Query Info', '', __LINE__, __FILE__, $sql );
  			}
  
--- 1874,1878 ----
  			if ( !( $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt Query Info', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 1900,1904 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt move Sub Category', '', __LINE__, __FILE__, $sql );
  		}
  		$this->modified( true );
--- 1900,1904 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt move Sub Category', '', __LINE__, __FILE__, $sql );
  		}
  		$this->modified( true );
***************
*** 1917,1921 ****
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, 'Could not get list of Categories', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1917,1921 ----
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Could not get list of Categories', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1930,1934 ****
  			if ( !$db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not update order fields', '', __LINE__, __FILE__, $sql );
  			}
  			$i += 10;
--- 1930,1934 ----
  			if ( !$db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not update order fields', '', __LINE__, __FILE__, $sql );
  			}
  			$i += 10;
***************
*** 1949,1953 ****
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, 'Could not change category order', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1949,1953 ----
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Could not change category order', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1969,1973 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql );
  		}
  
--- 1969,1973 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 1981,1985 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  		}
  		if ( $init )
--- 1981,1985 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql );
  		}
  		if ( $init )
***************
*** 2088,2092 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt query Download URL', '', __LINE__, __FILE__, $sql );
  			}
  
--- 2088,2092 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt query Download URL', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 2127,2131 ****
  			if ( $file_info['error'] )
  			{
! 				message_die( GENERAL_ERROR, $file_info['message'] );
  			}
  		}
--- 2127,2131 ----
  			if ( $file_info['error'] )
  			{
! 				mx_message_die( GENERAL_ERROR, $file_info['message'] );
  			}
  		}
***************
*** 2139,2143 ****
  				if ( $screen_shot_info['error'] )
  				{
! 					message_die( GENERAL_ERROR, $screen_shot_info['message'] );
  				}
  				$screen_shot_url = $screen_shot_info['url'];
--- 2139,2143 ----
  				if ( $screen_shot_info['error'] )
  				{
! 					mx_message_die( GENERAL_ERROR, $screen_shot_info['message'] );
  				}
  				$screen_shot_url = $screen_shot_info['url'];
***************
*** 2198,2202 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql );
  		}
  		$this->modified( true );
--- 2198,2202 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql );
  		}
  		$this->modified( true );
***************
*** 2247,2251 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Couldnt query Download URL', '', __LINE__, __FILE__, $sql );
  			}
  
--- 2247,2251 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Couldnt query Download URL', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 2282,2286 ****
  			if ( $file_info['error'] )
  			{
! 				message_die( GENERAL_ERROR, $file_info['message'] );
  			}
  		}
--- 2282,2286 ----
  			if ( $file_info['error'] )
  			{
! 				mx_message_die( GENERAL_ERROR, $file_info['message'] );
  			}
  		}
***************
*** 2304,2308 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql );
  		}
  	}
--- 2304,2308 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql );
  		}
  	}
***************
*** 2319,2323 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt delete mirror for this file', '', __LINE__, __FILE__, $sql );
  		}
  	}
--- 2319,2323 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt delete mirror for this file', '', __LINE__, __FILE__, $sql );
  		}
  	}
***************
*** 2340,2344 ****
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql );
  		}
  
--- 2340,2344 ----
  		if ( !( $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql );
  		}
  
***************
*** 2381,2385 ****
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql );
  			} 
  			// added by snake for extended PM
--- 2381,2385 ----
  			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql );
  			} 
  			// added by snake for extended PM
***************
*** 2389,2393 ****
  			if ( !( $article_result = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql );
  			}
  
--- 2389,2393 ----
  			if ( !( $article_result = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 2462,2466 ****
  			if ( !$db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql );
  			}
  			$privmsg_sent_id = $db->sql_nextid();
--- 2462,2466 ----
  			if ( !$db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql );
  			}
  			$privmsg_sent_id = $db->sql_nextid();
***************
*** 2470,2474 ****
  			if ( !$db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not insert private message sent text', '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 2470,2474 ----
  			if ( !$db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not insert private message sent text', '', __LINE__, __FILE__, $sql );
  			}
  		}