From 33fe26ecb01ec009a639c4c8fdfc4f93b2bd34ac Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 7 Jun 2011 20:10:43 -0700
Subject: more progress on events

---
 include/event.php | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

(limited to 'include/event.php')

diff --git a/include/event.php b/include/event.php
index 38ab83316..17e12d7cf 100644
--- a/include/event.php
+++ b/include/event.php
@@ -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('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>';
+
+	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
-- 
cgit v1.2.3