add ical exports, fix event listing

1 files changed, 4 insertions, 1 deletions

diff --git a/adminPanel.php b/adminPanel.php
index 0c48886..a45b75c 100755
--- a/adminPanel.php
+++ b/adminPanel.php
@@ -23,6 +23,8 @@ function infocalendar_options_page() {
 		'infoCalendar',
 		'infocalendar_options_page_html'
 	);
+	
+	infocalendar_add_view_admin_panel();
 }
 
 function get_username_from_id($id) {
@@ -345,7 +347,8 @@ function infocalendar_options_page_html() {
 			WHERE event.id = eventCalendarMap.eventID AND
 			calendar.id = eventCalendarMap.calendarID AND
 			repeatingEvent=0 AND icalImported=0 AND
-			(startDate > NOW() OR endDate > NOW())", 'ARRAY_A');
+			(startDate > NOW() OR endDate > NOW()) GROUP BY event.id",
+			'ARRAY_A');
 
 		foreach($result as $row) {
 			/* get the creator's name */