[mxbb-commits] mx_calsnails calendar.php,1.18,1.19 db_install.php,1.15,1.16 db_upgrade.php,1.9,1.10

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

Update of /cvsroot/mxbb/mx_calsnails
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv546/modules/mx_calsnails

Modified Files:
	calendar.php db_install.php db_upgrade.php 
	mx_calendar_events.php mx_calendar_query.php 
Log Message:
replaced all message_die with mx_message_die

Index: mx_calendar_events.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/mx_calendar_events.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mx_calendar_events.php	23 Oct 2005 18:49:18 -0000	1.13
--- mx_calendar_events.php	24 Oct 2005 20:13:55 -0000	1.14
***************
*** 163,167 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Could not select Event data', '', __LINE__, __FILE__, $sql );
  	} 
  	
--- 163,167 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not select Event data', '', __LINE__, __FILE__, $sql );
  	} 
  	

Index: mx_calendar_query.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/mx_calendar_query.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mx_calendar_query.php	23 Oct 2005 18:49:18 -0000	1.8
--- mx_calendar_query.php	24 Oct 2005 20:13:55 -0000	1.9
***************
*** 78,82 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Could not select Event data', '', __LINE__, __FILE__, $sql );
  	}
  	$check = 0;
--- 78,82 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not select Event data', '', __LINE__, __FILE__, $sql );
  	}
  	$check = 0;

Index: calendar.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/calendar.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** calendar.php	23 Oct 2005 18:49:18 -0000	1.18
--- calendar.php	24 Oct 2005 20:13:55 -0000	1.19
***************
*** 96,100 ****
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, "Could not query CalSnails module information", "", __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $result );
--- 96,100 ----
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, "Could not query CalSnails module information", "", __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $result );
***************
*** 237,241 ****
  if(!$result = $db->sql_query($sql))
  {
! 	message_die(GENERAL_ERROR, "Couldn't query calendar config table", "", __LINE__, __FILE__, $sql);
  }
  else
--- 237,241 ----
  if(!$result = $db->sql_query($sql))
  {
! 	mx_message_die(GENERAL_ERROR, "Couldn't query calendar config table", "", __LINE__, __FILE__, $sql);
  }
  else
***************
*** 334,338 ****
  // $er_msg =  $lang['Cal_not_enough_access'];
  // $er_msg .= $lang['Cal_must_member'];
! // message_die(GENERAL_MESSAGE, $er_msg);
  // }
  
--- 334,338 ----
  // $er_msg =  $lang['Cal_not_enough_access'];
  // $er_msg .= $lang['Cal_must_member'];
! // mx_message_die(GENERAL_MESSAGE, $er_msg);
  // }
  
***************
*** 514,518 ****
  						if ( !( $query = $db->sql_query( $sql ) ) )
  						{
! 							message_die( GENERAL_ERROR, 'Could not validate events', '', __LINE__, __FILE__, $sql );
  						}
  					}
--- 514,518 ----
  						if ( !( $query = $db->sql_query( $sql ) ) )
  						{
! 							mx_message_die( GENERAL_ERROR, 'Could not validate events', '', __LINE__, __FILE__, $sql );
  						}
  					}
***************
*** 521,525 ****
  				$url = append_sid( this_mxurl( "month=" . $month . "&amp;year=" . $year ) );
  				$message .= "</br></br><a href='" . $url . "'>" . $lang['Cal_back2cal'] . "</a>";
! 				message_die( GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, '' ); 
  				// end of case
  				break;
--- 521,525 ----
  				$url = append_sid( this_mxurl( "month=" . $month . "&amp;year=" . $year ) );
  				$message .= "</br></br><a href='" . $url . "'>" . $lang['Cal_back2cal'] . "</a>";
! 				mx_message_die( GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, '' ); 
  				// end of case
  				break;
***************
*** 530,534 ****
  				if ( !( $query = $db->sql_query( $sql ) ) )
  				{
! 					message_die( GENERAL_ERROR, 'Could not get events list to validate', '', __LINE__, __FILE__, $sql );
  				}
  				$url = append_sid( this_mxurl( "month=" . $month . "&amp;year=" . $year ) );
--- 530,534 ----
  				if ( !( $query = $db->sql_query( $sql ) ) )
  				{
! 					mx_message_die( GENERAL_ERROR, 'Could not get events list to validate', '', __LINE__, __FILE__, $sql );
  				}
  				$url = append_sid( this_mxurl( "month=" . $month . "&amp;year=" . $year ) );
***************
*** 614,618 ****
  		if ( !$id )
  		{
! 			message_die( GENERAL_ERROR, $lang['Cal_must_sel_event'], '', __LINE__, __FILE__, $sql );
  		}
  		$sql = "SELECT event_id, user_id FROM " . CALLITE_EVENTS_TABLE . " WHERE event_id = '$id'";
--- 614,618 ----
  		if ( !$id )
  		{
! 			mx_message_die( GENERAL_ERROR, $lang['Cal_must_sel_event'], '', __LINE__, __FILE__, $sql );
  		}
  		$sql = "SELECT event_id, user_id FROM " . CALLITE_EVENTS_TABLE . " WHERE event_id = '$id'";
