3 files changed, 36 insertions, 31 deletions
diff --git a/mod/invitefriends/index.php b/mod/invitefriends/index.php
deleted file mode 100644
index 7b4c34562..000000000
--- a/mod/invitefriends/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Elgg invite page
- *
- * @package ElggInviteFriends
- */
-
-require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
-
-gatekeeper();
-
-elgg_set_context('friends');
-set_page_owner(get_loggedin_userid());
-
-$body = elgg_view('invitefriends/form');
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
-
-echo elgg_view_page(elgg_echo('friends:invite'), $body);
diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
index abba12f20..bd470f144 100644
--- a/mod/invitefriends/start.php
+++ b/mod/invitefriends/start.php
@@ -5,16 +5,42 @@
  * @package ElggInviteFriends
  */
 
+elgg_register_event_handler('init', 'system', 'invitefriends_init');
+
+function invitefriends_init() {
+	register_page_handler('invite', 'invitefriends_page_handler');
+
+	elgg_register_action('invitefriends/invite', elgg_get_plugin_path() . 'invitefriends/actions/invite.php');
+
+	$params = array(
+		'name' => 'invite',
+		'title' => elgg_echo('friends:invite'),
+		'url' => "pg/invite/",
+		'contexts' => array('friends'),
+	);
+	elgg_register_menu_item('page', $params);
+}
+
 /**
- * Add menu item for invite friends
+ * Page handler function
+ * 
+ * @param array $page Page URL segments
  */
-function invitefriends_pagesetup() {
-	if (elgg_get_context() == "friends" ||
-		elgg_get_context() == "friendsof" ||
-		elgg_get_context() == "collections") {
-			add_submenu_item(elgg_echo('friends:invite'), "mod/invitefriends/",'invite');
-	}
-}
+function invitefriends_page_handler($page) {
+	gatekeeper();
 
-elgg_register_action('invitefriends/invite', elgg_get_plugin_path() . 'invitefriends/actions/invite.php');
-elgg_register_event_handler('pagesetup', 'system', 'invitefriends_pagesetup');
+	elgg_set_context('friends');
+	set_page_owner(get_loggedin_userid());
+
+	$title = elgg_echo('friends:invite');
+
+	$body = elgg_view('invitefriends/form');
+
+	$params = array(
+		'content' => $body,
+		'title' => $title,
+	);
+	$body = elgg_view_layout('one_sidebar', $params);
+
+	echo elgg_view_page($title, $body);
+}
diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
index dceac6bbc..6d381a8ed 100644
--- a/mod/invitefriends/views/default/invitefriends/formitems.php
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -7,13 +7,11 @@
  */
 
 if ($CONFIG->allow_registration) {
-	$invite = elgg_echo('friends:invite');
 	$introduction = elgg_echo('invitefriends:introduction');
 	$message = elgg_echo('invitefriends:message');
 	$default = elgg_echo('invitefriends:message:default', array($CONFIG->site->name));
 
 	echo <<< HTML
-<h2>$invite</h2>
 <p class="margin-top">
 	<label>
 		$introduction