[mxbb-commits] mx_smartor/includes album_cat.php,1.6,1.7 album_cat_sort.php,1.3,1.4 album_comment_de

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

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

Modified Files:
	album_cat.php album_cat_sort.php album_comment_delete.php 
	album_personal_cat_admin.php album_upload.php 
Log Message:
replaced all message_die with mx_message_die

Index: album_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** album_cat.php	1 Oct 2005 14:17:36 -0000	1.6
--- album_cat.php	24 Oct 2005 20:19:29 -0000	1.7
***************
*** 54,58 ****
  else
  {
! 	message_die( GENERAL_ERROR, 'No categories specified' );
  }
  // --- Album Category Hierarchy : end
--- 54,58 ----
  else
  {
! 	mx_message_die( GENERAL_ERROR, 'No categories specified' );
  }
  // --- Album Category Hierarchy : end
***************
*** 67,71 ****
  else
  {
! 	message_die( GENERAL_ERROR, 'No categories specified' );
  }
  // --- Album Category Hierarchy : begin
--- 67,71 ----
  else
  {
! 	mx_message_die( GENERAL_ERROR, 'No categories specified' );
  }
  // --- Album Category Hierarchy : begin

Index: album_cat_sort.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat_sort.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_cat_sort.php	1 Oct 2005 14:17:36 -0000	1.3
--- album_cat_sort.php	24 Oct 2005 20:19:29 -0000	1.4
***************
*** 202,206 ****
  	if ( !$result = $db->sql_query( $sql ) )
  	{
! 		message_die( GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql );
  	}
  
--- 202,206 ----
  	if ( !$result = $db->sql_query( $sql ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql );
  	}
  

Index: album_comment_delete.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/includes/album_comment_delete.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_comment_delete.php	1 Oct 2005 14:17:36 -0000	1.4
--- album_comment_delete.php	24 Oct 2005 20:19:29 -0000	1.5
***************
*** 116,120 ****
  if ( empty( $thispic ) )
  {
! 	message_die( GENERAL_ERROR, $lang['Pic_not_exist'] );
  }
  // ------------------------------------
--- 116,120 ----
  if ( empty( $thispic ) )
  {
! 	mx_message_die( GENERAL_ERROR, $lang['Pic_not_exist'] );
  }
  // ------------------------------------

Index: album_upload.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/includes/album_upload.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** album_upload.php	22 Oct 2005 11:53:36 -0000	1.5
--- album_upload.php	24 Oct 2005 20:19:29 -0000	1.6
***************
*** 70,74 ****
  		if ( !album_validate_jumpbox_selection( $cat_id ) )
  		{
! 			message_die( GENERAL_ERROR, $lang['No_valid_category_selected'] );
  		}
  
--- 70,74 ----
  		if ( !album_validate_jumpbox_selection( $cat_id ) )
  		{
! 			mx_message_die( GENERAL_ERROR, $lang['No_valid_category_selected'] );
  		}
  
***************
*** 322,326 ****
  			if ( $row['count'] >= $album_config[$check_user_limit] )
  			{
! 				message_die( GENERAL_MESSAGE, $lang['User_reached_pics_quota'] );
  			}
  
--- 322,326 ----
  			if ( $row['count'] >= $album_config[$check_user_limit] )
  			{
! 				mx_message_die( GENERAL_MESSAGE, $lang['User_reached_pics_quota'] );
  			}
  
***************
*** 347,351 ****
  		if ( ( $row['count'] >= $album_config['personal_gallery_limit'] ) and ( $album_config['personal_gallery_limit'] >= 0 ) )
  		{
! 			message_die( GENERAL_MESSAGE, $lang['Album_reached_quota'] );
  		}
  
--- 347,351 ----
  		if ( ( $row['count'] >= $album_config['personal_gallery_limit'] ) and ( $album_config['personal_gallery_limit'] >= 0 ) )
  		{
! 			mx_message_die( GENERAL_MESSAGE, $lang['Album_reached_quota'] );
  		}
  

Index: album_personal_cat_admin.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal_cat_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_personal_cat_admin.php	1 Oct 2005 14:17:36 -0000	1.3
--- album_personal_cat_admin.php	24 Oct 2005 20:19:29 -0000	1.4
***************
*** 65,69 ****
  if ( empty( $username ) )
  {
! 	message_die( GENERAL_MESSAGE, $lang['No_user_id_specified'] );
  }
  // ------------------------------------------------------------------------
--- 65,69 ----
  if ( empty( $username ) )
  {
! 	mx_message_die( GENERAL_MESSAGE, $lang['No_user_id_specified'] );
  }
  // ------------------------------------------------------------------------
***************
*** 116,120 ****
  		$message = $lang['No_Personal_Category_admin'];
  		$message .= "<br /><br />" . sprintf( $lang['Click_return_album_index'], "<a href=\"" . append_sid( album_append_uid( this_smartor_mxurl() ) ) . "\">", "</a>" );
! 		message_die( GENERAL_MESSAGE, $message );
  		exit(); // really not needed
  	}
--- 116,120 ----
  		$message = $lang['No_Personal_Category_admin'];
  		$message .= "<br /><br />" . sprintf( $lang['Click_return_album_index'], "<a href=\"" . append_sid( album_append_uid( this_smartor_mxurl() ) ) . "\">", "</a>" );
! 		mx_message_die( GENERAL_MESSAGE, $message );
  		exit(); // really not needed
  	}
***************
*** 141,145 ****
  	}
  
