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, 36 insertions, 37 deletions

diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index 47e4baad9..93741d76e 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -1,39 +1,38 @@
 <?php
 
-	/**
-	 * Elgg notifications plugin 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;
-		$people = array();
-		if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => $SESSION['user']->guid, 'types' => 'user', 'limit' => 99999))) {
-			foreach($people_ents as $ent)
-				$people[] = $ent->guid;
-		}
-		$body = elgg_view('notifications/subscriptions/form',array(
-							'people' => $people
-						));
-		
-	// 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'),$body);
-		
-?>
\ No newline at end of file
+/**
+ * Elgg notifications plugin 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();
+if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => get_loggedin_userid(), 'types' => 'user', 'limit' => 99999))) {
+	foreach($people_ents as $ent) {
+		$people[] = $ent->guid;
+	}
+}
+
+$body = elgg_view('notifications/subscriptions/form', array('people' => $people));
+
+// Insert it into the correct canvas layout
+$body = elgg_view_layout('one_column_with_sidebar', $body);
+
+
+page_draw(elgg_echo('notifications:subscriptions:changesettings'), $body);