[mxbb-commits] mx_calsnails calendar.php, 1.29, 1.30 mx_calendar_events.php, 1.24, 1.25

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-cvs16.sourceforge.net:/tmp/cvs-serv9084

Modified Files:
	calendar.php mx_calendar_events.php 
Log Message:
for 2.9.x

Index: mx_calendar_events.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/mx_calendar_events.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** mx_calendar_events.php	5 May 2007 20:19:21 -0000	1.24
--- mx_calendar_events.php	9 Sep 2007 19:48:44 -0000	1.25
***************
*** 144,148 ****
  			break;
  		case CALRANGE_NEXT_MONTH:
! 			list( $tmp_yy, $tmp_mm ) = explode( '-', create_date( 'Y-m', time(), $cal_timezone ) );
  			$ini_time = gmmktime( 0, 0, 0, ( $tmp_mm + 1 ), 1, $tmp_yy );
  			$end_time = gmmktime( 0, 0, 0, ( $tmp_mm + 1 ), ( gmdate( 't', $ini_time ) ), $tmp_yy );
--- 144,148 ----
  			break;
  		case CALRANGE_NEXT_MONTH:
! 			list( $tmp_yy, $tmp_mm ) = explode( '-', phpBB2::create_date( 'Y-m', time(), $cal_timezone ) );
  			$ini_time = gmmktime( 0, 0, 0, ( $tmp_mm + 1 ), 1, $tmp_yy );
  			$end_time = gmmktime( 0, 0, 0, ( $tmp_mm + 1 ), ( gmdate( 't', $ini_time ) ), $tmp_yy );
***************
*** 150,154 ****
  		case CALRANGE_THIS_MONTH:
  		default:
! 			list( $tmp_yy, $tmp_mm ) = explode( '-', create_date( 'Y-m', time(), $cal_timezone ) );
  			$ini_time = gmmktime( 0, 0, 0, $tmp_mm, 1, $tmp_yy );
  			$end_time = gmmktime( 0, 0, 0, $tmp_mm, ( gmdate( 't', $ini_time ) ), $tmp_yy );
--- 150,154 ----
  		case CALRANGE_THIS_MONTH:
  		default:
! 			list( $tmp_yy, $tmp_mm ) = explode( '-', phpBB2::create_date( 'Y-m', time(), $cal_timezone ) );
  			$ini_time = gmmktime( 0, 0, 0, $tmp_mm, 1, $tmp_yy );
  			$end_time = gmmktime( 0, 0, 0, $tmp_mm, ( gmdate( 't', $ini_time ) ), $tmp_yy );
***************
*** 164,169 ****
  		$end_time += ( SECONDS_PER_DAY * $events_next );
  	}
! 	list( $ini_yy, $ini_mm, $ini_dd ) = explode( '-', create_date( 'Y-m-j', $ini_time, $cal_timezone ) );
! 	list( $end_yy, $end_mm, $end_dd ) = explode( '-', create_date( 'Y-m-j', $end_time, $cal_timezone ) );
  
  	//
--- 164,169 ----
  		$end_time += ( SECONDS_PER_DAY * $events_next );
  	}
! 	list( $ini_yy, $ini_mm, $ini_dd ) = explode( '-', phpBB2::create_date( 'Y-m-j', $ini_time, $cal_timezone ) );
! 	list( $end_yy, $end_mm, $end_dd ) = explode( '-', phpBB2::create_date( 'Y-m-j', $end_time, $cal_timezone ) );
  
  	//
***************
*** 188,192 ****
  	// Loop through Calendar Events...
  	//
! 	$today = create_date( 'Y-m-d', time(), $cal_timezone );
  	$check = 0;
  	$lastdate = '';
--- 188,192 ----
  	// Loop through Calendar Events...
  	//
! 	$today = phpBB2::create_date( 'Y-m-d', time(), $cal_timezone );
  	$check = 0;
  	$lastdate = '';
***************
*** 207,215 ****
  		$mm = substr( $row['stamp'], 5, 2 );
  		$dd = substr( $row['stamp'], 8, 2 );
! 		$u_ini_date = append_sid( $mx_root_path . 'index.' . $phpEx . "?page=" . $cal_page_id . "&day=" . $dd . "&amp;month=" . $mm . "&amp;year=" . $yy . "&amp;mode=display" );
  		$yy = substr( $row['eventspan'], 0, 4 );
  		$mm = substr( $row['eventspan'], 5, 2 );
  		$dd = substr( $row['eventspan'], 8, 2 );