! 	message_die( GENERAL_MESSAGE, $message );
  }
  // ------------------------------------------------------------------------
--- 141,145 ----
  	}
  
! 	mx_message_die( GENERAL_MESSAGE, $message );
  }
  // ------------------------------------------------------------------------
***************
*** 189,193 ****
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, 'Could not query number of sub category for user' , '' , __LINE__, __FILE__, $sql );
  		}
  
--- 189,193 ----
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Could not query number of sub category for user' , '' , __LINE__, __FILE__, $sql );
  		}
  
***************
*** 232,241 ****
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql );
  				}
  
  				if ( $db->sql_numrows( $result ) == 0 )
  				{
! 					message_die( GENERAL_ERROR, 'The requested category is not existed' );
  				}
  
--- 232,241 ----
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					mx_message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql );
  				}
  
  				if ( $db->sql_numrows( $result ) == 0 )
  				{
! 					mx_message_die( GENERAL_ERROR, 'The requested category is not existed' );
  				}
  
***************
*** 345,349 ****
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql );
  			}
  
--- 345,349 ----
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql );
  			}
  
***************
*** 363,367 ****
  			if ( $cat_found == false )
  			{
! 				message_die( GENERAL_ERROR, 'The requested category is not existed' );
  			}
  
--- 363,367 ----
  			if ( $cat_found == false )
  			{
! 				mx_message_die( GENERAL_ERROR, 'The requested category is not existed' );
  			}
  
***************
*** 519,523 ****
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql );
  			}
  			$row = $db->sql_fetchrow( $result );
--- 519,523 ----
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql );
  			}
  			$row = $db->sql_fetchrow( $result );
***************
*** 530,534 ****
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not create new Album Category', '', __LINE__, __FILE__, $sql );
  			} 
  			// Return a message...
--- 530,534 ----
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not create new Album Category', '', __LINE__, __FILE__, $sql );
  			} 
  			// Return a message...
***************
*** 567,571 ****
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, 'Could not update this Album Category', '', __LINE__, __FILE__, $sql );
  		} 
  		// Return a message...
--- 567,571 ----
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Could not update this Album Category', '', __LINE__, __FILE__, $sql );
  		} 
  		// Return a message...
***************
*** 587,591 ****
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not query Album information for existing child categories', '', __LINE__, __FILE__, $sql );
  			} 
  			// the selected category is parent to another...proceed
--- 587,591 ----
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not query Album information for existing child categories', '', __LINE__, __FILE__, $sql );
  			} 
  			// the selected category is parent to another...proceed
***************
*** 611,615 ****
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					message_die( GENERAL_ERROR, 'Could not query Album information for existing parent categories', '', __LINE__, __FILE__, $sql );
  				}
  
--- 611,615 ----
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					mx_message_die( GENERAL_ERROR, 'Could not query Album information for existing parent categories', '', __LINE__, __FILE__, $sql );
  				}
  
***************
*** 633,637 ****
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not query Album information', '', __LINE__, __FILE__, $sql );
  			}
  			$picrow = array();
--- 633,637 ----
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not query Album information', '', __LINE__, __FILE__, $sql );
  			}
  			$picrow = array();
***************
*** 663,667 ****
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					message_die( GENERAL_ERROR, 'Could not delete Ratings information', '', __LINE__, __FILE__, $sql );
  				} 
  				// Delete all related comments
--- 663,667 ----
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					mx_message_die( GENERAL_ERROR, 'Could not delete Ratings information', '', __LINE__, __FILE__, $sql );
  				} 
  				// Delete all related comments
***************
*** 670,674 ****
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					message_die( GENERAL_ERROR, 'Could not delete Comments information', '', __LINE__, __FILE__, $sql );
  				} 
  				// Delete pic entries in db
--- 670,674 ----
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					mx_message_die( GENERAL_ERROR, 'Could not delete Comments information', '', __LINE__, __FILE__, $sql );
  				} 
  				// Delete pic entries in db
***************
*** 677,681 ****
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					message_die( GENERAL_ERROR, 'Could not delete pic entries in the DB', '', __LINE__, __FILE__, $sql );
  				}
  			} 
--- 677,681 ----
  				if ( !$result = $db->sql_query( $sql ) )
  				{
! 					mx_message_die( GENERAL_ERROR, 'Could not delete pic entries in the DB', '', __LINE__, __FILE__, $sql );
  				}
  			} 
***************
*** 685,689 ****
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql );
  			} 
  			// Re-order the rest of categories
--- 685,689 ----
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql );
  			} 
  			// Re-order the rest of categories
***************
*** 700,704 ****
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not update this Category content', '', __LINE__, __FILE__, $sql );
  			} 
  			// This category is now emptied, we can remove it!
--- 700,704 ----
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not update this Category content', '', __LINE__, __FILE__, $sql );
  			} 
  			// This category is now emptied, we can remove it!
***************
*** 707,711 ****
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql );
  			} 
  			// Re-order the rest of categories
--- 707,711 ----
  			if ( !$result = $db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql );
  			} 
  			// Re-order the rest of categories

[mxbb-commits] mx_smartor/includes album_cat.php,1.6,1.7 album_cat_sort.php,1.3,1.4 album_comment_de

[mxbb-commits] mx_smartor/includes album_cat.php,1.6,1.7 album_cat_sort.php,1.3,1.4 album_comment_delete.php,1.4,1.5 album_personal_cat_admin.php,1.3,1.4 album_upload.php,1.5,1.6