sort events by their start dateHEADmain

1 files changed, 6 insertions, 3 deletions

diff --git a/adminPanel.php b/adminPanel.php
index a45b75c..d0bd859 100755
--- a/adminPanel.php
+++ b/adminPanel.php
@@ -214,6 +214,7 @@ function infocalendar_options_page_html() {
 	$wpdb->show_errors = true;
 	
     ?>
+    <div id="infocal_adm">
     <script>
 		function cal_toggleOldEventsVisibility() {
 			var btn = document.getElementById('cal_hideOldEventsBtn');
@@ -347,7 +348,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()) GROUP BY event.id",
+			(startDate > NOW() OR endDate > NOW()) GROUP BY event.id
+			ORDER BY startDate",
 			'ARRAY_A');
 
 		foreach($result as $row) {
@@ -401,7 +403,7 @@ function infocalendar_options_page_html() {
 			event.id = repeatingEvent.id AND
 			repeatingEvent=1 AND icalImported=0 AND
 			(repeatEndTime > NOW() OR startDate > NOW())
-			GROUP BY event.id", 'ARRAY_A');
+			GROUP BY event.id ORDER BY startDate", 'ARRAY_A');
 		
 		foreach($result as $row) {
 			/* get the creator's name */
@@ -462,7 +464,7 @@ function infocalendar_options_page_html() {
 			calendar.id = eventCalendarMap.calendarID AND
 			repeatingEvent=0 AND icalImported=0 AND
 			(startDate < NOW() AND endDate < NOW())
-			GROUP BY event.id", 'ARRAY_A');
+			GROUP BY event.id ORDER BY startDate", 'ARRAY_A');
 		foreach($result as $row) {
 			/* get the creator's name */
 			$creator = get_username_from_id($row['creator']);
@@ -543,6 +545,7 @@ function infocalendar_options_page_html() {
 			?>
 		</table>
 	</div>
+	</div>
 	
 	<?php
 }