Vergleich calendar.php - 1.6.9 - 1.6.11

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 12Zeile 12
define("IN_MYBB", 1);
define('THIS_SCRIPT', 'calendar.php');


define("IN_MYBB", 1);
define('THIS_SCRIPT', 'calendar.php');


$templatelist = "calendar_weekdayheader,calendar_weekrow_day,calendar_weekrow,calendar_eventbit_public,calendar_eventbit_private,calendar";

$templatelist = "calendar_weekdayheader,calendar_weekrow_day,calendar_weekrow,calendar,calendar_addevent,calendar_move";

$templatelist .= ",calendar_weekview_day,calendar_weekview_day_event,calendar_mini_weekdayheader,calendar_mini_weekrow_day,calendar_mini_weekrow,calendar_mini,calendar_weekview_month,calendar_weekview,calendar_eventbit,calendar_addeventlink";

$templatelist .= ",calendar_weekview_day,calendar_weekview_day_event,calendar_mini_weekdayheader,calendar_mini_weekrow_day,calendar_mini_weekrow,calendar_mini,calendar_weekview_month,calendar_weekview,calendar_eventbit,calendar_addeventlink";

$templatelist .= ",calendar_event_editbutton,calendar_event_modoptions,calendar_event,calendar_dayview_event,calendar_dayview,codebuttons,smilieinsert,calendar_editevent,calendar_dayview_birthdays_bday,calendar_dayview_birthdays,calendar_dayview_noevents,calendar_dayview_noevents";

$templatelist .= ",calendar_event_editbutton,calendar_event_modoptions,calendar_event,calendar_dayview_event,calendar_dayview,codebuttons,smilieinsert,smilieinsert_getmore,calendar_editevent,calendar_dayview_birthdays_bday,calendar_dayview_birthdays,calendar_dayview_noevents";


require_once "./global.php";



require_once "./global.php";


Zeile 1548Zeile 1548
	$start_timestamp = gmmktime(0, 0, 0, $month, $day, $year);
$end_timestamp = gmmktime(23, 59, 59, $month, $day, $year);


	$start_timestamp = gmmktime(0, 0, 0, $month, $day, $year);
$end_timestamp = gmmktime(23, 59, 59, $month, $day, $year);


	$events_cache = get_events($calendar['cid'], $start_timestamp, $end_timestamp, $calendar_permissions['canmoderateevents']);

	$events_cache = get_events($calendar, $start_timestamp, $end_timestamp, $calendar_permissions['canmoderateevents']);


if(is_array($events_cache["$day-$month-$year"]))
{


if(is_array($events_cache["$day-$month-$year"]))
{

Zeile 1855Zeile 1855
	$events_from = gmmktime(0, 0, 0, $week_from[1], 1, $week_from[2]);
$events_to = gmmktime(0, 0, 0, $week_to[1], $week_to[3], $week_to[2]);


	$events_from = gmmktime(0, 0, 0, $week_from[1], 1, $week_from[2]);
$events_to = gmmktime(0, 0, 0, $week_to[1], $week_to[3], $week_to[2]);


	$events_cache = get_events($calendar['cid'], $events_from, $events_to, $calendar_permissions['canmoderateevents']);

	$events_cache = get_events($calendar, $events_from, $events_to, $calendar_permissions['canmoderateevents']);


$today = my_date("dnY");



$today = my_date("dnY");


Zeile 2084Zeile 2084
	$weekdays = fetch_weekday_structure($calendar['startofweek']);

$month_start_weekday = gmdate("w", gmmktime(0, 0, 0, $month, $calendar['startofweek']+1, $year));

	$weekdays = fetch_weekday_structure($calendar['startofweek']);

$month_start_weekday = gmdate("w", gmmktime(0, 0, 0, $month, $calendar['startofweek']+1, $year));

 

$prev_month_days = gmdate("t", gmmktime(0, 0, 0, $prev_month['month'], 1, $prev_month['year']));

	
// This is if we have days in the previous month to show
if($month_start_weekday != $weekdays[0] || $calendar['startofweek'] != 0)
{

	
// This is if we have days in the previous month to show
if($month_start_weekday != $weekdays[0] || $calendar['startofweek'] != 0)
{

		$day = gmdate("t", gmmktime(0, 0, 0, $prev_month['month'], 1, $prev_month['year']));

		$prev_days = $day = gmdate("t", gmmktime(0, 0, 0, $prev_month['month'], 1, $prev_month['year']));

		$day -= array_search(($month_start_weekday), $weekdays);
$day += $calendar['startofweek']+1;

		$day -= array_search(($month_start_weekday), $weekdays);
$day += $calendar['startofweek']+1;

 
		if($day > $prev_month_days+1)
{
// Go one week back
$day -= 7;
}

		$calendar_month = $prev_month['month'];
$calendar_year = $prev_month['year'];
}

		$calendar_month = $prev_month['month'];
$calendar_year = $prev_month['year'];
}

Zeile 2099Zeile 2106
		$day = $calendar['startofweek']+1;
$calendar_month = $month;
$calendar_year = $year;

		$day = $calendar['startofweek']+1;
$calendar_month = $month;
$calendar_year = $year;

	}

$prev_month_days = gmdate("t", gmmktime(0, 0, 0, $prev_month['month'], 1, $prev_month['year']));


	}




	// So now we fetch events for this month (nb, cache events for past month, current month and next month for mini calendars too)

	// So now we fetch events for this month (nb, cache events for past month, current month and next month for mini calendars too)

	$start_timestamp = gmmktime(0, 0, 0, $prev_month['month'], $day, $prev_month['year']);
