From: Steve Sutton Date: Wed, 10 Jun 2015 21:45:35 +0000 (-0400) Subject: Update to use localhost and updates on recurring events X-Git-Tag: v1.3.4^2^2~1 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=d5258fdef042d4c2367998e3ad7c1269ee80a61c;p=web%2FKeweenaw.git Update to use localhost and updates on recurring events --- diff --git a/config/server.ini b/config/server.ini index 40347f9..fd3cc87 100644 --- a/config/server.ini +++ b/config/server.ini @@ -181,7 +181,7 @@ error.display = 1 error.ident = "" error.conf.path = "/var/www/server/" -database.params.host = "devdb" +database.params.host = "localhost" development = On diff --git a/ical/index.php b/ical/index.php index 0551c1a..81a4636 100644 --- a/ical/index.php +++ b/ical/index.php @@ -89,31 +89,43 @@ foreach ($events as $event) { switch ($weekom) { case 9: $freq .= ';INTERVAL=2'; + $ord = ''; break; case 1: + $ord = '1'; break; case 2: + $ord = '2'; break; case 3: + $ord = '3'; break; case 4: + $ord = '4'; break; default: + $ord = ''; break; } $eventDays = array(); $ri = 1; for ($iterator = 1; $iterator <= 7; ++$iterator) { if ($daysOw & $ri) { - $eventDays[] = $weekdays[$iterator]; + $eventDays[] = $ord.$weekdays[$iterator]; } $ri = $ri << 1; } if (!empty($eventDays)) { $daysInWeek = implode(',', $eventDays); } + $categoryName = $event->getCategoryName(); + if ($categoryName) { + echo "\nCATEGORIES:" . $categoryName; + } 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 $eventTemplateEnd; }