aboutsummaryrefslogtreecommitdiff
path: root/mod/groups
diff options
context:
space:
mode:
Diffstat (limited to 'mod/groups')
-rw-r--r--mod/groups/actions/delete.php2
-rw-r--r--mod/groups/actions/forums/addtopic.php6
-rw-r--r--mod/groups/actions/forums/edittopic.php2
-rw-r--r--mod/groups/actions/leave.php2
-rw-r--r--mod/groups/groupprofile.php2
-rw-r--r--mod/groups/membership.php2
-rw-r--r--mod/groups/start.php6
-rw-r--r--mod/groups/views/default/forum/topics.php2
-rw-r--r--mod/groups/views/default/forum/viewposts.php2
-rw-r--r--mod/groups/views/default/groups/forum_latest.php2
-rw-r--r--mod/groups/views/default/groups/side_menu.php4
11 files changed, 16 insertions, 16 deletions
diff --git a/mod/groups/actions/delete.php b/mod/groups/actions/delete.php
index b4bc71838..7d66b2a25 100644
--- a/mod/groups/actions/delete.php
+++ b/mod/groups/actions/delete.php
@@ -14,6 +14,6 @@
else
register_error(elgg_echo('group:notdeleted'));
- $url_name = $_SESSION['user']->username;
+ $url_name = get_loggedin_user()->username;
forward("{$vars['url']}pg/groups/member/{$url_name}");
?> \ No newline at end of file
diff --git a/mod/groups/actions/forums/addtopic.php b/mod/groups/actions/forums/addtopic.php
index a0b9acc10..5f9c8e709 100644
--- a/mod/groups/actions/forums/addtopic.php
+++ b/mod/groups/actions/forums/addtopic.php
@@ -11,7 +11,7 @@
// Check the user is a group member
$group_entity = get_entity(get_input('group_guid'));
- if (!$group_entity->isMember($vars['user'])) forward();
+ if (!$group_entity->isMember(get_loggedin_user())) forward();
// Get input data
$title = strip_tags(get_input('topictitle'));
@@ -19,7 +19,7 @@
$tags = get_input('topictags');
$access = get_input('access_id');
$group_guid = (int) get_input('group_guid');
- $user = $_SESSION['user']->getGUID(); // you need to be logged in to comment on a group forum
+ $user = get_loggedin_userid(); // you need to be logged in to comment on a group forum
$status = get_input('status'); // sticky, resolved, closed
// Convert string of tags into a preformatted array
@@ -60,7 +60,7 @@
$grouptopic->status = $status; // the current status i.e sticky, closed, resolved, open
// add to river
- add_to_river('river/forum/topic/create','create',$_SESSION['user']->guid,$grouptopic->guid);
+ add_to_river('river/forum/topic/create','create',get_loggedin_userid(),$grouptopic->guid);
// Success message
system_message(elgg_echo("grouptopic:created"));
diff --git a/mod/groups/actions/forums/edittopic.php b/mod/groups/actions/forums/edittopic.php
index c7da084da..59c46af73 100644
--- a/mod/groups/actions/forums/edittopic.php
+++ b/mod/groups/actions/forums/edittopic.php
@@ -8,7 +8,7 @@ if (!isloggedin()) forward();
// Check the user is a group member
$group_entity = get_entity(get_input('group_guid'));
-if (!$group_entity->isMember($vars['user'])) forward();
+if (!$group_entity->isMember(get_loggedin_user())) forward();
// Get input data
$title = strip_tags(get_input('topictitle'));
diff --git a/mod/groups/actions/leave.php b/mod/groups/actions/leave.php
index 721bff2c8..58f2655ad 100644
--- a/mod/groups/actions/leave.php
+++ b/mod/groups/actions/leave.php
@@ -14,7 +14,7 @@
$group_guid = get_input('group_guid');
$user = NULL;
- if (!$user_guid) $user = $_SESSION['user'];
+ if (!$user_guid) $user = get_loggedin_user();
else
$user = get_entity($user_guid);
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index f0e6854ee..a64ca55db 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -33,7 +33,7 @@
//group members
$area3 = elgg_view('groups/members',array('entity' => $group));
} else {
- $area2 .= elgg_view('groups/closedmembership', array('entity' => $group, 'user' => $_SESSION['user'], 'full' => true));
+ $area2 .= elgg_view('groups/closedmembership', array('entity' => $group, 'user' => get_loggedin_user(), 'full' => true));
}
$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index 7f9cfdbf5..0085033fa 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -14,7 +14,7 @@
$limit = get_input("limit", 10);
$offset = get_input("offset", 0);
- if (page_owner() == $_SESSION['user']->guid) {
+ if (page_owner() == get_loggedin_userid()) {
$title = elgg_echo("groups:yours");
} else $title = elgg_echo("groups:owned");
diff --git a/mod/groups/start.php b/mod/groups/start.php
index b87acbaec..689e24863 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -152,7 +152,7 @@
if ($method == 'sms') {
return elgg_echo("groupforumtopic:new") . ': ' . $url . " ({$owner->name}: {$title})";
} else {
- return $_SESSION['user']->name . ' ' . elgg_echo("groups:viagroups") . ': ' . $title . "\n\n" . $msg . "\n\n" . $entity->getURL();
+ return get_loggedin_user()->name . ' ' . elgg_echo("groups:viagroups") . ': ' . $title . "\n\n" . $msg . "\n\n" . $entity->getURL();
}
}
@@ -373,7 +373,7 @@
function groups_read_acl_plugin_hook($hook, $entity_type, $returnvalue, $params)
{
//error_log("READ: " . var_export($returnvalue));
- $user = $_SESSION['user'];
+ $user = get_loggedin_user();
if ($user)
{
// Not using this because of recursion.
@@ -517,7 +517,7 @@
{
//logged in user
- $user = $_SESSION['user']->guid;
+ $user = get_loggedin_userid();
if (($entity->owner_guid == $user) || $group_owner == $user || isadminloggedin()) {
return true;
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index 91834aa08..d5e533f81 100644
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -9,7 +9,7 @@
<h2><?php echo elgg_echo("groups:forum"); ?></h2>
</div>
<?php // only show the add topic button if the user is a member
- if(page_owner_entity()->isMember($vars['user'])) {
+ if(page_owner_entity()->isMember(get_loggedin_user())) {
?>
<div class="content_header_options">
<a class="action_button" href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a>
diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php
index aa8b334f2..f0810ba18 100644
--- a/mod/groups/views/default/forum/viewposts.php
+++ b/mod/groups/views/default/forum/viewposts.php
@@ -39,7 +39,7 @@ echo elgg_view('navigation/pagination',array(
echo "<h3>" . elgg_echo("groups:topicisclosed") . "</h3>";
echo "<p>" . elgg_echo("groups:topiccloseddesc") . "</p>";
- }elseif(page_owner_entity()->isMember($vars['user'])){
+ }elseif(page_owner_entity()->isMember(get_loggedin_user())){
//comments are on and the user viewing is a member
echo elgg_view_comments($vars['entity']);
}else{
diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php
index 161455703..2a9ddaf42 100644
--- a/mod/groups/views/default/groups/forum_latest.php
+++ b/mod/groups/views/default/groups/forum_latest.php
@@ -23,7 +23,7 @@ if($vars['entity']->forum_enable != 'no'){
echo "</div>";
}
} else {
- if(page_owner_entity()->isMember($vars['user'])){
+ if(page_owner_entity()->isMember(get_loggedin_user())){
$create_discussion = $vars['url'] . "mod/groups/addtopic.php?group_guid=" . page_owner();
echo "<p class='margin_top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>";
}else{
diff --git a/mod/groups/views/default/groups/side_menu.php b/mod/groups/views/default/groups/side_menu.php
index a86cd8adb..3048ea431 100644
--- a/mod/groups/views/default/groups/side_menu.php
+++ b/mod/groups/views/default/groups/side_menu.php
@@ -1,8 +1,8 @@
<ul class="submenu page_navigation">
<?php
if(isloggedin()){
- echo "<li><a href=\"{$vars['url']}pg/groups/member/{$_SESSION['user']->username}\">". elgg_echo('groups:yours') ."</a></li>";
- echo "<li><a href=\"{$vars['url']}pg/groups/invitations/{$_SESSION['user']->username}\">". elgg_echo('groups:invitations') ."</a></li>";
+ echo "<li><a href=\"{$vars['url']}pg/groups/member/{get_loggedin_user()->username}\">". elgg_echo('groups:yours') ."</a></li>";
+ echo "<li><a href=\"{$vars['url']}pg/groups/invitations/{get_loggedin_user()->username}\">". elgg_echo('groups:invitations') ."</a></li>";
}
?>
</ul> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-28 23:41:57 +0000