$num_days = gmdate("t", gmmktime(0, 0, 0, $next_month['month'], 1, $next_month['year']));
$end_timestamp = gmmktime(23, 59, 59, $next_month['month'], $num_days, $next_month['year']);


	$start_timestamp = gmmktime(0, 0, 0, $calendar_month, $day, $calendar_year);




	$num_days = gmdate("t", gmmktime(0, 0, 0, $month, 1, $year));

	$num_days = gmdate("t", gmmktime(0, 0, 0, $month, 1, $year));


if($day > 31 && in_array($next_month['month'], array(4, 6, 11, 9)))
{
// If we're a day over a 30 day month, gather the events from a week before too.
// Otherwise it will start on events for the 2nd - not the 'start' date for the month.
$start_timestamp -= (86400 * 7);












	
$month_end_weekday = gmdate("w", gmmktime(0, 0, 0, $month, $num_days, $year));
$next_days = 6-$month_end_weekday+$calendar['startofweek'];

// More than a week? Go one week back
if($next_days >= 7)
{
$next_days -= 7;
}
if($next_days > 0)
{
$end_timestamp = gmmktime(23, 59, 59, $next_month['month'], $next_days, $next_month['year']);
}
else
{
// We don't need days from the next month
$end_timestamp = gmmktime(23, 59, 59, $month, $num_days, $year);

	}


	}


	$events_cache = get_events($calendar['cid'], $start_timestamp, $end_timestamp, $calendar_permissions['canmoderateevents']);

	$events_cache = get_events($calendar, $start_timestamp, $end_timestamp, $calendar_permissions['canmoderateevents']);

	
// Fetch birthdays
if($calendar['showbirthdays'])

	
// Fetch birthdays
if($calendar['showbirthdays'])

	{

	{

		$bday_months = array($month, $prev_month['month'], $next_month['month']);
$birthdays = get_birthdays($bday_months);
}

		$bday_months = array($month, $prev_month['month'], $next_month['month']);
$birthdays = get_birthdays($bday_months);
}

Zeile 2133Zeile 2146
	{
$weekday_name = fetch_weekday_name($weekday);
eval("\$weekday_headers .= \"".$templates->get("calendar_weekdayheader")."\";");

	{
$weekday_name = fetch_weekday_name($weekday);
eval("\$weekday_headers .= \"".$templates->get("calendar_weekdayheader")."\";");

	}

// Fix offset for Start Of Week being Saturday
if($calendar_month == $prev_month['month'] && $calendar['startofweek'] > 0)
{
$day -= 7;

// Lets make sure we don't have a whole extra column for the last month
if($prev_month_days-7 >= ($day-1))
{
$day += 7;
}

 
	}

for($row = 0; $row < 6; ++$row) // Iterate weeks (each week gets a row)

	}

for($row = 0; $row < 6; ++$row) // Iterate weeks (each week gets a row)