Vergleich calendar.php - 1.6.0 - 1.6.4

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 6
 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * $Id: calendar.php 5125 2010-07-27 07:28:03Z RyanGordon $

 * $Id: calendar.php 5420 2011-04-05 08:20:02Z Tomm $

 */

define("IN_MYBB", 1);

 */

define("IN_MYBB", 1);

Zeile 789Zeile 789
		$start_year = $start_date[2];
if($event['usingtime'])
{

		$start_year = $start_date[2];
if($event['usingtime'])
{

			$start_time = $start_date[3];

			$start_time = gmdate($mybb->settings['timeformat'], $event['starttime']+$event['timezone']*3600);

		}
if($event['endtime'])
{

		}
if($event['endtime'])
{

Zeile 799Zeile 799
			$end_year = $end_date[2];
if($event['usingtime'])
{

			$end_year = $end_date[2];
if($event['usingtime'])
{

				$end_time = $end_date[3];

				$end_time = gmdate($mybb->settings['timeformat'], $event['endtime']+$event['timezone']*3600);

			}
$type_ranged = "checked=\"checked\"";
$type = "ranged";

			}
$type_ranged = "checked=\"checked\"";
$type = "ranged";

Zeile 1378Zeile 1378
		$time_period = gmdate($mybb->settings['dateformat'], $event['starttime_user']);
}


		$time_period = gmdate($mybb->settings['dateformat'], $event['starttime_user']);
}


	$repeats = fetch_friendly_repitition($event);

	$repeats = fetch_friendly_repetition($event);

	if($repeats)
{
$repeats = "<span class=\"smalltext\"><strong>{$lang->repeats}</strong><br />{$repeats}</span>";

	if($repeats)
{
$repeats = "<span class=\"smalltext\"><strong>{$lang->repeats}</strong><br />{$repeats}</span>";

Zeile 1707Zeile 1707
				$time_period = gmdate($mybb->settings['dateformat'], $event['starttime_user']);
}


				$time_period = gmdate($mybb->settings['dateformat'], $event['starttime_user']);
}


			$repeats = fetch_friendly_repitition($event);

			$repeats = fetch_friendly_repetition($event);

			if($repeats)
{
$repeats = "<span class=\"smalltext\"><strong>{$lang->repeats}</strong><br />{$repeats}</span>";

			if($repeats)
{
$repeats = "<span class=\"smalltext\"><strong>{$lang->repeats}</strong><br />{$repeats}</span>";

Zeile 1758Zeile 1758
	}

// Now output the page

	}

// Now output the page

	$plugins->run_hooks("calendar_event_end");

	$plugins->run_hooks("calendar_dayview_end");


eval("\$day_view = \"".$templates->get("calendar_dayview")."\";");
output_page($day_view);


eval("\$day_view = \"".$templates->get("calendar_dayview")."\";");
output_page($day_view);

Zeile 1818Zeile 1818
	
// This is where we've come from and where we're headed
$week_from = explode("-", gmdate("j-n-Y", $mybb->input['week']));

	
// This is where we've come from and where we're headed
$week_from = explode("-", gmdate("j-n-Y", $mybb->input['week']));

 
	$week_from_one = $week_from[1];

	$friendly_week_from = gmdate($mybb->settings['dateformat'], $mybb->input['week']);
$week_to_stamp = gmmktime(0, 0, 0, $week_from[1], $week_from[0]+6, $week_from[2]);
$week_to = explode("-", gmdate("j-n-Y-t", $week_to_stamp));

	$friendly_week_from = gmdate($mybb->settings['dateformat'], $mybb->input['week']);
$week_to_stamp = gmmktime(0, 0, 0, $week_from[1], $week_from[0]+6, $week_from[2]);
$week_to = explode("-", gmdate("j-n-Y-t", $week_to_stamp));

Zeile 1844Zeile 1845
	if($calendar['showbirthdays'] == 1)
{
$birthdays = get_birthdays($bday_months);

	if($calendar['showbirthdays'] == 1)
{
$birthdays = get_birthdays($bday_months);

	}

	}


// We load events for the entire month date range - for our mini calendars too
$events_from = gmmktime(0, 0, 0, $week_from[1], 1, $week_from[2]);


// We load events for the entire month date range - for our mini calendars too
$events_from = gmmktime(0, 0, 0, $week_from[1], 1, $week_from[2]);

Zeile 1887Zeile 1888
				if(my_strlen($event['name']) > 50)
{
$event['name'] = my_substr($event['name'], 0, 50) . "...";

				if(my_strlen($event['name']) > 50)
{
$event['name'] = my_substr($event['name'], 0, 50) . "...";

				}

				}

				// Events over more than one day
$time_period = '';
if($event['endtime'] > 0 && $event['endtime'] != $event['starttime'])

				// Events over more than one day
$time_period = '';
if($event['endtime'] > 0 && $event['endtime'] != $event['starttime'])

Zeile 2059Zeile 2060
	if($mybb->input['month'] >=1 && $mybb->input['month'] <= 12)
{
$month = intval($mybb->input['month']);

	if($mybb->input['month'] >=1 && $mybb->input['month'] <= 12)
{
$month = intval($mybb->input['month']);

	}
else

	}
else

	{
$month = my_date("n");
}

	{
$month = my_date("n");
}

Zeile 2077Zeile 2078
	// Start constructing the calendar

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

	// Start constructing the calendar

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





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

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

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

// 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']));
$day -= array_search(($month_start_weekday), $weekdays);
$day += $calendar['startofweek']+1;

		$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;

Zeile 2104Zeile 2105
	$end_timestamp = gmmktime(23, 59, 59, $next_month['month'], $num_days, $next_month['year']);

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

	$end_timestamp = gmmktime(23, 59, 59, $next_month['month'], $num_days, $next_month['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);
}


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



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