Update ical feed

Now has the full address for the events.
Also fixes ongoing events (non repeating)

diff --git a/ical/index.php b/ical/index.php
index 6a1d18e..cfb3c7f 100644 (file)
--- a/ical/index.php
+++ b/ical/index.php
@@ -61,7 +61,9 @@ foreach ($events as $event) {
         icalDateFormat($event->getCreated(), false),
         icalDateFormat($event->getStarting(), $event->getStartHourArray()),
         icalDateFormat($event->getStarting(), $event->getStartHourArray()),
-        icalDateFormat($event->getEnding(), $event->getEndHourArray()),
+        ($event->getRecurr())
+            ? icalDateFormat($event->getStarting(), $event->getEndHourArray())
+            : icalDateFormat($event->getEnding(), $event->getEndHourArray()),
         $description,
         $event->getHeader()
     );
@@ -72,6 +74,18 @@ foreach ($events as $event) {
     }
     if ($event->getPlace()) {
         echo "\nLOCATION:" . $event->getPlace();
+        if ($event->getAddress()) {
+            echo "\," . $event->getAddress();
+        }
+        if ($event->getCity()) {
+            echo "\," . $event->getCity();
+        }
+        if ($event->getState()) {
+            echo "\," . $event->getState();
+        }
+        if ($event->getZip()) {
+            echo "\," . $event->getZip();
+        }
     }
     // if event has contact data
     if ($event->hasContactInfo()) {
@@ -127,7 +141,7 @@ foreach ($events as $event) {
             echo "\nRRULE:" .$freq . ';BYDAY=' . $daysInWeek . ';UNTIL=' . icalDateFormat($event->getEnding(), $event->getEndHourArray());
         }
     } else if ($event->getStarting() != $event->getEnding()) {
-        echo "\nRRULE:FREQ=DAILY;UNTIL=" . icalDateFormat($event->getEnding(), $event->getEndHourArray());
+        //echo "\nRRULE:FREQ=DAILY;UNTIL=" . icalDateFormat($event->getEnding(), $event->getEndHourArray());
     }
     echo $eventTemplateEnd;
 }