Merge branch 'full' of git://github.com/kevinjardine/Elgg-Event-Calendar

1 files changed, 20 insertions, 0 deletions

diff --git a/actions/event_calendar/join_conference.php b/actions/event_calendar/join_conference.php
new file mode 100644
index 000000000..9eb8f0da9
--- /dev/null
+++ b/actions/event_calendar/join_conference.php
@@ -0,0 +1,20 @@
+<?php
+// extended logic for BBB
+elgg_load_library('elgg:event_calendar');
+
+$event_guid = get_input('event_guid');
+$event = get_entity($event_guid);
+if (elgg_instanceof($event,'object','event_calendar')) {
+	// make sure that the conference still exists, and if not, try recreating it	
+	if (event_calendar_conference_exists($event)) {
+		event_calendar_join_conference($event);
+	} else if (event_calendar_create_bbb_conf($event)) {
+		event_calendar_join_conference($event);
+	} else {
+		register_error(elgg_echo('event_calendar:couldnotjoin'));
+		forward($event->getURL());
+	}
+} else {
+	register_error(elgg_echo('event_calendar:error_nosuchevent'));
+	forward('event_calendar/list');
+}