1 files changed, 27 insertions, 17 deletions
diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index 9b176955a..973f3493c 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -1,36 +1,46 @@
 <?php
-
 /**
  * Elgg notifications plugin group index
  *
  * @package ElggNotifications
+ *
+ * @uses $user ElggUser
  */
 
-// Load Elgg framework
-require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+if (!isset($user) || !($user instanceof ElggUser)) {
+	$url = 'notifications/group/' . elgg_get_logged_in_user_entity()->username;
+	forward($url);
+}
 
-// Ensure only logged-in users can see this page
-gatekeeper();
-
-set_page_owner(get_loggedin_userid());
+elgg_set_page_owner_guid($user->guid);
 
 // Set the context to settings
 elgg_set_context('settings');
 
+$title = elgg_echo('notifications:subscriptions:changesettings:groups');
+
+elgg_push_breadcrumb(elgg_echo('settings'), "settings/user/$user->username");
+elgg_push_breadcrumb($title);
+
 // Get the form
 $people = array();
 
-$groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => get_loggedin_userid(), 'types' => 'group', 'limit' => 9999));
-
-$form_body = elgg_view('notifications/subscriptions/groupsform',array('groups' => $groupmemberships));
-$body = elgg_view('input/form',array(
-		'body' => $form_body,
-		'method' => 'post',
-		'action' => 'action/notificationsettings/groupsave'
+$groupmemberships = elgg_get_entities_from_relationship(array(
+	'relationship' => 'member',
+	'relationship_guid' => $user->guid,
+	'type' => 'group',
+	'limit' => false,
 ));
 
-// Insert it into the correct canvas layout
-$body = elgg_view_layout('one_column_with_sidebar', $body);
+$body = elgg_view_form('notificationsettings/groupsave', array(), array(
+	'groups' => $groupmemberships,
+	'user' => $user,
+));
 
+$params = array(
+	'content' => $body,
+	'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
 
-echo elgg_view_page(elgg_echo('notifications:subscriptions:changesettings:groups'), $body);
+echo elgg_view_page($title, $body);