[svn r11587] Fix multiple bugs with group rights

main/group/group.php

@@ -105,16 +105,16 @@ if (isset ($_GET['action']))
 	switch ($_GET['action'])
 	{
 		case 'self_reg' :
-			if (GroupManager :: is_self_registration_allowed($_SESSION['_uid'], $_GET['group_id']))
+			if (GroupManager :: is_self_registration_allowed($_SESSION['_user']['user_id'], $_GET['group_id']))
 			{
-				GroupManager :: subscribe_users($_SESSION['_uid'], $_GET['group_id']);
+				GroupManager :: subscribe_users($_SESSION['_user']['user_id'], $_GET['group_id']);
 				Display :: display_normal_message(get_lang('GroupNowMember'));
 			}
 			break;
 		case 'self_unreg' :
-			if (GroupManager :: is_self_unregistration_allowed($_SESSION['_uid'], $_GET['group_id']))
+			if (GroupManager :: is_self_unregistration_allowed($_SESSION['_user']['user_id'], $_GET['group_id']))
 			{
-				GroupManager :: unsubscribe_users($_SESSION['_uid'], $_GET['group_id']);
+				GroupManager :: unsubscribe_users($_SESSION['_user']['user_id'], $_GET['group_id']);
 				Display :: display_normal_message(get_lang('StudentDeletesHimself'));
 			}
 			break;
@@ -267,10 +267,10 @@ foreach ($group_cats as $index => $category)
 			}
 
 			// group name
-			if (api_is_allowed_to_edit() || in_array($_user['user_id'],$tutorsids_of_group) || $this_group['is_member'] || GroupManager::user_has_access($_user['user_id'],$this_group['id'],GROUP_TOOL_FORUM) || GroupManager::user_has_access($_user['user_id'],$this_group['id'],GROUP_TOOL_DOCUMENTS))
+			if (api_is_allowed_to_edit() || in_array($_user['user_id'],$tutorsids_of_group) || $this_group['is_member'])
 			{
 				$group_name = '<a href="group_space.php?'.api_get_cidreq().'&amp;origin='.$origin.'&amp;gidReq='.$this_group['id'].'">'.stripslashes($this_group['name']).'</a>';
-				if ($_SESSION['_uid'] && $_SESSION['_uid'] == $this_group['id_tutor'])
+				if ($_SESSION['_user']['_uid'] && $_SESSION['_user']['user_id'] == $this_group['id_tutor'])
 				{
 					$group_name .= ' ('.get_lang('OneMyGroups').')';
 				}