[mxbb-commits] mx_kb/includes functions_kb.php,1.35,1.36 functions_kb_auth.php,1.4,1.5 functions_kb_

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/mx_kb/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv824/modules/mx_kb/includes

Modified Files:
	functions_kb.php functions_kb_auth.php functions_kb_mx.php 
	kb_article.php kb_rate.php 
Log Message:
replaced all message_die with mx_message_die

Index: kb_rate.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/includes/kb_rate.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** kb_rate.php	1 Oct 2005 14:13:47 -0000	1.12
--- kb_rate.php	24 Oct 2005 20:15:32 -0000	1.13
***************
*** 32,36 ****
  else
  {
! 	// message_die(GENERAL_MESSAGE, 'no category');
  }
  
--- 32,36 ----
  else
  {
! 	// mx_message_die(GENERAL_MESSAGE, 'no category');
  }
  
***************
*** 41,45 ****
  else
  {
! 	message_die( GENERAL_MESSAGE, 'no article' );
  }
  
--- 41,45 ----
  else
  {
! 	mx_message_die( GENERAL_MESSAGE, 'no article' );
  }
  
***************
*** 73,77 ****
  if ( !( $result = $db->sql_query( $sql ) ) )
  {
! 	message_die( GENERAL_ERROR, 'Couldnt Query Article info', '', __LINE__, __FILE__, $sql );
  }
  $article = $db->sql_fetchrow( $result );
--- 73,77 ----
  if ( !( $result = $db->sql_query( $sql ) ) )
  {
! 	mx_message_die( GENERAL_ERROR, 'Couldnt Query Article info', '', __LINE__, __FILE__, $sql );
  }
  $article = $db->sql_fetchrow( $result );
***************
*** 80,84 ****
  if ( !( $result = $db->sql_query( $sql ) ) )
  {
! 	message_die( GENERAL_ERROR, 'Couldnt Query category info for this article', '', __LINE__, __FILE__, $sql );
  }
  $category = $db->sql_fetchrow( $result );
--- 80,84 ----
  if ( !( $result = $db->sql_query( $sql ) ) )
  {
! 	mx_message_die( GENERAL_ERROR, 'Couldnt Query category info for this article', '', __LINE__, __FILE__, $sql );
  }
  $category = $db->sql_fetchrow( $result );
***************
*** 165,169 ****
  	if ( !( $insert = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Couldnt Update rating table', '', __LINE__, __FILE__, $sql );
  	}
  
--- 165,169 ----
  	if ( !( $insert = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Couldnt Update rating table', '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 199,203 ****
  	}
  
! 	message_die( GENERAL_MESSAGE, $message );
  }
  else
--- 199,203 ----
  	}
  
! 	mx_message_die( GENERAL_MESSAGE, $message );
  }
  else

Index: functions_kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/includes/functions_kb.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** functions_kb.php	1 Oct 2005 14:13:47 -0000	1.35
--- functions_kb.php	24 Oct 2005 20:15:32 -0000	1.36
***************
*** 116,120 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain article type data", '', __LINE__, __FILE__, $sql );
  	}
  
--- 116,120 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain article type data", '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 139,143 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		// message_die(GENERAL_ERROR, "Could not obtain category data", '', __LINE__, __FILE__, $sql);
  	}
  
--- 139,143 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		// mx_message_die(GENERAL_ERROR, "Could not obtain category data", '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 160,164 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain category data", '', __LINE__, __FILE__, $sql );
  	}
  
--- 160,164 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain category data", '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 224,228 ****
  	if ( !( $article_result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql );
  	}
  
--- 224,228 ----
  	if ( !( $article_result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 522,526 ****
  	if ( !( $results = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql );
  	}
  	
--- 522,526 ----
  	if ( !( $results = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql );
  	}
  	
***************
*** 668,672 ****
     if ( !($result = $db->sql_query($sql)) )
     {
!       message_die(GENERAL_MESSAGE, $lang['No_such_user']);
     }
  
--- 668,672 ----
     if ( !($result = $db->sql_query($sql)) )
     {
!       mx_message_die(GENERAL_MESSAGE, $lang['No_such_user']);
     }
  
***************
*** 685,689 ****
           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);
--- 685,689 ----
           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);
***************
*** 694,698 ****
           if ( !$db->sql_query($sql) )
           {
!             message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql);
           }
  
--- 694,698 ----
           if ( !$db->sql_query($sql) )
           {
!             mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql);
           }
  
***************
*** 701,705 ****
           if ( !$db->sql_query($sql) )
           {
!             message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql);
           }
        }
--- 701,705 ----
           if ( !$db->sql_query($sql) )
           {
!             mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql);
           }
        }
***************
*** 711,715 ****
     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);
     }
  
--- 711,715 ----
     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);
     }
  
***************
*** 721,725 ****
     if ( !$db->sql_query($sql, END_TRANSACTION) )
     {
!       message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql);
     }
  