***************
*** 623,627 ****
  		if ( !( $query = $db->sql_query( $sql ) ) )
  		{
! 			message_die( GENERAL_ERROR, 'Could not select event to delete from Table', '', __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $query );
--- 623,627 ----
  		if ( !( $query = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Could not select event to delete from Table', '', __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $query );
***************
*** 631,635 ****
  			if ( !( $query = $db->sql_query( $sql ) ) )
  			{
! 				message_die( GENERAL_ERROR, 'Could Not delete event from Table', '', __LINE__, __FILE__, $sql );
  			}
  			else
--- 631,635 ----
  			if ( !( $query = $db->sql_query( $sql ) ) )
  			{
! 				mx_message_die( GENERAL_ERROR, 'Could Not delete event from Table', '', __LINE__, __FILE__, $sql );
  			}
  			else
***************
*** 637,641 ****
  				$url = append_sid( this_mxurl() );
  				$message = $lang['Cal_event_delete'] . "<br><br><a href='" . $url . "'>" . $lang['Cal_back2cal'] . "</a>";
! 				message_die( GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, $sql );
  			}
  		}
--- 637,641 ----
  				$url = append_sid( this_mxurl() );
  				$message = $lang['Cal_event_delete'] . "<br><br><a href='" . $url . "'>" . $lang['Cal_back2cal'] . "</a>";
! 				mx_message_die( GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 643,647 ****
  		{ 
  			// Failed
! 			message_die( GENERAL_ERROR, $lang['Cal_delete_event'], '', __LINE__, __FILE__, $sql );
  		}
  	}
--- 643,647 ----
  		{ 
  			// Failed
! 			mx_message_die( GENERAL_ERROR, $lang['Cal_delete_event'], '', __LINE__, __FILE__, $sql );
  		}
  	}
***************
*** 668,672 ****
  		if ( !$id )
  		{
! 			message_die( GENERAL_ERROR, $lang['Cal_must_sel_event'], '', __LINE__, __FILE__, '' );
  		}
  		$sql = "SELECT *, SUBSTRING(stamp FROM 12 FOR 5) AS thetime,
--- 668,672 ----
  		if ( !$id )
  		{
! 			mx_message_die( GENERAL_ERROR, $lang['Cal_must_sel_event'], '', __LINE__, __FILE__, '' );
  		}
  		$sql = "SELECT *, SUBSTRING(stamp FROM 12 FOR 5) AS thetime,
***************
*** 681,685 ****
  		{ 
  			// CHECK echo "<B>".mysql_error()."</B><BR><BR>"; exit;
! 			message_die( GENERAL_ERROR, 'Could not select event to modify from Table', '', __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $query );
--- 681,685 ----
  		{ 
  			// CHECK echo "<B>".mysql_error()."</B><BR><BR>"; exit;
! 			mx_message_die( GENERAL_ERROR, 'Could not select event to modify from Table', '', __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $query );
***************
*** 805,809 ****
  		else
  		{
! 			message_die( GENERAL_ERROR, $lang['Cal_edit_own_event'], '', __LINE__, __FILE__, $sql );
  		}
  	}
--- 805,809 ----
  		else
  		{
! 			mx_message_die( GENERAL_ERROR, $lang['Cal_edit_own_event'], '', __LINE__, __FILE__, $sql );
  		}
  	}
***************
*** 961,970 ****
  	if ( !checkdate( $month, $day, $year ) )
  	{
! 		message_die( GENERAL_ERROR, $lang['Invalid date'] );
  	} 
  	// Valid End Date?
  	if ( !checkdate( $endmonth, $endday, $endyear ) )
  	{
! 		message_die( GENERAL_ERROR, $lang['Invalid date'] );
  	} 
  	// Valid Time?
--- 961,970 ----
  	if ( !checkdate( $month, $day, $year ) )
  	{
! 		mx_message_die( GENERAL_ERROR, $lang['Invalid date'] );
  	} 
  	// Valid End Date?
  	if ( !checkdate( $endmonth, $endday, $endyear ) )
  	{
! 		mx_message_die( GENERAL_ERROR, $lang['Invalid date'] );
  	} 
  	// Valid Time?
***************
*** 987,991 ****
  		if ( isset( $err_time ) )
  		{
! 			message_die( GENERAL_ERROR, ( "Invalid " . $lang['Cal_hour'] ) );
  		}
  	} 
--- 987,991 ----
  		if ( isset( $err_time ) )
  		{
! 			mx_message_die( GENERAL_ERROR, ( "Invalid " . $lang['Cal_hour'] ) );
  		}
  	} 
***************
*** 998,1002 ****
  	else
  	{
! 		message_die( GENERAL_ERROR, $lang['No date'] );
  	}
  
--- 998,1002 ----
  	else
  	{
! 		mx_message_die( GENERAL_ERROR, $lang['No date'] );
  	}
  
***************
*** 1103,1107 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Could not select Event data', '', __LINE__, __FILE__, $sql );
  	}
  	$check = 0;
