6 files changed, 69 insertions, 58 deletions
diff --git a/mod/invitefriends/actions/invite.php b/mod/invitefriends/actions/invite.php
index 1a8956419..eed156d69 100644
--- a/mod/invitefriends/actions/invite.php
+++ b/mod/invitefriends/actions/invite.php
@@ -47,7 +47,7 @@ foreach ($emails as $email) {
 		continue;
 	}
 
-	$link = elgg_get_site_url() . 'pg/register?friend_guid=' . $current_user->guid . '&invitecode=' . generate_invite_code($current_user->username);
+	$link = elgg_get_site_url() . 'register?friend_guid=' . $current_user->guid . '&invitecode=' . generate_invite_code($current_user->username);
 	$message = elgg_echo('invitefriends:email', array(
 					$site->name,
 					$current_user->name,
@@ -60,7 +60,7 @@ foreach ($emails as $email) {
 
 	// create the from address
 	$site = get_entity($site->guid);
-	if (($site) && (isset($site->email))) {
+	if ($site && $site->email) {
 		$from = $site->email;
 	} else {
 		$from = 'noreply@' . get_site_domain($site->guid);
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index cf039ee13..b36238a05 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
-	<field key="author" value="Curverider" />
-	<field key="version" value="1.7" />
-	<field key="description" value="Invite friends to Elgg network via email invites." />
-	<field key="website" value="http://www.elgg.org/" />
-	<field key="copyright" value="(C) Curverider 2008-2010" />
-	<field key="licence" value="GNU Public License version 2" />
-	<field key="elgg_version" value="2010030101" />
-	<field key="admin_interface" value="advanced" />
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Invite Friends</name>
+	<author>Core developers</author>
+	<version>1.8</version>
+	<category>bundled</category>
+	<category>social</category>
+	<description>Invite friends via email invites.</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
index 1b1b0a0ed..368f6348a 100644
--- a/mod/invitefriends/start.php
+++ b/mod/invitefriends/start.php
@@ -8,29 +8,32 @@
 elgg_register_event_handler('init', 'system', 'invitefriends_init');
 
 function invitefriends_init() {
-	register_page_handler('invite', 'invitefriends_page_handler');
+	elgg_register_page_handler('invite', 'invitefriends_page_handler');
 
 	elgg_register_action('invitefriends/invite', elgg_get_plugins_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);
+	if (elgg_is_logged_in()) {
+		$params = array(
+			'name' => 'invite',
+			'text' => elgg_echo('friends:invite'),
+			'href' => "invite",
+			'contexts' => array('friends'),
+		);
+		elgg_register_menu_item('page', $params);
+	}
 }
 
 /**
  * Page handler function
  * 
  * @param array $page Page URL segments
+ * @return bool
  */
 function invitefriends_page_handler($page) {
 	gatekeeper();
 
 	elgg_set_context('friends');
-	set_page_owner(elgg_get_logged_in_user_guid());
+	elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 
 	$title = elgg_echo('friends:invite');
 
@@ -43,4 +46,5 @@ function invitefriends_page_handler($page) {
 	$body = elgg_view_layout('one_sidebar', $params);
 
 	echo elgg_view_page($title, $body);
+	return true;
 }
diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php
new file mode 100644
index 000000000..0d7f5d9f2
--- /dev/null
+++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Elgg invite form contents
+ *
+ * @package ElggInviteFriends
+ */
+
+if (elgg_get_config('allow_registration')) {
+	$site = elgg_get_site_entity();
+	$introduction = elgg_echo('invitefriends:introduction');
+	$message = elgg_echo('invitefriends:message');
+	$default = elgg_echo('invitefriends:message:default', array($site->name));
+
+	echo <<< HTML
+<div>
+	<label>
+		$introduction
+		<textarea class="elgg-input-textarea" name="emails" ></textarea>
+	</label>
+</div>
+<div>
+	<label>
+		$message
+		<textarea class="elgg-input-textarea" name="emailmessage" >$default</textarea>
+	</label>
+</div>
+HTML;
+
+	echo '<div class="elgg-foot">';
+	echo elgg_view('input/submit', array('value' => elgg_echo('send')));
+	echo '</div>';
+} else {
+	echo elgg_echo('invitefriends:registration_disabled');
+}
diff --git a/mod/invitefriends/views/default/invitefriends/form.php b/mod/invitefriends/views/default/invitefriends/form.php
index 7ab9314f7..badcf8759 100644
--- a/mod/invitefriends/views/default/invitefriends/form.php
+++ b/mod/invitefriends/views/default/invitefriends/form.php
@@ -5,9 +5,4 @@
  * @package ElggInviteFriends
  */
 
-echo elgg_view('input/form', array(
-								'action' => 'action/invitefriends/invite',
-								'body' => elgg_view('invitefriends/formitems'),
-								'method' => 'post'
-								)
-);
+echo elgg_view_form('invitefriends/invite');
diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
index 555311dd0..afdff4164 100644
--- a/mod/invitefriends/views/default/invitefriends/formitems.php
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -1,33 +1,4 @@
-<?php
+<?php 
 
-/**
- * Elgg invite form contents
- *
- * @package ElggInviteFriends
- */
-
-if (elgg_get_config('allow_registration')) {
-	$site = elgg_get_site_entity();
-	$introduction = elgg_echo('invitefriends:introduction');
-	$message = elgg_echo('invitefriends:message');
-	$default = elgg_echo('invitefriends:message:default', array($site->name));
-
-	echo <<< HTML
-<p class="margin-top">
-	<label>
-		$introduction
-		<textarea class="elgg-input-textarea" name="emails" ></textarea>
-	</label>
-</p>
-<p>
-	<label>
-		$message
-		<textarea class="elgg-input-textarea" name="emailmessage" >$default</textarea>
-	</label>
-</p>
-HTML;
-
-	echo elgg_view('input/submit', array('value' => elgg_echo('send')));
-} else {
-	echo elgg_echo('invitefriends:registration_disabled');
-}
+elgg_deprecated_notice("invitefriends/formitems was moved to forms/invitefriends/invite", 1.8);
+echo elgg_view('forms/invitefriends/invite');
+\ No newline at end of file