! 		$u_end_date = append_sid( $mx_root_path . 'index.' . $phpEx . "?page=" . $cal_page_id . "&day=" . $dd . "&amp;month=" . $mm . "&amp;year=" . $yy . "&amp;mode=display" );
  
  		$template->assign_block_vars( 'event_row', array(
--- 207,215 ----
  		$mm = substr( $row['stamp'], 5, 2 );
  		$dd = substr( $row['stamp'], 8, 2 );
! 		$u_ini_date = mx_append_sid( $mx_root_path . 'index.' . $phpEx . "?page=" . $cal_page_id . "&day=" . $dd . "&amp;month=" . $mm . "&amp;year=" . $yy . "&amp;mode=display" );
  		$yy = substr( $row['eventspan'], 0, 4 );
  		$mm = substr( $row['eventspan'], 5, 2 );
  		$dd = substr( $row['eventspan'], 8, 2 );
! 		$u_end_date = mx_append_sid( $mx_root_path . 'index.' . $phpEx . "?page=" . $cal_page_id . "&day=" . $dd . "&amp;month=" . $mm . "&amp;year=" . $yy . "&amp;mode=display" );
  
  		$template->assign_block_vars( 'event_row', array(
***************
*** 260,266 ****
  	}
  
! 	$cdd = create_date( "j", time(), $userdata['calsnails_timezone'] );
! 	$cmm = create_date( "m", time(), $userdata['calsnails_timezone'] );
! 	$cyy = create_date( "Y", time(), $userdata['calsnails_timezone'] );
  	// Added Week
  	$currentweek = week_of_year( $cdd, $cmm, $cyy );
--- 260,266 ----
  	}
  
! 	$cdd = phpBB2::create_date( "j", time(), $userdata['calsnails_timezone'] );
! 	$cmm = phpBB2::create_date( "m", time(), $userdata['calsnails_timezone'] );
! 	$cyy = phpBB2::create_date( "Y", time(), $userdata['calsnails_timezone'] );
  	// Added Week
  	$currentweek = week_of_year( $cdd, $cmm, $cyy );

Index: calendar.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/calendar.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** calendar.php	5 May 2007 20:19:20 -0000	1.29
--- calendar.php	9 Sep 2007 19:48:44 -0000	1.30
***************
*** 162,166 ****
  if ( $userdata['session_logged_in'] )
  {
! 	$lvd = sprintf( $lang['You_last_visit'], create_date( $board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone'] ) );
  }
  else
--- 162,166 ----
  if ( $userdata['session_logged_in'] )
  {
! 	$lvd = sprintf( $lang['You_last_visit'], phpBB2::create_date( $board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone'] ) );
  }
  else
***************
*** 177,188 ****
  // Set Calendar Home URL (used in all templates)
  //
! $homeurl = append_sid( this_mxurl() );
  
  if ( $cal_config['show_headers'] == 1 )
  {
! 	$ct = sprintf( $lang['Current_time'], create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) );
  	if ( $userdata['session_logged_in'] )
  	{
! 		$lvd = sprintf( $lang['You_last_visit'], create_date( $board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone'] ) );
  	}
  	else
--- 177,188 ----
  // Set Calendar Home URL (used in all templates)
  //
! $homeurl = mx_append_sid( this_mxurl() );
  
  if ( $cal_config['show_headers'] == 1 )
  {
! 	$ct = sprintf( $lang['Current_time'], phpBB2::create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) );
  	if ( $userdata['session_logged_in'] )
  	{
! 		$lvd = sprintf( $lang['You_last_visit'], phpBB2::create_date( $board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone'] ) );
  	}
  	else
***************
*** 227,238 ****
  /*
  if ($userdata && $userdata['user_id'] != '-1') {
! 	if (!$day) { $day = create_date("j", time(), $userdata['user_timezone']); }
! 	if (!$month) { $month = create_date("m", time(), $userdata['user_timezone']); }
! 	if (!$year) { $year = create_date("Y", time(), $userdata['user_timezone']); }
  	}
  else {
! 	if (!$day) { $day = create_date("j", time(), $userdata[board_timezone]); }
! 	if (!$month) { $month = create_date("m", time(), $userdata[board_timezone]); }
! 	if (!$year) { $year = create_date("Y", time(), $userdata[board_timezone]); }
  	}
  */
--- 227,238 ----
  /*
  if ($userdata && $userdata['user_id'] != '-1') {
! 	if (!$day) { $day = phpBB2::create_date("j", time(), $userdata['user_timezone']); }
! 	if (!$month) { $month = phpBB2::create_date("m", time(), $userdata['user_timezone']); }
! 	if (!$year) { $year = phpBB2::create_date("Y", time(), $userdata['user_timezone']); }
  	}
  else {
! 	if (!$day) { $day = phpBB2::create_date("j", time(), $userdata[board_timezone]); }
! 	if (!$month) { $month = phpBB2::create_date("m", time(), $userdata[board_timezone]); }
! 	if (!$year) { $year = phpBB2::create_date("Y", time(), $userdata[board_timezone]); }
  	}
  */
***************
*** 241,253 ****
  if ( !$day )
  {
! 	$day = create_date( "j", time(), $userdata['calsnails_timezone'] );
  }
  if ( !$month )
  {
! 	$month = create_date( "m", time(), $userdata['calsnails_timezone'] );
  }
  if ( !$year )
  {
! 	$year = create_date( "Y", time(), $userdata['calsnails_timezone'] );
  }
  
--- 241,253 ----
  if ( !$day )
  {
! 	$day = phpBB2::create_date( "j", time(), $userdata['calsnails_timezone'] );
  }
  if ( !$month )
  {
! 	$month = phpBB2::create_date( "m", time(), $userdata['calsnails_timezone'] );
  }
  if ( !$year )
  {
! 	$year = phpBB2::create_date( "Y", time(), $userdata['calsnails_timezone'] );
  }