From 50ce9c8c7c7ac6b8c3137e84ec4da8a1bbe38a12 Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Mon, 29 Dec 2008 03:07:34 +0000 Subject: change handling of multiday allday events in week view; other misc changes --- includes/event.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'includes/event.php') diff --git a/includes/event.php b/includes/event.php index 8d57ae9..c15f3d2 100644 --- a/includes/event.php +++ b/includes/event.php @@ -2,6 +2,7 @@ $current_view = "event"; define('BASE', '../'); include_once(BASE.'functions/init.inc.php'); +require_once(BASE.'functions/date_functions.php'); require_once(BASE.'functions/template.php'); # information for the popup is sent via $_POST by a javascript snippet in @@ -14,9 +15,15 @@ $attendee = unserialize($event['attendee']); // Format event time // All day if ($_POST['time'] == -1) { - $event_times = $lang['l_all_day']; + $start = localizeDate($dateFormat_week, $event['start_unixtime']); + $end = localizeDate($dateFormat_week, ($event['end_unixtime'] - 60)); + $event_times = $lang['l_all_day']." $start"; + if ($start != $end) $event_times = "$start - $end"; } else { - $event_times = date($timeFormat, $event['start_unixtime']) . ' - ' . date($timeFormat, $event['end_unixtime']); + $start = date($timeFormat, $event['start_unixtime']); + $end = date($timeFormat, $event['end_unixtime']); + $event_times = "$start"; + if ($start != $end) $event_times = "$start - $end"; } $event['event_text'] = urldecode($event['event_text']); -- cgit v1.2.3