--- 721,725 ----
     if ( !$db->sql_query($sql, END_TRANSACTION) )
     {
!       mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql);
     }
  
***************
*** 732,736 ****
     if ( !$status = $db->sql_query($sql) )
     {
!       message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql);
     }
  
--- 732,736 ----
     if ( !$status = $db->sql_query($sql) )
     {
!       mx_message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql);
     }
  
***************
*** 769,773 ****
     $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()
--- 769,773 ----
     $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()
***************
*** 868,872 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain category data", '', __LINE__, __FILE__, $sql );
  	}
  
--- 868,872 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain category data", '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 945,954 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain sub-category data", '', __LINE__, __FILE__, $sql );
  	}
  
  	if ( !( $result2 = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain sub-category data", '', __LINE__, __FILE__, $sql );
  	}
  
--- 945,954 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain sub-category data", '', __LINE__, __FILE__, $sql );
  	}
  
  	if ( !( $result2 = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain sub-category data", '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 1048,1052 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain sub-category data", '', __LINE__, __FILE__, $sql );
  	}
  
--- 1048,1052 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain sub-category data", '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 1119,1123 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain sub-category data", '', __LINE__, __FILE__, $sql );
  	}
  
--- 1119,1123 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain sub-category data", '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 1343,1347 ****
  
      $bbcode_uid = ($bbcode_on) ? make_bbcode_uid() : ''; 
!     $error_die_function = ($error_die_function == '') ? "message_die" : $error_die_function;
      $current_time = ($current_time == 0) ? time() : $current_time;
      
--- 1343,1347 ----
  
      $bbcode_uid = ($bbcode_on) ? make_bbcode_uid() : ''; 
!     $error_die_function = ($error_die_function == '') ? "mx_message_die" : $error_die_function;
      $current_time = ($current_time == 0) ? time() : $current_time;
      
***************
*** 1453,1457 ****
  	if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql );
  	} 
  		
--- 1453,1457 ----
  	if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql );
  	} 
  		
***************
*** 1466,1470 ****
  	if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql );
  	} 
  	// End kb addon coe ----------------------------------------------------------
--- 1466,1470 ----
  	if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql );
  	} 
  	// End kb addon coe ----------------------------------------------------------
***************
*** 1546,1550 ****
  	if ( $topic_id == '' )
  	{
! 		message_die( GENERAL_MESSAGE, 'no topic id' );
  	}
  
--- 1546,1550 ----
  	if ( $topic_id == '' )
  	{
! 		mx_message_die( GENERAL_MESSAGE, 'no topic id' );
  	}
  
***************
*** 1568,1572 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, "Could not obtain post/user information.", '', __LINE__, __FILE__, $sql );
  	}
  
--- 1568,1572 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Could not obtain post/user information.", '', __LINE__, __FILE__, $sql );
  	}
  

Index: kb_article.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/includes/kb_article.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** kb_article.php	1 Oct 2005 14:13:47 -0000	1.23
--- kb_article.php	24 Oct 2005 20:15:32 -0000	1.24
***************
*** 33,37 ****
  if ( !( $result = $db->sql_query( $sql ) ) )
  {
! 	message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql );
  }
  
--- 33,37 ----
  if ( !( $result = $db->sql_query( $sql ) ) )
  {
! 	mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql );
  }
  
***************
*** 142,146 ****
  if ( !( $result2 = $db->sql_query( $sql ) ) )
  {
! 	message_die( GENERAL_ERROR, "Could not update article's views", '', __LINE__, __FILE__, $sql );
  } 
  
--- 142,146 ----
  if ( !( $result2 = $db->sql_query( $sql ) ) )
  {
! 	mx_message_die( GENERAL_ERROR, "Could not update article's views", '', __LINE__, __FILE__, $sql );
  } 
  

Index: functions_kb_mx.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/includes/functions_kb_mx.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** functions_kb_mx.php	1 Oct 2005 14:13:47 -0000	1.6
--- functions_kb_mx.php	24 Oct 2005 20:15:32 -0000	1.7
***************
*** 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_kb_auth.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/includes/functions_kb_auth.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** functions_kb_auth.php	1 Oct 2005 14:13:47 -0000	1.4
--- functions_kb_auth.php	24 Oct 2005 20:15:32 -0000	1.5
***************
*** 112,116 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql);
  		}
  
--- 112,116 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql);
  		}
  
***************
*** 138,142 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql);
  		}
  
--- 138,142 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql);
  		}

[mxbb-commits] mx_kb/includes functions_kb.php,1.35,1.36 functions_kb_auth.php,1.4,1.5 functions_kb_

[mxbb-commits] mx_kb/includes functions_kb.php,1.35,1.36 functions_kb_auth.php,1.4,1.5 functions_kb_mx.php,1.6,1.7 kb_article.php,1.23,1.24 kb_rate.php,1.12,1.13