[mxbb-commits] mx_calsnails/includes cal_functions.php, 1.6, 1.7 mx_common.php, 1.16, 1.17

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

Update of /cvsroot/mxbb/mx_calsnails/includes
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27752/modules/mx_calsnails/includes

Modified Files:
	cal_functions.php mx_common.php 
Log Message:
Installation bug
adminCP lang keys
initialization checks

Index: cal_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_functions.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cal_functions.php	29 Jun 2006 13:39:03 -0000	1.6
--- cal_functions.php	29 Jun 2006 22:03:22 -0000	1.7
***************
*** 802,806 ****
  	$board_config, $cal_config, $id, $day, $month, $year, $userdata, $lang, $event_desc, $subject, $caluser,
  	$block_size, $cal_filter, $block_id,
! 	$cal_mode_mini, $cal_page_id,
  	$module_root_path,
  	$endday, $endmonth, $endyear, $langdays, $template, $cal_version, $db, $homeurl;
--- 802,806 ----
  	$board_config, $cal_config, $id, $day, $month, $year, $userdata, $lang, $event_desc, $subject, $caluser,
  	$block_size, $cal_filter, $block_id,
! 	$cal_mode_mini, $cal_page_id, $cal_block_id,
  	$module_root_path,
  	$endday, $endmonth, $endyear, $langdays, $template, $cal_version, $db, $homeurl;
***************
*** 862,872 ****
  	if ( $cal_mode_mini )
  	{
! 		$template->assign_vars( array( 'S_ACTION' => append_sid( this_mxurl( '', 0, $cal_page_id ) ),
! 				'U_CAL_MONTH' => append_sid( this_mxurl( "month=" . $month . "&year=" . $year, 0, $cal_page_id ) ),
! 				)
! 			);
  	}
  
! 	$template->assign_vars( array( 'BLOCK_SIZE' => $block_size,
  		'PHPBBHEADER' => $phpbbheaders,
  		'CAL_MONTH' => $lang['datetime'][gmdate( "F", gmmktime( 0, 0, 0, $month, 1, $year ) )],
--- 862,877 ----
  	if ( $cal_mode_mini )
  	{
! 		if (intval($cal_block_id) == 0)
! 		{
! 			$template->assign_block_vars( 'info', array() );
! 		}
! 		$template->assign_vars( array(
! 			'S_ACTION' => append_sid( this_mxurl( '', 0, $cal_page_id ) ),
! 			'U_CAL_MONTH' => append_sid( this_mxurl( "month=" . $month . "&year=" . $year, 0, $cal_page_id ) ),
! 		));
  	}
  
! 	$template->assign_vars( array(
! 		'BLOCK_SIZE' => $block_size,
  		'PHPBBHEADER' => $phpbbheaders,
  		'CAL_MONTH' => $lang['datetime'][gmdate( "F", gmmktime( 0, 0, 0, $month, 1, $year ) )],

Index: mx_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/includes/mx_common.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mx_common.php	29 Jun 2006 13:39:03 -0000	1.16
--- mx_common.php	29 Jun 2006 22:03:22 -0000	1.17
***************
*** 28,32 ****
  
  	$sql = "SELECT * FROM " . CALLITE_CONFIG_TABLE;
! 	if ( !( $result = $db->sql_query( $sql, 300 ) ) )
  	{
  		mx_message_die( GENERAL_ERROR, "Couldn't query calendar config table", "", __LINE__, __FILE__, $sql );
--- 28,32 ----
  
  	$sql = "SELECT * FROM " . CALLITE_CONFIG_TABLE;
! 	if ( !( $result = $db->sql_query( $sql, 100 ) ) )
  	{
  		mx_message_die( GENERAL_ERROR, "Couldn't query calendar config table", "", __LINE__, __FILE__, $sql );
***************
*** 42,45 ****
--- 42,46 ----
  
  	$cal_dateformat = !empty( $cal_config['cal_dateformat'] ) ? $cal_config['cal_dateformat'] : $board_config['default_dateformat'];
+ 
  	// Timezone off 1 day fix
  	// $cal_timezone   = $board_config['board_timezone'];