Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 44 insertions, 0 deletions

diff --git a/mod/event_calendar/views/ical/object/event_calendar.php b/mod/event_calendar/views/ical/object/event_calendar.php
new file mode 100644
index 000000000..36d71a66c
--- /dev/null
+++ b/mod/event_calendar/views/ical/object/event_calendar.php
@@ -0,0 +1,44 @@
+<?php 
+$event = $vars['entity'];
+if ($event->organizer) {
+	$organizer = "\nORGANIZER;CN={$event->organizer}\n";
+} else {
+	$organizer = '';
+}
+
+if ($event->description) {
+	// make sure that we are using Unix line endings
+	$description = str_replace("\r\n","\n",$event->description);
+	$description = str_replace("\r","\n",$description);
+	
+	// now convert to icalendar format
+	$description = str_replace("\n",'\n',$description);
+	$description = wordwrap($description,75,"\r\n ",TRUE);
+} else {
+	$description = '';
+}
+?>
+BEGIN:VEVENT
+UID:<?php echo elgg_get_site_url().'event_calendar/view/'.$event->guid; ?>
+
+URL:<?php echo elgg_get_site_url().'event_calendar/view/'.$event->guid; ?>
+
+DTSTAMP:<?php echo date("Ymd\THis\Z", $event->getTimeUpdated())?>
+
+CREATED:<?php echo date("Ymd\THis\Z", $event->getTimeCreated())?>
+
+LAST-MODIFIED:<?php echo date("Ymd\THis\Z", $event->getTimeUpdated())  ?>
+
+DTSTART;VALUE=DATE:<?php echo date("Ymd\THis\Z", $event->start_date);  ?>
+
+DTEND;VALUE=DATE:<?php echo date("Ymd\THis\Z", $event->real_end_time);  ?>
+
+SUMMARY:<?php echo $event->title;  ?>
+
+DESCRIPTION:<?php echo $description;  ?>
+
+LOCATION:<?php echo $event->venue;  ?><?php echo $organizer;  ?>
+
+CATEGORIES:<?php implode(",",$event->tags);  ?>
+
+END:VEVENT