FIX: enable export of feed items to ICS file

* feed item links had been changed in previous commits without updating handling in ICS export

code/Calendar.php

@@ -10,7 +10,7 @@ class Calendar extends Page {
 		'EventsPerPage' => 'Int',
 		'DefaultView' => "Enum('today,week,month,weekend,upcoming','upcoming')"
 	);
-	
+
 	private static $has_many = array (
 		'Announcements' => 'CalendarAnnouncement',
 		'Feeds' => 'ICSFeed'
@@ -27,15 +27,15 @@ class Calendar extends Page {
 	private static $allowed_children = array (
 		'CalendarEvent'
 	);
-	
+
 	private static $defaults = array (
 		'DefaultDateHeader' => 'Upcoming Events',
 		'OtherDatesCount' => '3',
 		'DefaultFutureMonths' => '6',
 		'EventsPerPage' => '10',
 		'DefaultView' => 'upcoming'
 	);
-	
+
 	private static $reccurring_event_index = 0;
 
 	private static $icon = "event_calendar/images/calendar";
@@ -54,9 +54,9 @@ class Calendar extends Page {
 
 	private static $caching_enabled = false;
 
-	protected $eventClass_cache, 
-			  $announcementClass_cache, 
-			  $datetimeClass_cache, 
+	protected $eventClass_cache,
+			  $announcementClass_cache,
+			  $datetimeClass_cache,
 			  $dateToEventRelation_cache,
 			  $announcementToCalendarRelation_cache,
 			  $EventList_cache;
@@ -70,13 +70,13 @@ public static function enable_caching() {
 	}
 
 	public function getCMSFields() {
-		
+
 		$self = $this;
-		
+
 		$this->beforeUpdateCMSFields(function($f) use ($self) {
 
 			Requirements::javascript('event_calendar/javascript/calendar_cms.js');
-	
+
 			$configuration = _t('Calendar.CONFIGURATION','Configuration');
 			$f->addFieldsToTab("Root.$configuration", array(
 				DropdownField::create('DefaultView',_t('Calendar.DEFAULTVIEW','Default view'), array (
@@ -91,7 +91,7 @@ public function getCMSFields() {
 				TextField::create('DefaultDateHeader', _t('Calendar.DEFAULTDATEHEADER','Default date header (displays when no date range has been selected)')),
 				NumericField::create('OtherDatesCount', _t('Calendar.NUMBERFUTUREDATES','Number of future dates to show for repeating events'))
 			));
-			
+
 			// Announcements
 			$announcements = _t('Calendar.Announcements','Announcements');
 			$f->addFieldToTab("Root.$announcements", $announcementsField = GridField::create(
@@ -101,7 +101,7 @@ public function getCMSFields() {
 					GridFieldConfig_RecordEditor::create()
 				));
 			$announcementsField->setDescription(_t('Calendar.ANNOUNCEMENTDESCRIPTION','Announcements are simple entries you can add to your calendar that do not have detail pages, e.g. "Office closed"'));
-			
+
 			// Feeds
 			$feeds = _t('Calendar.FEEDS','Feeds');
 			$f->addFieldToTab("Root.$feeds", $feedsField = GridField::create(
@@ -111,22 +111,22 @@ public function getCMSFields() {
 				GridFieldConfig_RecordEditor::create()
 			));
 			$feedsField->setDescription(_t('Calendar.ICSFEEDDESCRIPTION','Add ICS feeds to your calendar to include events from external sources, e.g. a Google Calendar'));
-	
+
 			$otherCals = Calendar::get()->exclude(array("ID" => $self->ID));
 			if($otherCals->exists()) {
 				$f->addFieldToTab("Root.$feeds", new CheckboxSetField(
-					'NestedCalendars', 
+					'NestedCalendars',
 					_t('Calendar.NESTEDCALENDARS','Include events from these calendars'),
 					$otherCals->map('ID', 'Link')
 				));
 			}
-			
+
 			$f->addFieldToTab("Root.Main", new TextField('RSSTitle', _t('Calendar.RSSTITLE','Title of RSS Feed')),'Content');
 
 		});
-		
+
 		$f = parent::getCMSFields();
-		
+
 		return $f;
 	}
 
@@ -171,13 +171,13 @@ public function getCachedEventList($start, $end, $filter = null, $limit = null)
 
 	}
 
-	public function getEventList($start, $end, $filter = null, $limit = null, $announcement_filter = null) {		
+	public function getEventList($start, $end, $filter = null, $limit = null, $announcement_filter = null) {
 		if(Config::inst()->get("Calendar", "caching_enabled")) {
 			return $this->getCachedEventList($start, $end, $filter, $limit);
 		}
 
 		$eventList = new ArrayList();
-		
+
 		foreach($this->getAllCalendars() as $calendar) {
 			if($events = $calendar->getStandardEvents($start, $end, $filter)) {
 				$eventList->merge($events);
@@ -246,7 +246,7 @@ protected function getStandardEvents($start, $end, $filter = null) {
 		if($filter) {
 			$list = $list->where($filter);
 		}
-		
+
 		return $list;
 	}
 
@@ -287,7 +287,7 @@ public function getNextRecurringEvents($event_obj, $datetime_obj, $limit = null)
 			}
 			$counter->tomorrow();
 		}
-		return $dates;	
+		return $dates;
 	}
 
 	protected function addRecurringEvents($start_date, $end_date, $recurring_events,$all_events) {
@@ -364,18 +364,20 @@ public function getFeedEvents($start_date, $end_date) {
 				// translate iCal schema into CalendarAnnouncement schema (datetime + title/content)
 				$feedevent = new CalendarAnnouncement;
                 //pass ICS feed ID to event list
-				$feedevent->ID = 'ICS_'.$feed->ID;
+                $feedevent->ID = 'ICS_'.$feed->ID;
+                $feedevent->Feed = true;
+                $feedevent->CalendarID = $this->ID;
 				$feedevent->Title = $event['SUMMARY'];
 				if ( isset($event['DESCRIPTION']) ) {
 					$feedevent->Content = $event['DESCRIPTION'];
 				}
 				$startdatetime = $this->iCalDateToDateTime($event['DTSTART']);//->setTimezone(new DateTimeZone($this->stat('timezone')));
 				$enddatetime = $this->iCalDateToDateTime($event['DTEND']);//->setTimezone(new DateTimeZone($this->stat('timezone')));
-                
+
                 //Set event start/end to midnight to allow comparisons below to work
    				$startdatetime->modify('00:00:00');
 				$enddatetime->modify('00:00:00');
-                
+
 				if ( ($startdatetime < $start && $enddatetime < $start)
 					|| $startdatetime > $end && $enddatetime > $end) {
 					// do nothing; dates outside range
@@ -425,14 +427,14 @@ public function UpcomingAnnouncements($limit = 5, $filter = null) {
 			->where($filter)
 			->limit($limit);
 	}
-	
+
 	public function RecentEvents($limit = null, $filter = null)  {
 		$start_date = sfDate::getInstance();
 		$end_date = sfDate::getInstance();
 		$l = ($limit === null) ? "9999" : $limit;
 		$events = $this->getEventList(
 			$start_date->subtractMonth($this->DefaultFutureMonths)->date(),
-			$end_date->yesterday()->date(), 
+			$end_date->yesterday()->date(),
 			$filter,
 			$l
 		);
@@ -464,11 +466,11 @@ public function MonthJumpForm() {
 		$c = new Calendar_Controller($this);
 		return $c->MonthJumpForm();
 	}
-	
+
 }
 
 class Calendar_Controller extends Page_Controller {
-	
+
 	private static $allowed_actions = array (
 		'show',
 		'month',
@@ -668,13 +670,13 @@ public function rss() {
 
 	public function monthjson(SS_HTTPRequest $r) {
 		if(!$r->param('ID')) return false;
-        
+
         //Increase the per page limit to 500 as the AJAX request won't look for further pages
         $this->EventsPerPage = 500;
-        
+
 		$this->startDate = sfDate::getInstance(CalendarUtil::get_date_from_string($r->param('ID')));
 		$this->endDate = sfDate::getInstance($this->startDate)->finalDayOfMonth();
-		
+
 		$json = array ();
 		$counter = clone $this->startDate;
 		while($counter->get() <= $this->endDate->get()) {
@@ -683,7 +685,7 @@ public function monthjson(SS_HTTPRequest $r) {
 				'events' => array ()
 			);
 			$counter->tomorrow();
-		}		
+		}
 		$list = $this->Events();
 		foreach($list as $e) {
 			foreach($e->getAllDatesInRange() as $date) {
@@ -713,8 +715,8 @@ public function ics(SS_HTTPRequest $r) {
 		$id = $r->param('ID');
 		$oid = $r->param('OtherID');
 
-		if(stristr($id, "feed") !== false) {
-			$id = str_replace("feed","",$id);
+		if(stristr($id, "ICS_") !== false) {
+			$id = str_replace("ICS_","",$id);
 			$feed = true;
 		}
 		else if(stristr($id, "announcement-") !== false) {
@@ -725,7 +727,7 @@ public function ics(SS_HTTPRequest $r) {
 			$announcement = false;
 		}
 		if(is_numeric($id) && $oid) {
-			if(!$feed) { 
+			if(!$feed) {
 				$event = DataObject::get_by_id($announcement ? $this->data()->getDateTimeClass() : $this->data()->getEventClass(), $id);
                 // return if not found
                 if (!$event) {
@@ -797,17 +799,17 @@ public function parseURL(SS_HTTPRequest $r) {
 				$this->view = "day";
 				$this->endDate = sfDate::getInstance($d->get()+1);
 				break;
-				
+
 				case 6:
 				$this->view = "month";
 				$this->endDate = sfDate::getInstance($d->finalDayOfMonth()->date());
 				break;
-				
+
 				case 4:
 				$this->view = "year";
 				$this->endDate = sfDate::getInstance($d->finalDayOfYear()->date());
 				break;
-				
+
 				default:
 				$this->view = "default";
 				$this->endDate = sfDate::getInstance($d->addMonth($this->DefaultFutureMonths)->date());
@@ -836,7 +838,7 @@ public function Events() {
 			null,
 			$announcement_filter
 		);
-		
+
 		$all_events_count = $all->count();
 		$list = $all->limit($this->EventsPerPage, $this->getOffset());
 		$next = $this->getOffset()+$this->EventsPerPage;
@@ -850,23 +852,23 @@ public function DateHeader() {
 			case "day":
 				return CalendarUtil::localize($this->startDate->get(), null, CalendarUtil::ONE_DAY_HEADER);
 			break;
-			
+
 			case "month":
 				return CalendarUtil::localize($this->startDate->get(), null, CalendarUtil::MONTH_HEADER);
 			break;
-			
+
 			case "year":
 				return CalendarUtil::localize($this->startDate->get(), null, CalendarUtil::YEAR_HEADER);
 			break;
-		
+
 			case "range":
 			case "week":
 			case "weekend":
 				list($strStartDate,$strEndDate) = CalendarUtil::get_date_string($this->startDate->date(),$this->endDate->date());
 				return $strStartDate.$strEndDate;
 			break;
-			
-			default: 
+
+			default:
 				return $this->DefaultDateHeader;
 			break;
 		}
@@ -937,7 +939,7 @@ public function IsSegment($segment) {
 	public function MonthJumper() {
 		return $this->renderWith('MonthJumper');
 	}
-	
+
 	public function MonthJumpForm() {
 		$this->parseURL($this->getRequest());
 		$dummy = sfDate::getInstance($this->startDate);
@@ -963,9 +965,9 @@ public function MonthJumpForm() {
 			$m->setValue(date('m'));
 			$y->setValue(date('Y'));
 		}
-		return $f;	
+		return $f;
 	}
-	
+
 	public function doMonthJump($data, $form) {
 		return $this->redirect($this->Link('show').'/'.$data['Year'].$data['Month']);
 	}