--- 1103,1107 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not select Event data', '', __LINE__, __FILE__, $sql );
  	}
  	$check = 0;
***************
*** 1315,1319 ****
  		echo "<BR>$sql<BR>" . mysql_error();
  		exit;
! 		message_die( GENERAL_ERROR, 'Could not get months data', '', __LINE__, __FILE__, $sql );
  	}
  
--- 1315,1319 ----
  		echo "<BR>$sql<BR>" . mysql_error();
  		exit;
! 		mx_message_die( GENERAL_ERROR, 'Could not get months data', '', __LINE__, __FILE__, $sql );
  	}
  
***************
*** 1523,1527 ****
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Could not select Calendar permission from user table', '', __LINE__, __FILE__, $sql );
  	}
  	$row = $db->sql_fetchrow( $result ); 
--- 1523,1527 ----
  	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not select Calendar permission from user table', '', __LINE__, __FILE__, $sql );
  	}
  	$row = $db->sql_fetchrow( $result ); 
***************
*** 1531,1535 ****
  	if ( !( $result2 = $db->sql_query( $sql2 ) ) )
  	{
! 		message_die( GENERAL_ERROR, 'Could not select Calendar permission from user/usergroup table', '', __LINE__, __FILE__, $sql2 );
  	}
  	$topgroup = 0;
--- 1531,1535 ----
  	if ( !( $result2 = $db->sql_query( $sql2 ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not select Calendar permission from user/usergroup table', '', __LINE__, __FILE__, $sql2 );
  	}
  	$topgroup = 0;

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/db_install.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** db_install.php	1 Oct 2005 14:12:12 -0000	1.15
--- db_install.php	24 Oct 2005 20:13:55 -0000	1.16
***************
*** 49,53 ****
  if ( !defined( 'CALLITE_EVENTS_TABLE' ) )
  {
! 	message_die( GENERAL_ERROR, "Couldn't load cal_settings.php", "", __LINE__, __FILE__ );
  }
  
--- 49,53 ----
  if ( !defined( 'CALLITE_EVENTS_TABLE' ) )
  {
! 	mx_message_die( GENERAL_ERROR, "Couldn't load cal_settings.php", "", __LINE__, __FILE__ );
  }
  

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/db_upgrade.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** db_upgrade.php	1 Oct 2005 14:12:12 -0000	1.9
--- db_upgrade.php	24 Oct 2005 20:13:55 -0000	1.10
***************
*** 49,53 ****
  if ( !defined( 'CALLITE_EVENTS_TABLE' ) )
  {
! 	message_die( GENERAL_ERROR, "Couldn't load cal_settings.php", "", __LINE__, __FILE__ );
  }
  
--- 49,53 ----
  if ( !defined( 'CALLITE_EVENTS_TABLE' ) )
  {
! 	mx_message_die( GENERAL_ERROR, "Couldn't load cal_settings.php", "", __LINE__, __FILE__ );
  }
  
***************
*** 88,92 ****
  		if ( !( $result = $db->sql_query( $sqltmp ) ) )
  		{
! 			message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $result ) ;
--- 88,92 ----
  		if ( !( $result = $db->sql_query( $sqltmp ) ) )
  		{
! 			mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $result ) ;
***************
*** 96,100 ****
  		if ( !( $result = $db->sql_query( $sqltmp2 ) ) )
  		{
! 			message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  
--- 96,100 ----
  		if ( !( $result = $db->sql_query( $sqltmp2 ) ) )
  		{
! 			mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  
***************
*** 119,123 ****
  		if ( !( $result = $db->sql_query( $sqltmp ) ) )
  		{
! 			message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $result ) ;
--- 119,123 ----
  		if ( !( $result = $db->sql_query( $sqltmp ) ) )
  		{
! 			mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $result ) ;
***************
*** 127,131 ****
  		if ( !( $result = $db->sql_query( $sqltmp2 ) ) )
  		{
! 			message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  
--- 127,131 ----
  		if ( !( $result = $db->sql_query( $sqltmp2 ) ) )
  		{
! 			mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  
***************
*** 144,148 ****
  		if ( !( $result = $db->sql_query( $sqltmp ) ) )
  		{
! 			message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $result ) ;
--- 144,148 ----
  		if ( !( $result = $db->sql_query( $sqltmp ) ) )
  		{
! 			mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  		$row = $db->sql_fetchrow( $result ) ;
***************
*** 152,156 ****
  		if ( !( $result = $db->sql_query( $sqltmp2 ) ) )
  		{
! 			message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}
  
--- 152,156 ----
  		if ( !( $result = $db->sql_query( $sqltmp2 ) ) )
  		{
! 			mx_message_die( CRITICAL_ERROR, "Could not query portal version", "", __LINE__, __FILE__, $sql );
  		}

[mxbb-commits] mx_calsnails calendar.php,1.18,1.19 db_install.php,1.15,1.16 db_upgrade.php,1.9,1.10

[mxbb-commits] mx_calsnails calendar.php,1.18,1.19 db_install.php,1.15,1.16 db_upgrade.php,1.9,1.10 mx_calendar_events.php,1.13,1.14 mx_calendar_query.php,1.8,1.9