Vergleich inc/functions_calendar.php - 1.6.4 - 1.6.11

  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: functions_calendar.php 5420 2011-04-05 08:20:02Z Tomm $

 * $Id$

 */

/**

 */

/**

Zeile 74Zeile 74

if(!$events_cache)
{


if(!$events_cache)
{

		$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']);

	}

$today = my_date("dnY");

	}

$today = my_date("dnY");

Zeile 424Zeile 424
		SELECT u.*, e.*
FROM ".TABLE_PREFIX."events e
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=e.uid)

		SELECT u.*, e.*
FROM ".TABLE_PREFIX."events e
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=e.uid)

		WHERE e.cid='{$calendar}' {$visible_where} AND ((e.endtime>={$start} AND e.starttime<={$end}) OR (e.endtime=0 AND e.starttime>={$start} AND e.starttime<={$end})) AND ((e.uid='{$mybb->user['uid']}' AND private='1') OR private!='1')

		WHERE e.cid='{$calendar['cid']}' {$visible_where} AND ((e.endtime>={$start} AND e.starttime<={$end}) OR (e.endtime=0 AND e.starttime>={$start} AND e.starttime<={$end})) AND ((e.uid='{$mybb->user['uid']}' AND private='1') OR private!='1')

		ORDER BY endtime DESC
");
while($event = $db->fetch_array($query))

		ORDER BY endtime DESC
");
while($event = $db->fetch_array($query))

Zeile 450Zeile 450
		{
$event_date = explode("-", gmdate("j-n-Y", $event['starttime_user']));
$event['endtime_user'] = $event['endtime']+($offset*3600);

		{
$event_date = explode("-", gmdate("j-n-Y", $event['starttime_user']));
$event['endtime_user'] = $event['endtime']+($offset*3600);

			$event['weekday_start'] = $calendar['weekstart'];

			$event['weekday_start'] = $calendar['startofweek'];


$start_day = gmmktime(0, 0, 0, $event_date[1], $event_date[0], $event_date[2]);



$start_day = gmmktime(0, 0, 0, $event_date[1], $event_date[0], $event_date[2]);