diff options
Diffstat (limited to 'include/event.php')
| -rw-r--r-- | include/event.php | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/include/event.php b/include/event.php index 38ab83316..33970efff 100644 --- a/include/event.php +++ b/include/event.php @@ -12,8 +12,8 @@ function format_event_html($ev) { $o .= '<p class="description">' . bbcode($ev['desc']) . '</p>'; - $o .= '<p>' . t('Starts: ') . '<abbr class="dtstart" title="' - . datetime_convert('UTC','UTC',$ev['start'], ATOM_TIME) + $o .= '<p>' . t('Starts:') . ' <abbr class="dtstart" title="' + . datetime_convert('UTC','UTC',$ev['start'], $ev['adjust'] ? ATOM_TIME : 'Y-m-d\TH:i:s' ) . '" >' . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $ev['start'] /*, format */ ) @@ -21,23 +21,39 @@ function format_event_html($ev) { $ev['start'] /*, format */ )) . '</abbr></p>'; - $o .= '<p>' . t('Ends: ') . '<abbr class="dtend" title="' - . datetime_convert('UTC','UTC',$ev['finish'], ATOM_TIME) - . '" >' - . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), - $ev['finish'] /*, format */ ) - : datetime_convert('UTC', 'UTC', - $ev['finish'] /*, format */ )) - . '</abbr></p>'; - - $o .= '<p> ' . t('Location:') . '<span class="location">' - . bbcode($ev['location']) - . '</span></p>'; + if(! $ev['nofinish']) + $o .= '<p>' . t('Finishes:') . ' <abbr class="dtend" title="' + . datetime_convert('UTC','UTC',$ev['finish'], $ev['adjust'] ? ATOM_TIME : 'Y-m-d\TH:i:s' ) + . '" >' + . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), + $ev['finish'] /*, format */ ) + : datetime_convert('UTC', 'UTC', + $ev['finish'] /*, format */ )) + . '</abbr></p>'; + + if(strlen($ev['location'])) + $o .= '<p> ' . t('Location:') . '<span class="location">' + . bbcode($ev['location']) + . '</span></p>'; $o .= '</div>'; -return $o; + return $o; +} + + + +function sort_by_date($a) { + + usort($a,'ev_compare'); + return $a; } +function ev_compare($a,$b) { + $date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']); + $date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']); + + return strcmp($date_a,$date_b); +}
\ No newline at end of file |