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, 18 insertions, 0 deletions

diff --git a/mod/registrationterms/start.php b/mod/registrationterms/start.php
new file mode 100644
index 000000000..3c42aa14a
--- /dev/null
+++ b/mod/registrationterms/start.php
@@ -0,0 +1,18 @@
+<?php
+
+function registrationterms_init() {
+	//put the terms agreement at the very end
+	elgg_extend_view('register/extend', 'registrationterms/register', 1000);
+
+	//block user registration if they don't check the box
+	elgg_register_plugin_hook_handler('action', 'register', 'registrationterms_register_hook');
+}
+
+function registrationterms_register_hook() {
+	if (get_input('agreetoterms', false) != 'true') {
+		register_error(elgg_echo('registrationterms:required'));
+		forward(REFERER);
+	}
+}
+
+elgg_register_event_handler('init', 'system', 'registrationterms_init');