From 4a3c49240140449ef4c91c4b999a91b11380db3c Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Sun, 24 Jun 2012 00:09:17 -0400
Subject: Fixes #4138: Admin can edit any users' notifications

---
 mod/notifications/groups.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'mod/notifications/groups.php')

diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index 45fb94e83..3e81e474a 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -3,16 +3,16 @@
  * Elgg notifications plugin group index
  *
  * @package ElggNotifications
+ *
+ * @uses $user ElggUser
  */
 
-// Load Elgg framework
-require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
-
-// Ensure only logged-in users can see this page
-gatekeeper();
+if (!isset($user) || !($user instanceof ElggUser)) {
+	$url = 'notifications/group/' . elgg_get_logged_in_user_entity()->username;
+	forward($url);
+}
 
-elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
-$user = elgg_get_page_owner_entity();
+elgg_set_page_owner_guid($user);
 
 // Set the context to settings
 elgg_set_context('settings');
@@ -27,12 +27,15 @@ $people = array();
 
 $groupmemberships = elgg_get_entities_from_relationship(array(
 	'relationship' => 'member',
-	'relationship_guid' => elgg_get_logged_in_user_guid(),
+	'relationship_guid' => $user->guid,
 	'types' => 'group',
 	'limit' => 9999,
 ));
 
-$body = elgg_view_form('notificationsettings/groupsave', array(), array('groups' => $groupmemberships));
+$body = elgg_view_form('notificationsettings/groupsave', array(), array(
+	'groups' => $groupmemberships,
+	'user' => $user,
+));
 
 $params = array(
 	'content' => $body,
-- 
cgit v1.2.3


From 865ea89ad695bec25407f7f218e10385a3ebb6b6 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Sun, 24 Jun 2012 00:52:31 -0400
Subject: fixed owner block display

---
 mod/notifications/groups.php | 2 +-
 mod/notifications/index.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'mod/notifications/groups.php')

diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index 3e81e474a..3347d4054 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -12,7 +12,7 @@ if (!isset($user) || !($user instanceof ElggUser)) {
 	forward($url);
 }
 
-elgg_set_page_owner_guid($user);
+elgg_set_page_owner_guid($user->guid);
 
 // Set the context to settings
 elgg_set_context('settings');
diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index f4143f57b..cd1857f04 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -12,7 +12,7 @@ if (!isset($user) || !($user instanceof ElggUser)) {
 	forward($url);
 }
 
-elgg_set_page_owner_guid($user);
+elgg_set_page_owner_guid($user->guid);
 
 // Set the context to settings
 elgg_set_context('settings');
-- 
cgit v1.2.3