merged in notifications plugin cleanup from 1.7 branch: [5962], [5978] - [5980], [6000]

git-svn-id: http://code.elgg.org/elgg/trunk@6020 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 38 insertions, 40 deletions

diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index c742f858d..d6de57832 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -1,42 +1,40 @@
 <?php
 
-	/**
-	 * Elgg notifications plugin group index
-	 * 
-	 * @package ElggNotifications
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
-	// Load Elgg framework
-		require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
-		
-	// Ensure only logged-in users can see this page
-		gatekeeper();
-		
-	// Set the context to settings
-		set_context('settings');
-		
-	// Get the form
-		global $SESSION, $CONFIG;
-		$people = array();
-		
-		$groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => $_SESSION['user']->guid, 'types' => 'group', 'limit' => 9999));
-		
-		$body = elgg_view('input/form',array(
-			'body' => elgg_view('notifications/subscriptions/groupsform',array(
-							'groups' => $groupmemberships
-						)),
-			'method' => 'post',
-			'action' => $CONFIG->wwwroot . 'action/notificationsettings/groupsave'
-		));
-		
-	// Insert it into the correct canvas layout
-		$body = elgg_view_layout('one_column_with_sidebar', $body);
-		
-	// Draw the page
-		page_draw(elgg_echo('notifications:subscriptions:changesettings:groups'),$body);
-		
-?>
\ No newline at end of file
+/**
+ * Elgg notifications plugin group index
+ *
+ * @package ElggNotifications
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+// Load Elgg framework
+require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+
+// Ensure only logged-in users can see this page
+gatekeeper();
+
+set_page_owner(get_loggedin_userid());
+
+// Set the context to settings
+set_context('settings');
+
+// 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' => $CONFIG->wwwroot . 'action/notificationsettings/groupsave'
+));
+
+// Insert it into the correct canvas layout
+$body = elgg_view_layout('one_column_with_sidebar', $body);
+
+
+page_draw(elgg_echo('notifications:subscriptions:changesettings:groups'), $body);