Elgg / Elgg

mod/groups/start.php

Doc Comments +2 added lines, -2 removed lines

@@ -587,7 +587,7 @@ 
  * @elgg_plugin_hook access_collection:display_name access_collection
  *
  * @param \Elgg\Hook $hook Hook
- * @return array
+ * @return null|string
  */
 function groups_set_access_collection_name(\Elgg\Hook $hook) {
 
@@ -811,7 +811,7 @@ 
 /**
  * Runs unit tests for groups
  *
- * @return array
+ * @return string[]
  */
 function groups_test($hook, $type, $value, $params) {
 	$value[] = elgg_get_plugins_path() . 'groups/tests/write_access.php';

Indentation +681 added lines, -681 removed lines

@@ -15,91 +15,91 @@ 
  */
 function groups_init() {
 
-	elgg_register_library('elgg:groups', __DIR__ . '/lib/groups.php');
-	elgg_load_library('elgg:groups');
+    elgg_register_library('elgg:groups', __DIR__ . '/lib/groups.php');
+    elgg_load_library('elgg:groups');
 	
-	// register group entities for search
-	elgg_register_entity_type('group', '');
+    // register group entities for search
+    elgg_register_entity_type('group', '');
 
-	// Set up the menu
-	$item = new ElggMenuItem('groups', elgg_echo('groups'), 'groups/all');
-	elgg_register_menu_item('site', $item);
+    // Set up the menu
+    $item = new ElggMenuItem('groups', elgg_echo('groups'), 'groups/all');
+    elgg_register_menu_item('site', $item);
 
-	// Register a page handler, so we can have nice URLs
-	elgg_register_page_handler('groups', 'groups_page_handler');
+    // Register a page handler, so we can have nice URLs
+    elgg_register_page_handler('groups', 'groups_page_handler');
 
-	// Register URL handlers for groups
-	elgg_register_plugin_hook_handler('entity:url', 'group', 'groups_set_url');
-	elgg_register_plugin_hook_handler('entity:icon:sizes', 'group', 'groups_set_icon_sizes');
+    // Register URL handlers for groups
+    elgg_register_plugin_hook_handler('entity:url', 'group', 'groups_set_url');
+    elgg_register_plugin_hook_handler('entity:icon:sizes', 'group', 'groups_set_icon_sizes');
 
-	// add group activity tool option
-	if (elgg_get_plugin_setting('allow_activity', 'groups') === 'yes') {
-		add_group_tool_option('activity', elgg_echo('groups:enableactivity'), true);
-		elgg_extend_view('groups/tool_latest', 'groups/profile/activity_module');
-	}
+    // add group activity tool option
+    if (elgg_get_plugin_setting('allow_activity', 'groups') === 'yes') {
+        add_group_tool_option('activity', elgg_echo('groups:enableactivity'), true);
+        elgg_extend_view('groups/tool_latest', 'groups/profile/activity_module');
+    }
 
-	// add link to owner block
-	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'groups_activity_owner_block_menu');
+    // add link to owner block
+    elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'groups_activity_owner_block_menu');
 
-	// group entity menu
-	elgg_register_plugin_hook_handler('register', 'menu:entity', 'groups_entity_menu_setup');
+    // group entity menu
+    elgg_register_plugin_hook_handler('register', 'menu:entity', 'groups_entity_menu_setup');
 
-	// group user hover menu
-	elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'groups_user_entity_menu_setup');
+    // group user hover menu
+    elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'groups_user_entity_menu_setup');
 
-	// invitation request actions
-	elgg_register_plugin_hook_handler('register', 'menu:invitationrequest', 'groups_invitationrequest_menu_setup');
+    // invitation request actions
+    elgg_register_plugin_hook_handler('register', 'menu:invitationrequest', 'groups_invitationrequest_menu_setup');
 
-	// group members tabs
-	elgg_register_plugin_hook_handler('register', 'menu:groups_members', 'groups_members_menu_setup');
+    // group members tabs
+    elgg_register_plugin_hook_handler('register', 'menu:groups_members', 'groups_members_menu_setup');
 
-	//extend some views
-	elgg_extend_view('elgg.css', 'groups/css');
-	if (_elgg_view_may_be_altered('groups/js', __DIR__ . '/views/default/groups/js.php')) {
-		elgg_deprecated_notice('groups/js view has been deprecated. Use AMD modules instead', '2.2');
-		elgg_extend_view('elgg.js', 'groups/js');
-	}
+    //extend some views
+    elgg_extend_view('elgg.css', 'groups/css');
+    if (_elgg_view_may_be_altered('groups/js', __DIR__ . '/views/default/groups/js.php')) {
+        elgg_deprecated_notice('groups/js view has been deprecated. Use AMD modules instead', '2.2');
+        elgg_extend_view('elgg.js', 'groups/js');
+    }
 
-	// Access permissions
-	elgg_register_plugin_hook_handler('access:collections:write', 'all', 'groups_write_acl_plugin_hook', 600);
-	elgg_register_plugin_hook_handler('default', 'access', 'groups_access_default_override');
-	elgg_register_plugin_hook_handler('access_collection:name', 'access_collection', 'groups_set_access_collection_name');
+    // Access permissions
+    elgg_register_plugin_hook_handler('access:collections:write', 'all', 'groups_write_acl_plugin_hook', 600);
+    elgg_register_plugin_hook_handler('default', 'access', 'groups_access_default_override');
+    elgg_register_plugin_hook_handler('access_collection:name', 'access_collection', 'groups_set_access_collection_name');
 
-	// Register profile menu hook
-	elgg_register_plugin_hook_handler('profile_menu', 'profile', 'activity_profile_menu');
+    // Register profile menu hook
+    elgg_register_plugin_hook_handler('profile_menu', 'profile', 'activity_profile_menu');
 
-	// allow ecml in profiles
-	elgg_register_plugin_hook_handler('get_views', 'ecml', 'groupprofile_ecml_views_hook');
+    // allow ecml in profiles
+    elgg_register_plugin_hook_handler('get_views', 'ecml', 'groupprofile_ecml_views_hook');
 
-	// Register a handler for create groups
-	elgg_register_event_handler('create', 'group', 'groups_create_event_listener');
-	elgg_register_event_handler('update:after', 'group', 'groups_update_event_listener');
+    // Register a handler for create groups
+    elgg_register_event_handler('create', 'group', 'groups_create_event_listener');
+    elgg_register_event_handler('update:after', 'group', 'groups_update_event_listener');
 
-	elgg_register_event_handler('join', 'group', 'groups_user_join_event_listener');
-	elgg_register_event_handler('leave', 'group', 'groups_user_leave_event_listener');
+    elgg_register_event_handler('join', 'group', 'groups_user_join_event_listener');
+    elgg_register_event_handler('leave', 'group', 'groups_user_leave_event_listener');
 
-	elgg_register_plugin_hook_handler('access:collections:add_user', 'collection', 'groups_access_collection_override');
+    elgg_register_plugin_hook_handler('access:collections:add_user', 'collection', 'groups_access_collection_override');
 
-	elgg_register_event_handler('upgrade', 'system', 'groups_run_upgrades');
+    elgg_register_event_handler('upgrade', 'system', 'groups_run_upgrades');
 
-	// Add tests
-	elgg_register_plugin_hook_handler('unit_test', 'system', 'groups_test');
+    // Add tests
+    elgg_register_plugin_hook_handler('unit_test', 'system', 'groups_test');
 
-	// allow to be liked
-	elgg_register_plugin_hook_handler('likes:is_likable', 'group:', 'Elgg\Values::getTrue');
+    // allow to be liked
+    elgg_register_plugin_hook_handler('likes:is_likable', 'group:', 'Elgg\Values::getTrue');
 
-	// prepare profile buttons to be registered in the title menu
-	elgg_register_plugin_hook_handler('profile_buttons', 'group', 'groups_prepare_profile_buttons');
+    // prepare profile buttons to be registered in the title menu
+    elgg_register_plugin_hook_handler('profile_buttons', 'group', 'groups_prepare_profile_buttons');
 
-	// Help core resolve page owner guids from group routes
-	// Registered with an earlier priority to be called before default_page_owner_handler()
-	elgg_register_plugin_hook_handler('page_owner', 'system', 'groups_default_page_owner_handler', 400);
+    // Help core resolve page owner guids from group routes
+    // Registered with an earlier priority to be called before default_page_owner_handler()
+    elgg_register_plugin_hook_handler('page_owner', 'system', 'groups_default_page_owner_handler', 400);
 
-	// Setup filter tabs on /groups/all page
-	elgg_register_plugin_hook_handler('register', 'menu:filter:groups/all', 'groups_setup_filter_tabs');
+    // Setup filter tabs on /groups/all page
+    elgg_register_plugin_hook_handler('register', 'menu:filter:groups/all', 'groups_setup_filter_tabs');
 
-	elgg_register_plugin_hook_handler('register', 'menu:page', '_groups_page_menu_group_profile');
-	elgg_register_plugin_hook_handler('register', 'menu:page', '_groups_page_menu');
+    elgg_register_plugin_hook_handler('register', 'menu:page', '_groups_page_menu_group_profile');
+    elgg_register_plugin_hook_handler('register', 'menu:page', '_groups_page_menu');
 }
 
 /**
@@ -112,26 +112,26 @@ 
  */
 function groups_fields_setup() {
 
-	$profile_defaults = [
-		'description' => 'longtext',
-		'briefdescription' => 'text',
-		'interests' => 'tags',
-	];
+    $profile_defaults = [
+        'description' => 'longtext',
+        'briefdescription' => 'text',
+        'interests' => 'tags',
+    ];
 
-	$profile_defaults = elgg_trigger_plugin_hook('profile:fields', 'group', null, $profile_defaults);
+    $profile_defaults = elgg_trigger_plugin_hook('profile:fields', 'group', null, $profile_defaults);
 
-	elgg_set_config('group', $profile_defaults);
+    elgg_set_config('group', $profile_defaults);
 
-	// register any tag metadata names
-	foreach ($profile_defaults as $name => $type) {
-		if ($type == 'tags') {
-			elgg_register_tag_metadata_name($name);
+    // register any tag metadata names
+    foreach ($profile_defaults as $name => $type) {
+        if ($type == 'tags') {
+            elgg_register_tag_metadata_name($name);
 
-			// only shows up in search but why not just set this in en.php as doing it here
-			// means you cannot override it in a plugin
-			add_translation(get_current_language(), ["tag_names:$name" => elgg_echo("groups:$name")]);
-		}
-	}
+            // only shows up in search but why not just set this in en.php as doing it here
+            // means you cannot override it in a plugin
+            add_translation(get_current_language(), ["tag_names:$name" => elgg_echo("groups:$name")]);
+        }
+    }
 }
 
 /**
@@ -149,43 +149,43 @@ 
  */
 function _groups_page_menu_group_profile($hook, $type, $return, $params) {
 	
-	if (!elgg_in_context('group_profile') || !elgg_is_logged_in()) {
-		return;
-	}
+    if (!elgg_in_context('group_profile') || !elgg_is_logged_in()) {
+        return;
+    }
 	
-	// Get the page owner entity
-	$page_owner = elgg_get_page_owner_entity();
-	if (!($page_owner instanceof ElggGroup)) {
-		return;
-	}
+    // Get the page owner entity
+    $page_owner = elgg_get_page_owner_entity();
+    if (!($page_owner instanceof ElggGroup)) {
+        return;
+    }
 	
-	if (!$page_owner->canEdit() || $page_owner->isPublicMembership()) {
-		return;
-	}
+    if (!$page_owner->canEdit() || $page_owner->isPublicMembership()) {
+        return;
+    }
 	
-	$count = elgg_get_entities_from_relationship([
-		'type' => 'user',
-		'relationship' => 'membership_request',
-		'relationship_guid' => $page_owner->guid,
-		'inverse_relationship' => true,
-		'count' => true,
-	]);
-
-	$text = elgg_echo('groups:membershiprequests');
-	$title = $text;
-	if ($count) {
-		$title = elgg_echo('groups:membershiprequests:pending', [$count]);
-	}
+    $count = elgg_get_entities_from_relationship([
+        'type' => 'user',
+        'relationship' => 'membership_request',
+        'relationship_guid' => $page_owner->guid,
+        'inverse_relationship' => true,
+        'count' => true,
+    ]);
+
+    $text = elgg_echo('groups:membershiprequests');
+    $title = $text;
+    if ($count) {
+        $title = elgg_echo('groups:membershiprequests:pending', [$count]);
+    }
 	
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'membership_requests',
-		'text' => $text,
-		'badge' => $count ? $count : null,
-		'title' => $title,
-		'href' => "groups/requests/{$page_owner->guid}",
-	]);
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'membership_requests',
+        'text' => $text,
+        'badge' => $count ? $count : null,
+        'title' => $title,
+        'href' => "groups/requests/{$page_owner->guid}",
+    ]);
 	
-	return $return;
+    return $return;
 }
 
 /**
@@ -203,57 +203,57 @@ 
  */
 function _groups_page_menu($hook, $type, $return, $params) {
 	
-	if (elgg_get_context() !== 'groups') {
-		return;
-	}
+    if (elgg_get_context() !== 'groups') {
+        return;
+    }
 	
-	// Get the page owner entity
-	$page_owner = elgg_get_page_owner_entity();
-	if ($page_owner instanceof ElggGroup) {
-		return;
-	}
+    // Get the page owner entity
+    $page_owner = elgg_get_page_owner_entity();
+    if ($page_owner instanceof ElggGroup) {
+        return;
+    }
 	
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'groups:all',
-		'text' => elgg_echo('groups:all'),
-		'href' => 'groups/all',
-	]);
-
-	$user = elgg_get_logged_in_user_entity();
-	if (!$user) {
-		return $return;
-	}
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'groups:all',
+        'text' => elgg_echo('groups:all'),
+        'href' => 'groups/all',
+    ]);
+
+    $user = elgg_get_logged_in_user_entity();
+    if (!$user) {
+        return $return;
+    }
 	
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'groups:owned',
-		'text' => elgg_echo('groups:owned'),
-		'href' => "groups/owner/$user->username",
-	]);
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'groups:owned',
+        'text' => elgg_echo('groups:owned'),
+        'href' => "groups/owner/$user->username",
+    ]);
 	
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'groups:member',
-		'text' => elgg_echo('groups:yours'),
-		'href' => "groups/member/$user->username",
-	]);
-
-	$invitation_count = groups_get_invited_groups($user->guid, false, ['count' => true]);
-
-	// Invitations
-	$text = elgg_echo('groups:invitations');
-	$title = $text;
-	if ($invitation_count) {
-		$title = elgg_echo('groups:invitations:pending', [$invitation_count]);
-	}
-
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'groups:user:invites',
-		'text' => $text,
-		'badge' => $invitation_count ? $invitation_count : null,
-		'title' => $title,
-		'href' => "groups/invitations/$user->username",
-	]);
-
-	return $return;
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'groups:member',
+        'text' => elgg_echo('groups:yours'),
+        'href' => "groups/member/$user->username",
+    ]);
+
+    $invitation_count = groups_get_invited_groups($user->guid, false, ['count' => true]);
+
+    // Invitations
+    $text = elgg_echo('groups:invitations');
+    $title = $text;
+    if ($invitation_count) {
+        $title = elgg_echo('groups:invitations:pending', [$invitation_count]);
+    }
+
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'groups:user:invites',
+        'text' => $text,
+        'badge' => $invitation_count ? $invitation_count : null,
+        'title' => $title,
+        'href' => "groups/invitations/$user->username",
+    ]);
+
+    return $return;
 }
 
 /**
@@ -277,48 +277,48 @@ 
  */
 function groups_page_handler($page) {
 
-	if (!isset($page[0])) {
-		$page[0] = 'all';
-	}
-
-	elgg_push_breadcrumb(elgg_echo('groups'), "groups/all");
-
-	$vars = [];
-	switch ($page[0]) {
-		case 'add':
-		case 'all':
-		case 'owner':
-		case 'search':
-			echo elgg_view_resource("groups/{$page[0]}");
-			break;
-		case 'invitations':
-		case 'member':
-			echo elgg_view_resource("groups/{$page[0]}", [
-				'username' => $page[1],
-			]);
-			break;
-		case 'members':
-			$vars['sort'] = elgg_extract('2', $page, 'alpha');
-			$vars['guid'] = elgg_extract('1', $page);
-			if (elgg_view_exists("resources/groups/members/{$vars['sort']}")) {
-				echo elgg_view_resource("groups/members/{$vars['sort']}", $vars);
-			} else {
-				echo elgg_view_resource('groups/members', $vars);
-			}
-			break;
-		case 'profile':
-		case 'activity':
-		case 'edit':
-		case 'invite':
-		case 'requests':
-			echo elgg_view_resource("groups/{$page[0]}", [
-				'guid' => $page[1],
-			]);
-			break;
-		default:
-			return false;
-	}
-	return true;
+    if (!isset($page[0])) {
+        $page[0] = 'all';
+    }
+
+    elgg_push_breadcrumb(elgg_echo('groups'), "groups/all");
+
+    $vars = [];
+    switch ($page[0]) {
+        case 'add':
+        case 'all':
+        case 'owner':
+        case 'search':
+            echo elgg_view_resource("groups/{$page[0]}");
+            break;
+        case 'invitations':
+        case 'member':
+            echo elgg_view_resource("groups/{$page[0]}", [
+                'username' => $page[1],
+            ]);
+            break;
+        case 'members':
+            $vars['sort'] = elgg_extract('2', $page, 'alpha');
+            $vars['guid'] = elgg_extract('1', $page);
+            if (elgg_view_exists("resources/groups/members/{$vars['sort']}")) {
+                echo elgg_view_resource("groups/members/{$vars['sort']}", $vars);
+            } else {
+                echo elgg_view_resource('groups/members', $vars);
+            }
+            break;
+        case 'profile':
+        case 'activity':
+        case 'edit':
+        case 'invite':
+        case 'requests':
+            echo elgg_view_resource("groups/{$page[0]}", [
+                'guid' => $page[1],
+            ]);
+            break;
+        default:
+            return false;
+    }
+    return true;
 }
 
 /**
@@ -331,148 +331,148 @@ 
  * @return string
  */
 function groups_set_url($hook, $type, $url, $params) {
-	$entity = $params['entity'];
-	$title = elgg_get_friendly_title($entity->name);
-	return "groups/profile/{$entity->guid}/$title";
+    $entity = $params['entity'];
+    $title = elgg_get_friendly_title($entity->name);
+    return "groups/profile/{$entity->guid}/$title";
 }
 
 /**
  * Add owner block link
  */
 function groups_activity_owner_block_menu($hook, $type, $return, $params) {
-	if (elgg_instanceof($params['entity'], 'group')) {
-		if ($params['entity']->activity_enable != "no") {
-			$url = "groups/activity/{$params['entity']->guid}";
-			$item = new ElggMenuItem('activity', elgg_echo('groups:activity'), $url);
-			$return[] = $item;
-		}
-	}
-
-	return $return;
+    if (elgg_instanceof($params['entity'], 'group')) {
+        if ($params['entity']->activity_enable != "no") {
+            $url = "groups/activity/{$params['entity']->guid}";
+            $item = new ElggMenuItem('activity', elgg_echo('groups:activity'), $url);
+            $return[] = $item;
+        }
+    }
+
+    return $return;
 }
 
 /**
  * Add links/info to entity menu particular to group entities
  */
 function groups_entity_menu_setup($hook, $type, $return, $params) {
-	if (elgg_in_context('widgets')) {
-		return $return;
-	}
-
-	/* @var ElggGroup $entity */
-	$entity = $params['entity'];
-	$handler = elgg_extract('handler', $params, false);
-	if ($handler != 'groups') {
-		return $return;
-	}
-
-	/* @var ElggMenuItem $item */
-	foreach ($return as $index => $item) {
-		if (in_array($item->getName(), ['likes', 'unlike', 'edit', 'delete'])) {
-			unset($return[$index]);
-		}
-	}
-
-	// membership type
-	if ($entity->isPublicMembership()) {
-		$mem = elgg_echo("groups:open");
-	} else {
-		$mem = elgg_echo("groups:closed");
-	}
-
-	$options = [
-		'name' => 'membership',
-		'text' => $mem,
-		'href' => false,
-		'priority' => 100,
-	];
-	$return[] = ElggMenuItem::factory($options);
-
-	// number of members
-	$num_members = $entity->getMembers(['count' => true]);
-	$members_string = elgg_echo('groups:member');
-	$options = [
-		'name' => 'members',
-		'text' => $num_members . ' ' . $members_string,
-		'href' => false,
-		'priority' => 200,
-	];
-	$return[] = ElggMenuItem::factory($options);
-
-	// feature link
-	if (elgg_is_admin_logged_in()) {
-		$isFeatured = $entity->featured_group == "yes";
-
-		$return[] = ElggMenuItem::factory([
-			'name' => 'feature',
-			'text' => elgg_echo("groups:makefeatured"),
-			'href' => elgg_add_action_tokens_to_url("action/groups/featured?group_guid={$entity->guid}&action_type=feature"),
-			'priority' => 300,
-			'item_class' => $isFeatured ? 'hidden' : '',
-			'deps' => 'groups/navigation',
-		]);
-
-		$return[] = ElggMenuItem::factory([
-			'name' => 'unfeature',
-			'text' => elgg_echo("groups:makeunfeatured"),
-			'href' => elgg_add_action_tokens_to_url("action/groups/featured?group_guid={$entity->guid}&action_type=unfeature"),
-			'priority' => 300,
-			'item_class' => $isFeatured ? '' : 'hidden',
-			'deps' => 'groups/navigation',
-		]);
-	}
-
-	return $return;
+    if (elgg_in_context('widgets')) {
+        return $return;
+    }
+
+    /* @var ElggGroup $entity */
+    $entity = $params['entity'];
+    $handler = elgg_extract('handler', $params, false);
+    if ($handler != 'groups') {
+        return $return;
+    }
+
+    /* @var ElggMenuItem $item */
+    foreach ($return as $index => $item) {
+        if (in_array($item->getName(), ['likes', 'unlike', 'edit', 'delete'])) {
+            unset($return[$index]);
+        }
+    }
+
+    // membership type
+    if ($entity->isPublicMembership()) {
+        $mem = elgg_echo("groups:open");
+    } else {
+        $mem = elgg_echo("groups:closed");
+    }
+
+    $options = [
+        'name' => 'membership',
+        'text' => $mem,
+        'href' => false,
+        'priority' => 100,
+    ];
+    $return[] = ElggMenuItem::factory($options);
+
+    // number of members
+    $num_members = $entity->getMembers(['count' => true]);
+    $members_string = elgg_echo('groups:member');
+    $options = [
+        'name' => 'members',
+        'text' => $num_members . ' ' . $members_string,
+        'href' => false,
+        'priority' => 200,
+    ];
+    $return[] = ElggMenuItem::factory($options);
+
+    // feature link
+    if (elgg_is_admin_logged_in()) {
+        $isFeatured = $entity->featured_group == "yes";
+
+        $return[] = ElggMenuItem::factory([
+            'name' => 'feature',
+            'text' => elgg_echo("groups:makefeatured"),
+            'href' => elgg_add_action_tokens_to_url("action/groups/featured?group_guid={$entity->guid}&action_type=feature"),
+            'priority' => 300,
+            'item_class' => $isFeatured ? 'hidden' : '',
+            'deps' => 'groups/navigation',
+        ]);
+
+        $return[] = ElggMenuItem::factory([
+            'name' => 'unfeature',
+            'text' => elgg_echo("groups:makeunfeatured"),
+            'href' => elgg_add_action_tokens_to_url("action/groups/featured?group_guid={$entity->guid}&action_type=unfeature"),
+            'priority' => 300,
+            'item_class' => $isFeatured ? '' : 'hidden',
+            'deps' => 'groups/navigation',
+        ]);
+    }
+
+    return $return;
 }
 
 /**
  * Add a remove user link to user hover menu when the page owner is a group
  */
 function groups_user_entity_menu_setup($hook, $type, $return, $params) {
-	if (elgg_is_logged_in()) {
-		$group = elgg_get_page_owner_entity();
-
-		// Check for valid group
-		if (!elgg_instanceof($group, 'group')) {
-			return $return;
-		}
-
-		$entity = $params['entity'];
-
-		// Make sure we have a user and that user is a member of the group
-		if (!elgg_instanceof($entity, 'user') || !$group->isMember($entity)) {
-			return $return;
-		}
-
-		// Add remove link if we can edit the group, and if we're not trying to remove the group owner
-		if ($group->canEdit() && $group->getOwnerGUID() != $entity->guid) {
-			$return[] = ElggMenuItem::factory([
-				'name' => 'removeuser',
-				'href' => "action/groups/remove?user_guid={$entity->guid}&group_guid={$group->guid}",
-				'text' => elgg_echo('groups:removeuser'),
-				'confirm' => true,
-				'priority' => 999,
-			]);
-		}
-	}
-
-	return $return;
+    if (elgg_is_logged_in()) {
+        $group = elgg_get_page_owner_entity();
+
+        // Check for valid group
+        if (!elgg_instanceof($group, 'group')) {
+            return $return;
+        }
+
+        $entity = $params['entity'];
+
+        // Make sure we have a user and that user is a member of the group
+        if (!elgg_instanceof($entity, 'user') || !$group->isMember($entity)) {
+            return $return;
+        }
+
+        // Add remove link if we can edit the group, and if we're not trying to remove the group owner
+        if ($group->canEdit() && $group->getOwnerGUID() != $entity->guid) {
+            $return[] = ElggMenuItem::factory([
+                'name' => 'removeuser',
+                'href' => "action/groups/remove?user_guid={$entity->guid}&group_guid={$group->guid}",
+                'text' => elgg_echo('groups:removeuser'),
+                'confirm' => true,
+                'priority' => 999,
+            ]);
+        }
+    }
+
+    return $return;
 }
 
 /**
  * Groups created so create an access list for it
  */
 function groups_create_event_listener($event, $object_type, $object) {
-	$ac_name = elgg_echo('groups:group') . ": " . $object->name;
-	$ac_id = create_access_collection($ac_name, $object->guid);
-	if ($ac_id) {
-		$object->group_acl = $ac_id;
-	} else {
-		// delete group if access creation fails
-		return false;
-	}
-
-	return true;
+    $ac_name = elgg_echo('groups:group') . ": " . $object->name;
+    $ac_id = create_access_collection($ac_name, $object->guid);
+    if ($ac_id) {
+        $object->group_acl = $ac_id;
+    } else {
+        // delete group if access creation fails
+        return false;
+    }
+
+    return true;
 }
 
 /**
@@ -493,38 +493,38 @@ 
  */
 function groups_update_event_listener($event, $type, $group) {
 
-	/* @var $group \ElggGroup */
-
-	$original_attributes = $group->getOriginalAttributes();
-
-	if (!empty($original_attributes['owner_guid'])) {
-		$previous_owner_guid = $original_attributes['owner_guid'];
-
-		// Update owned metadata
-		$metadata = elgg_get_metadata([
-			'guid' => $group->guid,
-			'metadata_owner_guids' => $previous_owner_guid,
-			'limit' => 0,
-		]);
-
-		if ($metadata) {
-			foreach ($metadata as $md) {
-				$md->owner_guid = $group->owner_guid;
-				$md->save();
-			}
-		}
-	}
-
-	if (!empty($original_attributes['name'])) {
-		// update access collection name if group name changes
-		$group_name = html_entity_decode($group->name, ENT_QUOTES, 'UTF-8');
-		$ac_name = elgg_echo('groups:group') . ": " . $group_name;
-		$acl = get_access_collection($group->group_acl);
-		if ($acl) {
-			$acl->name = $ac_name;
-			$acl->save();
-		}
-	}
+    /* @var $group \ElggGroup */
+
+    $original_attributes = $group->getOriginalAttributes();
+
+    if (!empty($original_attributes['owner_guid'])) {
+        $previous_owner_guid = $original_attributes['owner_guid'];
+
+        // Update owned metadata
+        $metadata = elgg_get_metadata([
+            'guid' => $group->guid,
+            'metadata_owner_guids' => $previous_owner_guid,
+            'limit' => 0,
+        ]);
+
+        if ($metadata) {
+            foreach ($metadata as $md) {
+                $md->owner_guid = $group->owner_guid;
+                $md->save();
+            }
+        }
+    }
+
+    if (!empty($original_attributes['name'])) {
+        // update access collection name if group name changes
+        $group_name = html_entity_decode($group->name, ENT_QUOTES, 'UTF-8');
+        $ac_name = elgg_echo('groups:group') . ": " . $group_name;
+        $acl = get_access_collection($group->group_acl);
+        if ($acl) {
+            $acl->name = $ac_name;
+            $acl->save();
+        }
+    }
 }
 
 /**
@@ -537,48 +537,48 @@ 
  */
 function groups_write_acl_plugin_hook(\Elgg\Hook $hook) {
 
-	$user_guid = $hook->getParam('user_id');
-	$user = get_user($user_guid);
-	if (!$user) {
-		return;
-	}
-
-	$page_owner = elgg_get_page_owner_entity();
-	if (!$page_owner instanceof ElggGroup) {
-		return;
-	}
-
-	if (!$page_owner->canWriteToContainer($user_guid)) {
-		return;
-	}
-
-	$allowed_access = [
-		ACCESS_PRIVATE,
-		$page_owner->group_acl,
-	];
-
-	if ($page_owner->getContentAccessMode() !== ElggGroup::CONTENT_ACCESS_MODE_MEMBERS_ONLY) {
-		$allowed_access[] = ACCESS_LOGGED_IN;
-		if (!elgg_get_config('walled_garden')) {
-			$allowed_access[] = ACCESS_PUBLIC;
-		}
-	}
-
-	$write_acls = $hook->getValue();
-
-	// add write access to the group
-	$collection = get_access_collection($page_owner->group_acl);
-	if ($collection) {
-		$write_acls[$page_owner->group_acl] = $collection->getDisplayName();
-	}
-
-	foreach (array_keys($write_acls) as $access_id) {
-		if (!in_array($access_id, $allowed_access)) {
-			unset($write_acls[$access_id]);
-		}
-	}
-
-	return $write_acls;
+    $user_guid = $hook->getParam('user_id');
+    $user = get_user($user_guid);
+    if (!$user) {
+        return;
+    }
+
+    $page_owner = elgg_get_page_owner_entity();
+    if (!$page_owner instanceof ElggGroup) {
+        return;
+    }
+
+    if (!$page_owner->canWriteToContainer($user_guid)) {
+        return;
+    }
+
+    $allowed_access = [
+        ACCESS_PRIVATE,
+        $page_owner->group_acl,
+    ];
+
+    if ($page_owner->getContentAccessMode() !== ElggGroup::CONTENT_ACCESS_MODE_MEMBERS_ONLY) {
+        $allowed_access[] = ACCESS_LOGGED_IN;
+        if (!elgg_get_config('walled_garden')) {
+            $allowed_access[] = ACCESS_PUBLIC;
+        }
+    }
+
+    $write_acls = $hook->getValue();
+
+    // add write access to the group
+    $collection = get_access_collection($page_owner->group_acl);
+    if ($collection) {
+        $write_acls[$page_owner->group_acl] = $collection->getDisplayName();
+    }
+
+    foreach (array_keys($write_acls) as $access_id) {
+        if (!in_array($access_id, $allowed_access)) {
+            unset($write_acls[$access_id]);
+        }
+    }
+
+    return $write_acls;
 }
 
 /**
@@ -591,25 +591,25 @@ 
  */
 function groups_set_access_collection_name(\Elgg\Hook $hook) {
 
-	$access_collection = $hook->getParam('access_collection');
-	if (!$access_collection instanceof ElggAccessCollection) {
-		return;
-	}
+    $access_collection = $hook->getParam('access_collection');
+    if (!$access_collection instanceof ElggAccessCollection) {
+        return;
+    }
 
-	$owner = $access_collection->getOwnerEntity();
-	if (!$owner instanceof ElggGroup) {
-		return;
-	}
+    $owner = $access_collection->getOwnerEntity();
+    if (!$owner instanceof ElggGroup) {
+        return;
+    }
 	
-	$page_owner = elgg_get_page_owner_entity();
+    $page_owner = elgg_get_page_owner_entity();
 
-	if ($page_owner->guid == $owner->guid) {
-		return elgg_echo('groups:acl:in_context');
-	}
+    if ($page_owner->guid == $owner->guid) {
+        return elgg_echo('groups:acl:in_context');
+    }
 
-	if ($owner->canWriteToContainer()) {
-		return elgg_echo('groups:acl', [$owner->getDisplayName()]);
-	}
+    if ($owner->canWriteToContainer()) {
+        return elgg_echo('groups:acl', [$owner->getDisplayName()]);
+    }
 }
 
 /**
@@ -618,24 +618,24 @@ 
  */
 function groups_user_join_event_listener($event, $object_type, $object) {
 
-	$group = $object['group'];
-	$user = $object['user'];
-	$acl = $group->group_acl;
+    $group = $object['group'];
+    $user = $object['user'];
+    $acl = $group->group_acl;
 
-	add_user_to_access_collection($user->guid, $acl);
+    add_user_to_access_collection($user->guid, $acl);
 
-	return true;
+    return true;
 }
 
 /**
  * Make sure users are added to the access collection
  */
 function groups_access_collection_override($hook, $entity_type, $returnvalue, $params) {
-	if (isset($params['collection'])) {
-		if (elgg_instanceof(get_entity($params['collection']->owner_guid), 'group')) {
-			return true;
-		}
-	}
+    if (isset($params['collection'])) {
+        if (elgg_instanceof(get_entity($params['collection']->owner_guid), 'group')) {
+            return true;
+        }
+    }
 }
 
 /**
@@ -644,13 +644,13 @@ 
  */
 function groups_user_leave_event_listener($event, $object_type, $object) {
 
-	$group = $object['group'];
-	$user = $object['user'];
-	$acl = $group->group_acl;
+    $group = $object['group'];
+    $user = $object['user'];
+    $acl = $group->group_acl;
 
-	remove_user_from_access_collection($user->guid, $acl);
+    remove_user_from_access_collection($user->guid, $acl);
 
-	return true;
+    return true;
 }
 
 /**
@@ -664,15 +664,15 @@ 
  * @return int
  */
 function groups_access_default_override($hook, $type, $access) {
-	$page_owner = elgg_get_page_owner_entity();
+    $page_owner = elgg_get_page_owner_entity();
 
-	if ($page_owner instanceof ElggGroup) {
-		if ($page_owner->getContentAccessMode() == ElggGroup::CONTENT_ACCESS_MODE_MEMBERS_ONLY) {
-			$access = $page_owner->group_acl;
-		}
-	}
+    if ($page_owner instanceof ElggGroup) {
+        if ($page_owner->getContentAccessMode() == ElggGroup::CONTENT_ACCESS_MODE_MEMBERS_ONLY) {
+            $access = $page_owner->group_acl;
+        }
+    }
 
-	return $access;
+    return $access;
 }
 
 /**
@@ -687,30 +687,30 @@ 
  */
 function groups_get_invited_groups($user_guid, $return_guids = false, $options = []) {
 
-	$ia = elgg_set_ignore_access(true);
+    $ia = elgg_set_ignore_access(true);
 
-	$defaults = [
-		'relationship' => 'invited',
-		'relationship_guid' => (int) $user_guid,
-		'inverse_relationship' => true,
-		'limit' => 0,
-	];
+    $defaults = [
+        'relationship' => 'invited',
+        'relationship_guid' => (int) $user_guid,
+        'inverse_relationship' => true,
+        'limit' => 0,
+    ];
 
-	$options = array_merge($defaults, $options);
-	$groups = elgg_get_entities_from_relationship($options);
+    $options = array_merge($defaults, $options);
+    $groups = elgg_get_entities_from_relationship($options);
 
-	elgg_set_ignore_access($ia);
+    elgg_set_ignore_access($ia);
 
-	if ($return_guids) {
-		$guids = [];
-		foreach ($groups as $group) {
-			$guids[] = $group->getGUID();
-		}
+    if ($return_guids) {
+        $guids = [];
+        foreach ($groups as $group) {
+            $guids[] = $group->getGUID();
+        }
 
-		return $guids;
-	}
+        return $guids;
+    }
 
-	return $groups;
+    return $groups;
 }
 
 /**
@@ -722,30 +722,30 @@ 
  */
 function groups_join_group($group, $user) {
 
-	// access ignore so user can be added to access collection of invisible group
-	$ia = elgg_set_ignore_access(true);
-	$result = $group->join($user);
-	elgg_set_ignore_access($ia);
+    // access ignore so user can be added to access collection of invisible group
+    $ia = elgg_set_ignore_access(true);
+    $result = $group->join($user);
+    elgg_set_ignore_access($ia);
 
-	if ($result) {
-		// flush user's access info so the collection is added
-		get_access_list($user->guid, 0, true);
+    if ($result) {
+        // flush user's access info so the collection is added
+        get_access_list($user->guid, 0, true);
 
-		// Remove any invite or join request flags
-		remove_entity_relationship($group->guid, 'invited', $user->guid);
-		remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+        // Remove any invite or join request flags
+        remove_entity_relationship($group->guid, 'invited', $user->guid);
+        remove_entity_relationship($user->guid, 'membership_request', $group->guid);
 
-		elgg_create_river_item([
-			'view' => 'river/relationship/member/create',
-			'action_type' => 'join',
-			'subject_guid' => $user->guid,
-			'object_guid' => $group->guid,
-		]);
+        elgg_create_river_item([
+            'view' => 'river/relationship/member/create',
+            'action_type' => 'join',
+            'subject_guid' => $user->guid,
+            'object_guid' => $group->guid,
+        ]);
 
-		return true;
-	}
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 /**
@@ -757,55 +757,55 @@ 
  */
 function group_access_options($group) {
 
-	$access_array = [
-		ACCESS_PRIVATE => elgg_echo('PRIVATE'),
-		ACCESS_LOGGED_IN => elgg_echo('LOGGED_IN'),
-	];
+    $access_array = [
+        ACCESS_PRIVATE => elgg_echo('PRIVATE'),
+        ACCESS_LOGGED_IN => elgg_echo('LOGGED_IN'),
+    ];
 
-	if (!elgg_get_config('walled_garden')) {
-		$access_array[ACCESS_PUBLIC] = elgg_echo('PUBLIC');
-	}
+    if (!elgg_get_config('walled_garden')) {
+        $access_array[ACCESS_PUBLIC] = elgg_echo('PUBLIC');
+    }
 
-	$collection = get_access_collection($group->group_acl);
-	if ($collection) {
-		$access_array[$collection->id] = $collection->getDisplayName();
-	}
+    $collection = get_access_collection($group->group_acl);
+    if ($collection) {
+        $access_array[$collection->id] = $collection->getDisplayName();
+    }
 	
-	return $access_array;
+    return $access_array;
 }
 
 function activity_profile_menu($hook, $entity_type, $return_value, $params) {
 
-	if (!$params['owner'] instanceof ElggGroup
-			|| elgg_get_plugin_setting('allow_activity', 'groups') === 'no') {
-		return;
-	}
+    if (!$params['owner'] instanceof ElggGroup
+            || elgg_get_plugin_setting('allow_activity', 'groups') === 'no') {
+        return;
+    }
 
-	$return_value[] = [
-		'text' => elgg_echo('groups:activity'),
-		'href' => "groups/activity/{$params['owner']->guid}"
-	];
-	return $return_value;
+    $return_value[] = [
+        'text' => elgg_echo('groups:activity'),
+        'href' => "groups/activity/{$params['owner']->guid}"
+    ];
+    return $return_value;
 }
 
 /**
  * Parse ECML on group profiles
  */
 function groupprofile_ecml_views_hook($hook, $entity_type, $return_value, $params) {
-	$return_value['groups/groupprofile'] = elgg_echo('groups:ecml:groupprofile');
+    $return_value['groups/groupprofile'] = elgg_echo('groups:ecml:groupprofile');
 
-	return $return_value;
+    return $return_value;
 }
 
 /**
  * Process upgrades for the groups plugin
  */
 function groups_run_upgrades() {
-	$path = __DIR__ . '/upgrades/';
-	$files = elgg_get_upgrade_files($path);
-	foreach ($files as $file) {
-		include "$path{$file}";
-	}
+    $path = __DIR__ . '/upgrades/';
+    $files = elgg_get_upgrade_files($path);
+    foreach ($files as $file) {
+        include "$path{$file}";
+    }
 }
 
 /**
@@ -814,8 +814,8 @@ 
  * @return array
  */
 function groups_test($hook, $type, $value, $params) {
-	$value[] = elgg_get_plugins_path() . 'groups/tests/write_access.php';
-	return $value;
+    $value[] = elgg_get_plugins_path() . 'groups/tests/write_access.php';
+    return $value;
 }
 
 /**
@@ -829,46 +829,46 @@ 
  */
 function groups_invitationrequest_menu_setup($hook, $type, $menu, $params) {
 
-	$group = elgg_extract('entity', $params);
-	$user = elgg_extract('user', $params);
-
-	if (!$group instanceof \ElggGroup) {
-		return $menu;
-	}
-
-	if (!$user instanceof \ElggUser || !$user->canEdit()) {
-		return $menu;
-	}
-
-	$accept_url = elgg_http_add_url_query_elements('action/groups/join', [
-		'user_guid' => $user->guid,
-		'group_guid' => $group->guid,
-	]);
-
-	$menu[] = \ElggMenuItem::factory([
-		'name' => 'accept',
-		'href' => $accept_url,
-		'is_action' => true,
-		'text' => elgg_echo('accept'),
-		'link_class' => 'elgg-button elgg-button-submit',
-		'is_trusted' => true,
-	]);
-
-	$delete_url = elgg_http_add_url_query_elements('action/groups/killinvitation', [
-		'user_guid' => $user->guid,
-		'group_guid' => $group->guid,
-	]);
-
-	$menu[] = \ElggMenuItem::factory([
-		'name' => 'delete',
-		'href' => $delete_url,
-		'is_action' => true,
-		'confirm' => elgg_echo('groups:invite:remove:check'),
-		'text' => elgg_echo('delete'),
-		'link_class' => 'elgg-button elgg-button-delete mlm',
-	]);
-
-	return $menu;
+    $group = elgg_extract('entity', $params);
+    $user = elgg_extract('user', $params);
+
+    if (!$group instanceof \ElggGroup) {
+        return $menu;
+    }
+
+    if (!$user instanceof \ElggUser || !$user->canEdit()) {
+        return $menu;
+    }
+
+    $accept_url = elgg_http_add_url_query_elements('action/groups/join', [
+        'user_guid' => $user->guid,
+        'group_guid' => $group->guid,
+    ]);
+
+    $menu[] = \ElggMenuItem::factory([
+        'name' => 'accept',
+        'href' => $accept_url,
+        'is_action' => true,
+        'text' => elgg_echo('accept'),
+        'link_class' => 'elgg-button elgg-button-submit',
+        'is_trusted' => true,
+    ]);
+
+    $delete_url = elgg_http_add_url_query_elements('action/groups/killinvitation', [
+        'user_guid' => $user->guid,
+        'group_guid' => $group->guid,
+    ]);
+
+    $menu[] = \ElggMenuItem::factory([
+        'name' => 'delete',
+        'href' => $delete_url,
+        'is_action' => true,
+        'confirm' => elgg_echo('groups:invite:remove:check'),
+        'text' => elgg_echo('delete'),
+        'link_class' => 'elgg-button elgg-button-delete mlm',
+    ]);
+
+    return $menu;
 }
 
 /**
@@ -883,26 +883,26 @@ 
  */
 function groups_members_menu_setup($hook, $type, $menu, $params) {
 
-	$entity = elgg_extract('entity', $params);
-	if (empty($entity) || !($entity instanceof ElggGroup)) {
-		return;
-	}
-
-	$menu[] = ElggMenuItem::factory([
-		'name' => 'alpha',
-		'text' => elgg_echo('sort:alpha'),
-		'href' => "groups/members/{$entity->getGUID()}",
-		'priority' => 100
-	]);
-
-	$menu[] = ElggMenuItem::factory([
-		'name' => 'newest',
-		'text' => elgg_echo('sort:newest'),
-		'href' => "groups/members/{$entity->getGUID()}/newest",
-		'priority' => 200
-	]);
-
-	return $menu;
+    $entity = elgg_extract('entity', $params);
+    if (empty($entity) || !($entity instanceof ElggGroup)) {
+        return;
+    }
+
+    $menu[] = ElggMenuItem::factory([
+        'name' => 'alpha',
+        'text' => elgg_echo('sort:alpha'),
+        'href' => "groups/members/{$entity->getGUID()}",
+        'priority' => 100
+    ]);
+
+    $menu[] = ElggMenuItem::factory([
+        'name' => 'newest',
+        'text' => elgg_echo('sort:newest'),
+        'href' => "groups/members/{$entity->getGUID()}/newest",
+        'priority' => 200
+    ]);
+
+    return $menu;
 }
 
 /**
@@ -916,48 +916,48 @@ 
  */
 function groups_prepare_profile_buttons($hook, $type, $items, $params) {
 
-	$group = elgg_extract('entity', $params);
-	if (!$group instanceof ElggGroup) {
-		return;
-	}
-
-	$actions = [];
-
-	if ($group->canEdit()) {
-		// group owners can edit the group and invite new members
-		$actions['groups:edit'] = "groups/edit/{$group->guid}";
-		$actions['groups:invite'] = "groups/invite/{$group->guid}";
-	}
-
-	$user = elgg_get_logged_in_user_entity();
-	if ($user && $group->isMember($user)) {
-		if ($group->owner_guid != $user->guid) {
-			// a member can leave a group if he/she doesn't own it
-			$actions['groups:leave'] = "action/groups/leave?group_guid={$group->guid}";
-		}
-	} else if ($user) {
-		$url = "action/groups/join?group_guid={$group->guid}";
-		if ($group->isPublicMembership() || $group->canEdit()) {
-			// admins can always join
-			// non-admins can join if membership is public
-			$actions['groups:join'] = $url;
-		} else {
-			// request membership
-			$actions['groups:joinrequest'] = $url;
-		}
-	}
-
-	foreach ($actions as $action => $url) {
-		$items[] = ElggMenuItem::factory([
-			'name' => $action,
-			'href' => elgg_normalize_url($url),
-			'text' => elgg_echo($action),
-			'is_action' => 0 === strpos($url, 'action'),
-			'link_class' => 'elgg-button elgg-button-action',
-		]);
-	}
-
-	return $items;
+    $group = elgg_extract('entity', $params);
+    if (!$group instanceof ElggGroup) {
+        return;
+    }
+
+    $actions = [];
+
+    if ($group->canEdit()) {
+        // group owners can edit the group and invite new members
+        $actions['groups:edit'] = "groups/edit/{$group->guid}";
+        $actions['groups:invite'] = "groups/invite/{$group->guid}";
+    }
+
+    $user = elgg_get_logged_in_user_entity();
+    if ($user && $group->isMember($user)) {
+        if ($group->owner_guid != $user->guid) {
+            // a member can leave a group if he/she doesn't own it
+            $actions['groups:leave'] = "action/groups/leave?group_guid={$group->guid}";
+        }
+    } else if ($user) {
+        $url = "action/groups/join?group_guid={$group->guid}";
+        if ($group->isPublicMembership() || $group->canEdit()) {
+            // admins can always join
+            // non-admins can join if membership is public
+            $actions['groups:join'] = $url;
+        } else {
+            // request membership
+            $actions['groups:joinrequest'] = $url;
+        }
+    }
+
+    foreach ($actions as $action => $url) {
+        $items[] = ElggMenuItem::factory([
+            'name' => $action,
+            'href' => elgg_normalize_url($url),
+            'text' => elgg_echo($action),
+            'is_action' => 0 === strpos($url, 'action'),
+            'link_class' => 'elgg-button elgg-button-action',
+        ]);
+    }
+
+    return $items;
 }
 
 /**
@@ -973,54 +973,54 @@ 
  */
 function groups_default_page_owner_handler($hook, $type, $return, $params) {
 
-	if ($return) {
-		return;
-	}
-
-	$segments = _elgg_services()->request->getUrlSegments();
-	$identifier = array_shift($segments);
-
-	if ($identifier !== 'groups') {
-		return;
-	}
-
-	$page = array_shift($segments);
-
-	switch ($page) {
-		case 'add' :
-			$guid = array_shift($segments);
-			if (!$guid) {
-				$guid = elgg_get_logged_in_user_guid();
-			}
-			return $guid;
-
-		case 'edit':
-		case 'profile' :
-		case 'activity' :
-		case 'invite' :
-		case 'requests' :
-		case 'members' :
-		case 'profile' :
-			$guid = array_shift($segments);
-			if (!$guid) {
-				return;
-			}
-			return $guid;
-
-		case 'member' :
-		case 'owner' :
-		case 'invitations':
-			$username = array_shift($segments);
-			if ($username) {
-				$user = get_user_by_username($username);
-			} else {
-				$user = elgg_get_logged_in_user_entity();
-			}
-			if (!$user) {
-				return;
-			}
-			return $user->guid;
-	}
+    if ($return) {
+        return;
+    }
+
+    $segments = _elgg_services()->request->getUrlSegments();
+    $identifier = array_shift($segments);
+
+    if ($identifier !== 'groups') {
+        return;
+    }
+
+    $page = array_shift($segments);
+
+    switch ($page) {
+        case 'add' :
+            $guid = array_shift($segments);
+            if (!$guid) {
+                $guid = elgg_get_logged_in_user_guid();
+            }
+            return $guid;
+
+        case 'edit':
+        case 'profile' :
+        case 'activity' :
+        case 'invite' :
+        case 'requests' :
+        case 'members' :
+        case 'profile' :
+            $guid = array_shift($segments);
+            if (!$guid) {
+                return;
+            }
+            return $guid;
+
+        case 'member' :
+        case 'owner' :
+        case 'invitations':
+            $username = array_shift($segments);
+            if ($username) {
+                $user = get_user_by_username($username);
+            } else {
+                $user = elgg_get_logged_in_user_entity();
+            }
+            if (!$user) {
+                return;
+            }
+            return $user->guid;
+    }
 }
 
 /**
@@ -1034,41 +1034,41 @@ 
  */
 function groups_setup_filter_tabs($hook, $type, $return, $params) {
 
-	$filter_value = elgg_extract('filter_value', $params);
-
-	$return[] = ElggMenuItem::factory([
-		'name' => 'newest',
-		'text' => elgg_echo('sort:newest'),
-		'href' => 'groups/all?filter=newest',
-		'priority' => 200,
-		'selected' => $filter_value == 'newest',
-	]);
-
-	$return[] = ElggMenuItem::factory([
-		'name' => 'alpha',
-		'text' => elgg_echo('sort:alpha'),
-		'href' => 'groups/all?filter=alpha',
-		'priority' => 250,
-		'selected' => $filter_value == 'alpha',
-	]);
-
-	$return[] = ElggMenuItem::factory([
-		'name' => 'popular',
-		'text' => elgg_echo('sort:popular'),
-		'href' => 'groups/all?filter=popular',
-		'priority' => 300,
-		'selected' => $filter_value == 'popular',
-	]);
-
-	$return[] = ElggMenuItem::factory([
-		'name' => 'featured',
-		'text' => elgg_echo('groups:featured'),
-		'href' => 'groups/all?filter=featured',
-		'priority' => 400,
-		'selected' => $filter_value == 'featured',
-	]);
+    $filter_value = elgg_extract('filter_value', $params);
+
+    $return[] = ElggMenuItem::factory([
+        'name' => 'newest',
+        'text' => elgg_echo('sort:newest'),
+        'href' => 'groups/all?filter=newest',
+        'priority' => 200,
+        'selected' => $filter_value == 'newest',
+    ]);
+
+    $return[] = ElggMenuItem::factory([
+        'name' => 'alpha',
+        'text' => elgg_echo('sort:alpha'),
+        'href' => 'groups/all?filter=alpha',
+        'priority' => 250,
+        'selected' => $filter_value == 'alpha',
+    ]);
+
+    $return[] = ElggMenuItem::factory([
+        'name' => 'popular',
+        'text' => elgg_echo('sort:popular'),
+        'href' => 'groups/all?filter=popular',
+        'priority' => 300,
+        'selected' => $filter_value == 'popular',
+    ]);
+
+    $return[] = ElggMenuItem::factory([
+        'name' => 'featured',
+        'text' => elgg_echo('groups:featured'),
+        'href' => 'groups/all?filter=featured',
+        'priority' => 400,
+        'selected' => $filter_value == 'featured',
+    ]);
 	
-	return $return;
+    return $return;
 }
 
 /**
@@ -1081,8 +1081,8 @@ 
  */
 function groups_set_icon_sizes(\Elgg\Hook $hook) {
 
-	$sizes = $hook->getValue();
-	$sizes['original'] = [];
+    $sizes = $hook->getValue();
+    $sizes['original'] = [];
 
-	return $sizes;
+    return $sizes;
 }

mod/groups/languages/en.php

Indentation +187 added lines, -187 removed lines

@@ -1,166 +1,166 @@ 
 <?php
 return [
 
-	/**
-	 * Menu items and titles
-	 */
-	'groups' => "Groups",
-	'groups:owned' => "Groups I own",
-	'groups:owned:user' => 'Groups %s owns',
-	'groups:yours' => "My groups",
-	'groups:user' => "%s's groups",
-	'groups:all' => "All groups",
-	'groups:add' => "Create a new group",
-	'groups:edit' => "Edit group",
-	'groups:delete' => 'Delete group',
-	'groups:membershiprequests' => 'Manage join requests',
-	'groups:membershiprequests:pending' => 'Manage join requests (%s)',
-	'groups:invitations' => 'Group invitations',
-	'groups:invitations:pending' => 'Group invitations (%s)',
-
-	'groups:icon' => 'Group icon (leave blank to leave unchanged)',
-	'groups:name' => 'Group name',
-	'groups:username' => 'Group short name (displayed in URLs, alphanumeric characters only)',
-	'groups:description' => 'Description',
-	'groups:briefdescription' => 'Brief description',
-	'groups:interests' => 'Tags',
-	'groups:website' => 'Website',
-	'groups:members' => 'Group members',
-	'groups:my_status' => 'My status',
-	'groups:my_status:group_owner' => 'You own this group',
-	'groups:my_status:group_member' => 'You are in this group',
-	'groups:subscribed' => 'Group notifications are on',
-	'groups:unsubscribed' => 'Group notifications are off',
-
-	'groups:members:title' => 'Members of %s',
-	'groups:members:more' => "View all members",
-	'groups:membership' => "Group membership permissions",
-	'groups:content_access_mode' => "Accessibility of group content",
-	'groups:content_access_mode:warning' => "Warning: Changing this setting won't change the access permission of existing group content.",
-	'groups:content_access_mode:unrestricted' => "Unrestricted - Access depends on content-level settings",
-	'groups:content_access_mode:membersonly' => "Members Only - Non-members can never access group content",
-	'groups:access' => "Access permissions",
-	'groups:owner' => "Owner",
-	'groups:owner:warning' => "Warning: if you change this value, you will no longer be the owner of this group.",
-	'groups:widget:num_display' => 'Number of groups to display',
-	'groups:widget:membership' => 'Group membership',
-	'groups:widgets:description' => 'Display the groups you are a member of on your profile',
-
-	'groups:widget:group_activity:title' => 'Group activity',
-	'groups:widget:group_activity:description' => 'View the activity in one of your groups',
-	'groups:widget:group_activity:edit:select' => 'Select a group',
-	'groups:widget:group_activity:content:noactivity' => 'There is no activity in this group',
-	'groups:widget:group_activity:content:noselect' => 'Edit this widget to select a group',
-
-	'groups:noaccess' => 'No access to group',
-	'groups:ingroup' => 'in the group',
-	'groups:cantcreate' => 'You can not create a group. Only admins can.',
-	'groups:cantedit' => 'You can not edit this group',
-	'groups:saved' => 'Group saved',
-	'groups:save_error' => 'Group could not be saved',
-	'groups:featured' => 'Featured groups',
-	'groups:makeunfeatured' => 'Unfeature',
-	'groups:makefeatured' => 'Make featured',
-	'groups:featuredon' => '%s is now a featured group.',
-	'groups:unfeatured' => '%s has been removed from the featured groups.',
-	'groups:featured_error' => 'Invalid group.',
-	'groups:nofeatured' => 'No featured groups',
-	'groups:joinrequest' => 'Request membership',
-	'groups:join' => 'Join group',
-	'groups:leave' => 'Leave group',
-	'groups:invite' => 'Invite friends',
-	'groups:invite:title' => 'Invite friends to this group',
-	'groups:inviteto' => "Invite friends to '%s'",
-	'groups:nofriends' => "You have no friends left who have not been invited to this group.",
-	'groups:nofriendsatall' => 'You have no friends to invite!',
-	'groups:viagroups' => "via groups",
-	'groups:group' => "Group",
-	'groups:search:tags' => "tag",
-	'groups:search:title' => "Search for groups tagged with '%s'",
-	'groups:search:none' => "No matching groups were found",
-	'groups:search_in_group' => "Search in this group",
-	'groups:acl' => "Group: %s",
-	'groups:acl:in_context' => 'Group members',
-
-	'groups:activity' => "Group activity",
-	'groups:enableactivity' => 'Enable group activity',
-	'groups:activity:none' => "There is no group activity yet",
-
-	'groups:notfound' => "Group not found",
-	'groups:notfound:details' => "The requested group either does not exist or you do not have access to it",
-
-	'groups:requests:none' => 'There are no current membership requests.',
-
-	'groups:invitations:none' => 'There are no current invitations.',
-
-	'groups:count' => "groups created",
-	'groups:open' => "open group",
-	'groups:closed' => "closed group",
-	'groups:member' => "members",
-	'groups:searchtag' => "Search for groups by tag",
-
-	'groups:more' => 'More groups',
-	'groups:none' => 'No groups',
-
-	/**
-	 * Access
-	 */
-	'groups:access:private' => 'Closed - Users must be invited',
-	'groups:access:public' => 'Open - Any user may join',
-	'groups:access:group' => 'Group members only',
-	'groups:closedgroup' => "This group's membership is closed.",
-	'groups:closedgroup:request' => 'To ask to be added, click the "Request membership" menu link.',
-	'groups:closedgroup:membersonly' => "This group's membership is closed and its content is accessible only by members.",
-	'groups:opengroup:membersonly' => "This group's content is accessible only by members.",
-	'groups:opengroup:membersonly:join' => 'To be a member, click the "Join group" menu link.',
-	'groups:visibility' => 'Who can see this group?',
-
-	/**
-	 * Group tools
-	 */
-	'groups:lastupdated' => 'Last updated %s by %s',
-	'groups:lastcomment' => 'Last comment %s by %s',
-
-	'admin:groups' => 'Groups',
-
-	'groups:privategroup' => 'This group is closed. Requesting membership.',
-	'groups:notitle' => 'Groups must have a title',
-	'groups:cantjoin' => 'Can not join group',
-	'groups:cantleave' => 'Could not leave group',
-	'groups:removeuser' => 'Remove from group',
-	'groups:cantremove' => 'Cannot remove user from group',
-	'groups:removed' => 'Successfully removed %s from group',
-	'groups:addedtogroup' => 'Successfully added the user to the group',
-	'groups:joinrequestnotmade' => 'Could not request to join group',
-	'groups:joinrequestmade' => 'Requested to join group',
-	'groups:joinrequest:exists' => 'You already requested membership for this group',
-	'groups:joined' => 'Successfully joined group!',
-	'groups:left' => 'Successfully left group',
-	'groups:notowner' => 'Sorry, you are not the owner of this group.',
-	'groups:notmember' => 'Sorry, you are not a member of this group.',
-	'groups:alreadymember' => 'You are already a member of this group!',
-	'groups:userinvited' => 'User has been invited.',
-	'groups:usernotinvited' => 'User could not be invited.',
-	'groups:useralreadyinvited' => 'User has already been invited',
-	'groups:invite:subject' => "%s you have been invited to join %s!",
-	'groups:started' => "Started by %s",
-	'groups:joinrequest:remove:check' => 'Are you sure you want to remove this join request?',
-	'groups:invite:remove:check' => 'Are you sure you want to remove this invitation?',
-	'groups:invite:body' => "Hi %s,
+    /**
+     * Menu items and titles
+     */
+    'groups' => "Groups",
+    'groups:owned' => "Groups I own",
+    'groups:owned:user' => 'Groups %s owns',
+    'groups:yours' => "My groups",
+    'groups:user' => "%s's groups",
+    'groups:all' => "All groups",
+    'groups:add' => "Create a new group",
+    'groups:edit' => "Edit group",
+    'groups:delete' => 'Delete group',
+    'groups:membershiprequests' => 'Manage join requests',
+    'groups:membershiprequests:pending' => 'Manage join requests (%s)',
+    'groups:invitations' => 'Group invitations',
+    'groups:invitations:pending' => 'Group invitations (%s)',
+
+    'groups:icon' => 'Group icon (leave blank to leave unchanged)',
+    'groups:name' => 'Group name',
+    'groups:username' => 'Group short name (displayed in URLs, alphanumeric characters only)',
+    'groups:description' => 'Description',
+    'groups:briefdescription' => 'Brief description',
+    'groups:interests' => 'Tags',
+    'groups:website' => 'Website',
+    'groups:members' => 'Group members',
+    'groups:my_status' => 'My status',
+    'groups:my_status:group_owner' => 'You own this group',
+    'groups:my_status:group_member' => 'You are in this group',
+    'groups:subscribed' => 'Group notifications are on',
+    'groups:unsubscribed' => 'Group notifications are off',
+
+    'groups:members:title' => 'Members of %s',
+    'groups:members:more' => "View all members",
+    'groups:membership' => "Group membership permissions",
+    'groups:content_access_mode' => "Accessibility of group content",
+    'groups:content_access_mode:warning' => "Warning: Changing this setting won't change the access permission of existing group content.",
+    'groups:content_access_mode:unrestricted' => "Unrestricted - Access depends on content-level settings",
+    'groups:content_access_mode:membersonly' => "Members Only - Non-members can never access group content",
+    'groups:access' => "Access permissions",
+    'groups:owner' => "Owner",
+    'groups:owner:warning' => "Warning: if you change this value, you will no longer be the owner of this group.",
+    'groups:widget:num_display' => 'Number of groups to display',
+    'groups:widget:membership' => 'Group membership',
+    'groups:widgets:description' => 'Display the groups you are a member of on your profile',
+
+    'groups:widget:group_activity:title' => 'Group activity',
+    'groups:widget:group_activity:description' => 'View the activity in one of your groups',
+    'groups:widget:group_activity:edit:select' => 'Select a group',
+    'groups:widget:group_activity:content:noactivity' => 'There is no activity in this group',
+    'groups:widget:group_activity:content:noselect' => 'Edit this widget to select a group',
+
+    'groups:noaccess' => 'No access to group',
+    'groups:ingroup' => 'in the group',
+    'groups:cantcreate' => 'You can not create a group. Only admins can.',
+    'groups:cantedit' => 'You can not edit this group',
+    'groups:saved' => 'Group saved',
+    'groups:save_error' => 'Group could not be saved',
+    'groups:featured' => 'Featured groups',
+    'groups:makeunfeatured' => 'Unfeature',
+    'groups:makefeatured' => 'Make featured',
+    'groups:featuredon' => '%s is now a featured group.',
+    'groups:unfeatured' => '%s has been removed from the featured groups.',
+    'groups:featured_error' => 'Invalid group.',
+    'groups:nofeatured' => 'No featured groups',
+    'groups:joinrequest' => 'Request membership',
+    'groups:join' => 'Join group',
+    'groups:leave' => 'Leave group',
+    'groups:invite' => 'Invite friends',
+    'groups:invite:title' => 'Invite friends to this group',
+    'groups:inviteto' => "Invite friends to '%s'",
+    'groups:nofriends' => "You have no friends left who have not been invited to this group.",
+    'groups:nofriendsatall' => 'You have no friends to invite!',
+    'groups:viagroups' => "via groups",
+    'groups:group' => "Group",
+    'groups:search:tags' => "tag",
+    'groups:search:title' => "Search for groups tagged with '%s'",
+    'groups:search:none' => "No matching groups were found",
+    'groups:search_in_group' => "Search in this group",
+    'groups:acl' => "Group: %s",
+    'groups:acl:in_context' => 'Group members',
+
+    'groups:activity' => "Group activity",
+    'groups:enableactivity' => 'Enable group activity',
+    'groups:activity:none' => "There is no group activity yet",
+
+    'groups:notfound' => "Group not found",
+    'groups:notfound:details' => "The requested group either does not exist or you do not have access to it",
+
+    'groups:requests:none' => 'There are no current membership requests.',
+
+    'groups:invitations:none' => 'There are no current invitations.',
+
+    'groups:count' => "groups created",
+    'groups:open' => "open group",
+    'groups:closed' => "closed group",
+    'groups:member' => "members",
+    'groups:searchtag' => "Search for groups by tag",
+
+    'groups:more' => 'More groups',
+    'groups:none' => 'No groups',
+
+    /**
+     * Access
+     */
+    'groups:access:private' => 'Closed - Users must be invited',
+    'groups:access:public' => 'Open - Any user may join',
+    'groups:access:group' => 'Group members only',
+    'groups:closedgroup' => "This group's membership is closed.",
+    'groups:closedgroup:request' => 'To ask to be added, click the "Request membership" menu link.',
+    'groups:closedgroup:membersonly' => "This group's membership is closed and its content is accessible only by members.",
+    'groups:opengroup:membersonly' => "This group's content is accessible only by members.",
+    'groups:opengroup:membersonly:join' => 'To be a member, click the "Join group" menu link.',
+    'groups:visibility' => 'Who can see this group?',
+
+    /**
+     * Group tools
+     */
+    'groups:lastupdated' => 'Last updated %s by %s',
+    'groups:lastcomment' => 'Last comment %s by %s',
+
+    'admin:groups' => 'Groups',
+
+    'groups:privategroup' => 'This group is closed. Requesting membership.',
+    'groups:notitle' => 'Groups must have a title',
+    'groups:cantjoin' => 'Can not join group',
+    'groups:cantleave' => 'Could not leave group',
+    'groups:removeuser' => 'Remove from group',
+    'groups:cantremove' => 'Cannot remove user from group',
+    'groups:removed' => 'Successfully removed %s from group',
+    'groups:addedtogroup' => 'Successfully added the user to the group',
+    'groups:joinrequestnotmade' => 'Could not request to join group',
+    'groups:joinrequestmade' => 'Requested to join group',
+    'groups:joinrequest:exists' => 'You already requested membership for this group',
+    'groups:joined' => 'Successfully joined group!',
+    'groups:left' => 'Successfully left group',
+    'groups:notowner' => 'Sorry, you are not the owner of this group.',
+    'groups:notmember' => 'Sorry, you are not a member of this group.',
+    'groups:alreadymember' => 'You are already a member of this group!',
+    'groups:userinvited' => 'User has been invited.',
+    'groups:usernotinvited' => 'User could not be invited.',
+    'groups:useralreadyinvited' => 'User has already been invited',
+    'groups:invite:subject' => "%s you have been invited to join %s!",
+    'groups:started' => "Started by %s",
+    'groups:joinrequest:remove:check' => 'Are you sure you want to remove this join request?',
+    'groups:invite:remove:check' => 'Are you sure you want to remove this invitation?',
+    'groups:invite:body' => "Hi %s,
 
 %s invited you to join the '%s' group. Click below to view your invitations:
 
 %s",
 
-	'groups:welcome:subject' => "Welcome to the %s group!",
-	'groups:welcome:body' => "Hi %s!
+    'groups:welcome:subject' => "Welcome to the %s group!",
+    'groups:welcome:body' => "Hi %s!
 
 You are now a member of the '%s' group! Click below to begin posting!
 
 %s",
 
-	'groups:request:subject' => "%s has requested to join %s",
-	'groups:request:body' => "Hi %s,
+    'groups:request:subject' => "%s has requested to join %s",
+    'groups:request:body' => "Hi %s,
 
 %s has requested to join the '%s' group. Click below to view their profile:
 
@@ -170,54 +170,54 @@ 
 
 %s",
 
-	/**
-	 * Forum river items
-	 */
+    /**
+     * Forum river items
+     */
 
-	'river:create:group:default' => '%s created the group %s',
-	'river:join:group:default' => '%s joined the group %s',
+    'river:create:group:default' => '%s created the group %s',
+    'river:join:group:default' => '%s joined the group %s',
 
-	'groups:nowidgets' => 'No widgets have been defined for this group.',
+    'groups:nowidgets' => 'No widgets have been defined for this group.',
 
 
-	'groups:widgets:members:title' => 'Group members',
-	'groups:widgets:members:description' => 'List the members of a group.',
-	'groups:widgets:members:label:displaynum' => 'List the members of a group.',
-	'groups:widgets:members:label:pleaseedit' => 'Please configure this widget.',
+    'groups:widgets:members:title' => 'Group members',
+    'groups:widgets:members:description' => 'List the members of a group.',
+    'groups:widgets:members:label:displaynum' => 'List the members of a group.',
+    'groups:widgets:members:label:pleaseedit' => 'Please configure this widget.',
 
-	'groups:widgets:entities:title' => "Objects in group",
-	'groups:widgets:entities:description' => "List the objects saved in this group",
-	'groups:widgets:entities:label:displaynum' => 'List the objects of a group.',
-	'groups:widgets:entities:label:pleaseedit' => 'Please configure this widget.',
+    'groups:widgets:entities:title' => "Objects in group",
+    'groups:widgets:entities:description' => "List the objects saved in this group",
+    'groups:widgets:entities:label:displaynum' => 'List the objects of a group.',
+    'groups:widgets:entities:label:pleaseedit' => 'Please configure this widget.',
 
-	'groups:allowhiddengroups' => 'Allow private (invisible) groups?',
-	'groups:whocancreate' => 'Who can create new groups?',
-	'groups:allow_activity' => 'Allow activity pages in groups?',
+    'groups:allowhiddengroups' => 'Allow private (invisible) groups?',
+    'groups:whocancreate' => 'Who can create new groups?',
+    'groups:allow_activity' => 'Allow activity pages in groups?',
 
-	/**
-	 * Action messages
-	 */
-	'group:deleted' => 'Group and group contents deleted',
-	'group:notdeleted' => 'Group could not be deleted',
+    /**
+     * Action messages
+     */
+    'group:deleted' => 'Group and group contents deleted',
+    'group:notdeleted' => 'Group could not be deleted',
 
-	'group:notfound' => 'Could not find the group',
-	'groups:deletewarning' => "Are you sure you want to delete this group? There is no undo!",
+    'group:notfound' => 'Could not find the group',
+    'groups:deletewarning' => "Are you sure you want to delete this group? There is no undo!",
 
-	'groups:invitekilled' => 'The invite has been deleted.',
-	'groups:joinrequestkilled' => 'The join request has been deleted.',
-	'groups:error:addedtogroup' => "Could not add %s to the group",
-	'groups:add:alreadymember' => "%s is already a member of this group",
+    'groups:invitekilled' => 'The invite has been deleted.',
+    'groups:joinrequestkilled' => 'The join request has been deleted.',
+    'groups:error:addedtogroup' => "Could not add %s to the group",
+    'groups:add:alreadymember' => "%s is already a member of this group",
 
-	/**
-	 * ecml
-	 */
-	'groups:ecml:groupprofile' => 'Group profiles',
+    /**
+     * ecml
+     */
+    'groups:ecml:groupprofile' => 'Group profiles',
 
-	/**
-	 * Upgrades
-	 */
-	'groups:upgrade:2016101900:title' => 'Transfer group icons to new location',
-	'groups:upgrade:2016101900:description' => '
+    /**
+     * Upgrades
+     */
+    'groups:upgrade:2016101900:title' => 'Transfer group icons to new location',
+    'groups:upgrade:2016101900:description' => '
 		New entity icon API stores icons in a predictable location on the filestore
 		relative to the entity\'s filestore directory. This upgrade aligns
 		will align group plugin with the requirements of the new API.

engine/classes/Elgg/Database/AccessCollections.php

Indentation +812 added lines, -812 removed lines

@@ -23,159 +23,159 @@ 
  */
 class AccessCollections {
 
-	/**
-	 * @var Conf
-	 */
-	protected $config;
-
-	/**
-	 * @var Database
-	 */
-	protected $db;
-
-	/**
-	 * @vars \ElggStateVariableCache
-	 */
-	protected $access_cache;
-
-	/**
-	 * @var PluginHooksService
-	 */
-	protected $hooks;
-
-	/**
-	 * @var ElggSession
-	 */
-	protected $session;
-
-	/**
-	 * @var EntityTable
-	 */
-	protected $entities;
-
-	/**
-	 * @var Translator
-	 */
-	protected $translator;
-
-	/**
-	 * @var string
-	 */
-	protected $table;
-
-	/**
-	 * @var string
-	 */
-	protected $membership_table;
-
-	/**
-	 * Constructor
-	 *
-	 * @param Config                  $config     Config
-	 * @param Database                $db         Database
-	 * @param EntityTable             $entities   Entity table
-	 * @param ElggStaticVariableCache $cache      Access cache
-	 * @param PluginHooksService      $hooks      Hooks
-	 * @param ElggSession             $session    Session
-	 * @param Translator              $translator Translator
-	 */
-	public function __construct(
-			Conf $config,
-			Database $db,
-			EntityTable $entities,
-			ElggStaticVariableCache $cache,
-			PluginHooksService $hooks,
-			ElggSession $session,
-			Translator $translator) {
-		$this->config = $config;
-		$this->db = $db;
-		$this->entities = $entities;
-		$this->access_cache = $cache;
-		$this->hooks = $hooks;
-		$this->session = $session;
-		$this->translator = $translator;
-
-		$this->table = "{$this->db->prefix}access_collections";
-		$this->membership_table = "{$this->db->prefix}access_collection_membership";
-	}
-
-	/**
-	 * Returns a string of access_ids for $user_guid appropriate for inserting into an SQL IN clause.
-	 *
-	 * @see get_access_array()
-	 *
-	 * @param int  $user_guid User ID; defaults to currently logged in user
-	 * @param bool $flush     If set to true, will refresh the access list from the
-	 *                        database rather than using this function's cache.
-	 *
-	 * @return string A concatenated string of access collections suitable for using in an SQL IN clause
-	 * @access private
-	 */
-	public function getAccessList($user_guid = 0, $flush = false) {
-		$access_array = $this->getAccessArray($user_guid, $flush);
-		$access_ids = implode(',', $access_array);
-		$list = "($access_ids)";
-
-		// for BC, populate the cache
-		$hash = $user_guid . 'get_access_list';
-		$this->access_cache->add($hash, $list);
-
-		return $list;
-	}
-
-	/**
-	 * Returns an array of access IDs a user is permitted to see.
-	 *
-	 * Can be overridden with the 'access:collections:read', 'user' plugin hook.
-	 * @warning A callback for that plugin hook needs to either not retrieve data
-	 * from the database that would use the access system (triggering the plugin again)
-	 * or ignore the second call. Otherwise, an infinite loop will be created.
-	 *
-	 * This returns a list of all the collection ids a user owns or belongs
-	 * to plus public and logged in access levels. If the user is an admin, it includes
-	 * the private access level.
-	 *
-	 * @internal this is only used in core for creating the SQL where clause when
-	 * retrieving content from the database. The friends access level is handled by
-	 * _elgg_get_access_where_sql().
-	 *
-	 * @see get_write_access_array() for the access levels that a user can write to.
-	 *
-	 * @param int  $user_guid User ID; defaults to currently logged in user
-	 * @param bool $flush     If set to true, will refresh the access ids from the
-	 *                        database rather than using this function's cache.
-	 *
-	 * @return array An array of access collections ids
-	 */
-	public function getAccessArray($user_guid = 0, $flush = false) {
-		global $init_finished;
-
-		$cache = $this->access_cache;
-
-		if ($flush) {
-			$cache->clear();
-		}
-
-		if ($user_guid == 0) {
-			$user_guid = $this->session->getLoggedInUserGuid();
-		}
-
-		$user_guid = (int) $user_guid;
-
-		$hash = $user_guid . 'get_access_array';
-
-		if ($cache[$hash]) {
-			$access_array = $cache[$hash];
-		} else {
-			// Public access is always visible
-			$access_array = [ACCESS_PUBLIC];
-
-			// The following can only return sensible data for a known user.
-			if ($user_guid) {
-				$access_array[] = ACCESS_LOGGED_IN;
-
-				// Get ACLs that user owns or is a member of
-				$query = "
+    /**
+     * @var Conf
+     */
+    protected $config;
+
+    /**
+     * @var Database
+     */
+    protected $db;
+
+    /**
+     * @vars \ElggStateVariableCache
+     */
+    protected $access_cache;
+
+    /**
+     * @var PluginHooksService
+     */
+    protected $hooks;
+
+    /**
+     * @var ElggSession
+     */
+    protected $session;
+
+    /**
+     * @var EntityTable
+     */
+    protected $entities;
+
+    /**
+     * @var Translator
+     */
+    protected $translator;
+
+    /**
+     * @var string
+     */
+    protected $table;
+
+    /**
+     * @var string
+     */
+    protected $membership_table;
+
+    /**
+     * Constructor
+     *
+     * @param Config                  $config     Config
+     * @param Database                $db         Database
+     * @param EntityTable             $entities   Entity table
+     * @param ElggStaticVariableCache $cache      Access cache
+     * @param PluginHooksService      $hooks      Hooks
+     * @param ElggSession             $session    Session
+     * @param Translator              $translator Translator
+     */
+    public function __construct(
+            Conf $config,
+            Database $db,
+            EntityTable $entities,
+            ElggStaticVariableCache $cache,
+            PluginHooksService $hooks,
+            ElggSession $session,
+            Translator $translator) {
+        $this->config = $config;
+        $this->db = $db;
+        $this->entities = $entities;
+        $this->access_cache = $cache;
+        $this->hooks = $hooks;
+        $this->session = $session;
+        $this->translator = $translator;
+
+        $this->table = "{$this->db->prefix}access_collections";
+        $this->membership_table = "{$this->db->prefix}access_collection_membership";
+    }
+
+    /**
+     * Returns a string of access_ids for $user_guid appropriate for inserting into an SQL IN clause.
+     *
+     * @see get_access_array()
+     *
+     * @param int  $user_guid User ID; defaults to currently logged in user
+     * @param bool $flush     If set to true, will refresh the access list from the
+     *                        database rather than using this function's cache.
+     *
+     * @return string A concatenated string of access collections suitable for using in an SQL IN clause
+     * @access private
+     */
+    public function getAccessList($user_guid = 0, $flush = false) {
+        $access_array = $this->getAccessArray($user_guid, $flush);
+        $access_ids = implode(',', $access_array);
+        $list = "($access_ids)";
+
+        // for BC, populate the cache
+        $hash = $user_guid . 'get_access_list';
+        $this->access_cache->add($hash, $list);
+
+        return $list;
+    }
+
+    /**
+     * Returns an array of access IDs a user is permitted to see.
+     *
+     * Can be overridden with the 'access:collections:read', 'user' plugin hook.
+     * @warning A callback for that plugin hook needs to either not retrieve data
+     * from the database that would use the access system (triggering the plugin again)
+     * or ignore the second call. Otherwise, an infinite loop will be created.
+     *
+     * This returns a list of all the collection ids a user owns or belongs
+     * to plus public and logged in access levels. If the user is an admin, it includes
+     * the private access level.
+     *
+     * @internal this is only used in core for creating the SQL where clause when
+     * retrieving content from the database. The friends access level is handled by
+     * _elgg_get_access_where_sql().
+     *
+     * @see get_write_access_array() for the access levels that a user can write to.
+     *
+     * @param int  $user_guid User ID; defaults to currently logged in user
+     * @param bool $flush     If set to true, will refresh the access ids from the
+     *                        database rather than using this function's cache.
+     *
+     * @return array An array of access collections ids
+     */
+    public function getAccessArray($user_guid = 0, $flush = false) {
+        global $init_finished;
+
+        $cache = $this->access_cache;
+
+        if ($flush) {
+            $cache->clear();
+        }
+
+        if ($user_guid == 0) {
+            $user_guid = $this->session->getLoggedInUserGuid();
+        }
+
+        $user_guid = (int) $user_guid;
+
+        $hash = $user_guid . 'get_access_array';
+
+        if ($cache[$hash]) {
+            $access_array = $cache[$hash];
+        } else {
+            // Public access is always visible
+            $access_array = [ACCESS_PUBLIC];
+
+            // The following can only return sensible data for a known user.
+            if ($user_guid) {
+                $access_array[] = ACCESS_LOGGED_IN;
+
+                // Get ACLs that user owns or is a member of
+                $query = "
 					SELECT ac.id
 					FROM {$this->table} ac
 					WHERE ac.owner_guid = :user_guid
@@ -185,687 +185,687 @@ 
 							   AND user_guid = :user_guid)
 				";
 
-				$collections = $this->db->getData($query, null, [
-					':user_guid' => $user_guid,
-				]);
-
-				if ($collections) {
-					foreach ($collections as $collection) {
-						$access_array[] = (int) $collection->id;
-					}
-				}
-
-				$ignore_access = elgg_check_access_overrides($user_guid);
-
-				if ($ignore_access == true) {
-					$access_array[] = ACCESS_PRIVATE;
-				}
-			}
-
-			if ($init_finished) {
-				$cache[$hash] = $access_array;
-			}
-		}
-
-		$options = [
-			'user_id' => $user_guid,
-		];
-
-		// see the warning in the docs for this function about infinite loop potential
-		return $this->hooks->trigger('access:collections:read', 'user', $options, $access_array);
-	}
-
-	/**
-	 * Returns the SQL where clause for enforcing read access to data.
-	 *
-	 * Note that if this code is executed in privileged mode it will return (1=1).
-	 *
-	 * Otherwise it returns a where clause to retrieve the data that a user has
-	 * permission to read.
-	 *
-	 * Plugin authors can hook into the 'get_sql', 'access' plugin hook to modify,
-	 * remove, or add to the where clauses. The plugin hook will pass an array with the current
-	 * ors and ands to the function in the form:
-	 *  array(
-	 *      'ors' => array(),
-	 *      'ands' => array()
-	 *  )
-	 *
-	 * The results will be combined into an SQL where clause in the form:
-	 *  ((or1 OR or2 OR orN) AND (and1 AND and2 AND andN))
-	 *
-	 * @param array $options Array in format:
-	 *
-	 * 	table_alias => STR Optional table alias. This is based on the select and join clauses.
-	 *                     Default is 'e'.
-	 *
-	 *  user_guid => INT Optional GUID for the user that we are retrieving data for.
-	 *                   Defaults to the logged in user if null.
-	 *                   Passing 0 will build a query for a logged out user (even if there is a logged in user)
-	 *
-	 *  use_enabled_clause => BOOL Optional. Should we append the enabled clause? The default
-	 *                             is set by access_show_hidden_entities().
-	 *
-	 *  access_column => STR Optional access column name. Default is 'access_id'.
-	 *
-	 *  owner_guid_column => STR Optional owner_guid column. Default is 'owner_guid'.
-	 *
-	 *  guid_column => STR Optional guid_column. Default is 'guid'.
-	 *
-	 * @return string
-	 * @access private
-	 */
-	public function getWhereSql(array $options = []) {
-
-		$defaults = [
-			'table_alias' => 'e',
-			'user_guid' => $this->session->getLoggedInUserGuid(),
-			'use_enabled_clause' => !access_get_show_hidden_status(),
-			'access_column' => 'access_id',
-			'owner_guid_column' => 'owner_guid',
-			'guid_column' => 'guid',
-		];
-
-		foreach ($options as $key => $value) {
-			if (is_null($value)) {
-				// remove null values so we don't loose defaults in array_merge
-				unset($options[$key]);
-			}
-		}
-
-		$options = array_merge($defaults, $options);
-
-		// just in case someone passes a . at the end
-		$options['table_alias'] = rtrim($options['table_alias'], '.');
-
-		foreach (['table_alias', 'access_column', 'owner_guid_column', 'guid_column'] as $key) {
-			$options[$key] = sanitize_string($options[$key]);
-		}
-		$options['user_guid'] = sanitize_int($options['user_guid'], false);
-
-		// only add dot if we have an alias or table name
-		$table_alias = $options['table_alias'] ? $options['table_alias'] . '.' : '';
-
-		if (!isset($options['ignore_access'])) {
-			$options['ignore_access'] = elgg_check_access_overrides($options['user_guid']);
-		}
-
-		$clauses = [
-			'ors' => [],
-			'ands' => []
-		];
-
-		$prefix = $this->db->prefix;
-
-		if ($options['ignore_access']) {
-			$clauses['ors']['ignore_access'] = '1 = 1';
-		} else if ($options['user_guid']) {
-			// include content of user's friends
-			$clauses['ors']['friends_access'] = "$table_alias{$options['access_column']} = " . ACCESS_FRIENDS . "
+                $collections = $this->db->getData($query, null, [
+                    ':user_guid' => $user_guid,
+                ]);
+
+                if ($collections) {
+                    foreach ($collections as $collection) {
+                        $access_array[] = (int) $collection->id;
+                    }
+                }
+
+                $ignore_access = elgg_check_access_overrides($user_guid);
+
+                if ($ignore_access == true) {
+                    $access_array[] = ACCESS_PRIVATE;
+                }
+            }
+
+            if ($init_finished) {
+                $cache[$hash] = $access_array;
+            }
+        }
+
+        $options = [
+            'user_id' => $user_guid,
+        ];
+
+        // see the warning in the docs for this function about infinite loop potential
+        return $this->hooks->trigger('access:collections:read', 'user', $options, $access_array);
+    }
+
+    /**
+     * Returns the SQL where clause for enforcing read access to data.
+     *
+     * Note that if this code is executed in privileged mode it will return (1=1).
+     *
+     * Otherwise it returns a where clause to retrieve the data that a user has
+     * permission to read.
+     *
+     * Plugin authors can hook into the 'get_sql', 'access' plugin hook to modify,
+     * remove, or add to the where clauses. The plugin hook will pass an array with the current
+     * ors and ands to the function in the form:
+     *  array(
+     *      'ors' => array(),
+     *      'ands' => array()
+     *  )
+     *
+     * The results will be combined into an SQL where clause in the form:
+     *  ((or1 OR or2 OR orN) AND (and1 AND and2 AND andN))
+     *
+     * @param array $options Array in format:
+     *
+     * 	table_alias => STR Optional table alias. This is based on the select and join clauses.
+     *                     Default is 'e'.
+     *
+     *  user_guid => INT Optional GUID for the user that we are retrieving data for.
+     *                   Defaults to the logged in user if null.
+     *                   Passing 0 will build a query for a logged out user (even if there is a logged in user)
+     *
+     *  use_enabled_clause => BOOL Optional. Should we append the enabled clause? The default
+     *                             is set by access_show_hidden_entities().
+     *
+     *  access_column => STR Optional access column name. Default is 'access_id'.
+     *
+     *  owner_guid_column => STR Optional owner_guid column. Default is 'owner_guid'.
+     *
+     *  guid_column => STR Optional guid_column. Default is 'guid'.
+     *
+     * @return string
+     * @access private
+     */
+    public function getWhereSql(array $options = []) {
+
+        $defaults = [
+            'table_alias' => 'e',
+            'user_guid' => $this->session->getLoggedInUserGuid(),
+            'use_enabled_clause' => !access_get_show_hidden_status(),
+            'access_column' => 'access_id',
+            'owner_guid_column' => 'owner_guid',
+            'guid_column' => 'guid',
+        ];
+
+        foreach ($options as $key => $value) {
+            if (is_null($value)) {
+                // remove null values so we don't loose defaults in array_merge
+                unset($options[$key]);
+            }
+        }
+
+        $options = array_merge($defaults, $options);
+
+        // just in case someone passes a . at the end
+        $options['table_alias'] = rtrim($options['table_alias'], '.');
+
+        foreach (['table_alias', 'access_column', 'owner_guid_column', 'guid_column'] as $key) {
+            $options[$key] = sanitize_string($options[$key]);
+        }
+        $options['user_guid'] = sanitize_int($options['user_guid'], false);
+
+        // only add dot if we have an alias or table name
+        $table_alias = $options['table_alias'] ? $options['table_alias'] . '.' : '';
+
+        if (!isset($options['ignore_access'])) {
+            $options['ignore_access'] = elgg_check_access_overrides($options['user_guid']);
+        }
+
+        $clauses = [
+            'ors' => [],
+            'ands' => []
+        ];
+
+        $prefix = $this->db->prefix;
+
+        if ($options['ignore_access']) {
+            $clauses['ors']['ignore_access'] = '1 = 1';
+        } else if ($options['user_guid']) {
+            // include content of user's friends
+            $clauses['ors']['friends_access'] = "$table_alias{$options['access_column']} = " . ACCESS_FRIENDS . "
 				AND $table_alias{$options['owner_guid_column']} IN (
 					SELECT guid_one FROM {$prefix}entity_relationships
 					WHERE relationship = 'friend' AND guid_two = {$options['user_guid']}
 				)";
 
-			// include user's content
-			$clauses['ors']['owner_access'] = "$table_alias{$options['owner_guid_column']} = {$options['user_guid']}";
-		}
-
-		// include standard accesses (public, logged in, access collections)
-		if (!$options['ignore_access']) {
-			$access_list = $this->getAccessList($options['user_guid']);
-			$clauses['ors']['acl_access'] = "$table_alias{$options['access_column']} IN {$access_list}";
-		}
-
-		if ($options['use_enabled_clause']) {
-			$clauses['ands']['use_enabled'] = "{$table_alias}enabled = 'yes'";
-		}
-
-		$clauses = $this->hooks->trigger('get_sql', 'access', $options, $clauses);
-
-		$clauses_str = '';
-		if (is_array($clauses['ors']) && $clauses['ors']) {
-			$clauses_str = '(' . implode(' OR ', $clauses['ors']) . ')';
-		}
-
-		if (is_array($clauses['ands']) && $clauses['ands']) {
-			if ($clauses_str) {
-				$clauses_str .= ' AND ';
-			}
-			$clauses_str .= '(' . implode(' AND ', $clauses['ands']) . ')';
-		}
-
-		return "($clauses_str)";
-	}
-
-	/**
-	 * Can a user access an entity.
-	 *
-	 * @warning If a logged in user doesn't have access to an entity, the
-	 * core engine will not load that entity.
-	 *
-	 * @tip This is mostly useful for checking if a user other than the logged in
-	 * user has access to an entity that is currently loaded.
-	 *
-	 * @todo This function would be much more useful if we could pass the guid of the
-	 * entity to test access for. We need to be able to tell whether the entity exists
-	 * and whether the user has access to the entity.
-	 *
-	 * @param ElggEntity $entity The entity to check access for.
-	 * @param ElggUser   $user   Optionally user to check access for. Defaults to
-	 *                           logged in user (which is a useless default).
-	 *
-	 * @return bool
-	 */
-	public function hasAccessToEntity($entity, $user = null) {
-		if (!$entity instanceof \ElggEntity) {
-			return false;
-		}
-
-		if ($entity->access_id == ACCESS_PUBLIC) {
-			// Public entities are always accessible
-			return true;
-		}
-
-		$user_guid = isset($user) ? (int) $user->guid : elgg_get_logged_in_user_guid();
-
-		if ($user_guid && $user_guid == $entity->owner_guid) {
-			// Owners have access to their own content
-			return true;
-		}
-
-		if ($user_guid && $entity->access_id == ACCESS_LOGGED_IN) {
-			// Existing users have access to entities with logged in access
-			return true;
-		}
-
-		// See #7159. Must not allow ignore access to affect query
-		$ia = elgg_set_ignore_access(false);
+            // include user's content
+            $clauses['ors']['owner_access'] = "$table_alias{$options['owner_guid_column']} = {$options['user_guid']}";
+        }
+
+        // include standard accesses (public, logged in, access collections)
+        if (!$options['ignore_access']) {
+            $access_list = $this->getAccessList($options['user_guid']);
+            $clauses['ors']['acl_access'] = "$table_alias{$options['access_column']} IN {$access_list}";
+        }
+
+        if ($options['use_enabled_clause']) {
+            $clauses['ands']['use_enabled'] = "{$table_alias}enabled = 'yes'";
+        }
+
+        $clauses = $this->hooks->trigger('get_sql', 'access', $options, $clauses);
+
+        $clauses_str = '';
+        if (is_array($clauses['ors']) && $clauses['ors']) {
+            $clauses_str = '(' . implode(' OR ', $clauses['ors']) . ')';
+        }
+
+        if (is_array($clauses['ands']) && $clauses['ands']) {
+            if ($clauses_str) {
+                $clauses_str .= ' AND ';
+            }
+            $clauses_str .= '(' . implode(' AND ', $clauses['ands']) . ')';
+        }
+
+        return "($clauses_str)";
+    }
+
+    /**
+     * Can a user access an entity.
+     *
+     * @warning If a logged in user doesn't have access to an entity, the
+     * core engine will not load that entity.
+     *
+     * @tip This is mostly useful for checking if a user other than the logged in
+     * user has access to an entity that is currently loaded.
+     *
+     * @todo This function would be much more useful if we could pass the guid of the
+     * entity to test access for. We need to be able to tell whether the entity exists
+     * and whether the user has access to the entity.
+     *
+     * @param ElggEntity $entity The entity to check access for.
+     * @param ElggUser   $user   Optionally user to check access for. Defaults to
+     *                           logged in user (which is a useless default).
+     *
+     * @return bool
+     */
+    public function hasAccessToEntity($entity, $user = null) {
+        if (!$entity instanceof \ElggEntity) {
+            return false;
+        }
+
+        if ($entity->access_id == ACCESS_PUBLIC) {
+            // Public entities are always accessible
+            return true;
+        }
+
+        $user_guid = isset($user) ? (int) $user->guid : elgg_get_logged_in_user_guid();
+
+        if ($user_guid && $user_guid == $entity->owner_guid) {
+            // Owners have access to their own content
+            return true;
+        }
+
+        if ($user_guid && $entity->access_id == ACCESS_LOGGED_IN) {
+            // Existing users have access to entities with logged in access
+            return true;
+        }
+
+        // See #7159. Must not allow ignore access to affect query
+        $ia = elgg_set_ignore_access(false);
 		
-		$row = $this->entities->getRow($entity->guid, $user_guid);
-
-		elgg_set_ignore_access($ia);
-
-		return !empty($row);
-	}
-
-	/**
-	 * Returns an array of access permissions that the user is allowed to save content with.
-	 * Permissions returned are of the form (id => 'name').
-	 *
-	 * Example return value in English:
-	 * array(
-	 *     0 => 'Private',
-	 *    -2 => 'Friends',
-	 *     1 => 'Logged in users',
-	 *     2 => 'Public',
-	 *    34 => 'My favorite friends',
-	 * );
-	 *
-	 * Plugin hook of 'access:collections:write', 'user'
-	 *
-	 * @warning this only returns access collections that the user owns plus the
-	 * standard access levels. It does not return access collections that the user
-	 * belongs to such as the access collection for a group.
-	 *
-	 * @param int   $user_guid    The user's GUID.
-	 * @param bool  $flush        If this is set to true, this will ignore a cached access array
-	 * @param array $input_params Some parameters passed into an input/access view
-	 *
-	 * @return array List of access permissions
-	 */
-	public function getWriteAccessArray($user_guid = 0, $flush = false, array $input_params = []) {
-		global $init_finished;
-		$cache = $this->access_cache;
-
-		if ($flush) {
-			$cache->clear();
-		}
-
-		if ($user_guid == 0) {
-			$user_guid = $this->session->getLoggedInUserGuid();
-		}
-
-		$user_guid = (int) $user_guid;
-
-		$hash = $user_guid . 'get_write_access_array';
-
-		if ($cache[$hash]) {
-			$access_array = $cache[$hash];
-		} else {
-			// @todo is there such a thing as public write access?
-			$access_array = [
-				ACCESS_PRIVATE => $this->getReadableAccessLevel(ACCESS_PRIVATE),
-				ACCESS_LOGGED_IN => $this->getReadableAccessLevel(ACCESS_LOGGED_IN),
-				ACCESS_PUBLIC => $this->getReadableAccessLevel(ACCESS_PUBLIC)
-			];
-
-			$collections = $this->getEntityCollections($user_guid);
-			if ($collections) {
-				foreach ($collections as $collection) {
-					$access_array[$collection->id] = $collection->name;
-				}
-			}
-
-			if ($init_finished) {
-				$cache[$hash] = $access_array;
-			}
-		}
-
-		$options = [
-			'user_id' => $user_guid,
-			'input_params' => $input_params,
-		];
-		return $this->hooks->trigger('access:collections:write', 'user', $options, $access_array);
-	}
-
-	/**
-	 * Can the user change this access collection?
-	 *
-	 * Use the plugin hook of 'access:collections:write', 'user' to change this.
-	 * @see get_write_access_array() for details on the hook.
-	 *
-	 * Respects access control disabling for admin users and {@link elgg_set_ignore_access()}
-	 *
-	 * @see get_write_access_array()
-	 *
-	 * @param int   $collection_id The collection id
-	 * @param mixed $user_guid     The user GUID to check for. Defaults to logged in user.
-	 * @return bool
-	 */
-	public function canEdit($collection_id, $user_guid = null) {
-		try {
-			$user = $this->entities->getUserForPermissionsCheck($user_guid);
-		} catch (UserFetchFailureException $e) {
-			return false;
-		}
-
-		$collection = $this->get($collection_id);
-
-		if (!$user || !$collection) {
-			return false;
-		}
-
-		if (elgg_check_access_overrides($user->guid)) {
-			return true;
-		}
-
-		$write_access = $this->getWriteAccessArray($user->guid, true);
-		return array_key_exists($collection_id, $write_access);
-	}
-
-	/**
-	 * Creates a new access collection.
-	 *
-	 * Access colletions allow plugins and users to create granular access
-	 * for entities.
-	 *
-	 * Triggers plugin hook 'access:collections:addcollection', 'collection'
-	 *
-	 * @internal Access collections are stored in the access_collections table.
-	 * Memberships to collections are in access_collections_membership.
-	 *
-	 * @param string $name       The name of the collection.
-	 * @param int    $owner_guid The GUID of the owner (default: currently logged in user).
-	 *
-	 * @return int|false The collection ID if successful and false on failure.
-	 */
-	public function create($name, $owner_guid = 0) {
-		$name = trim($name);
-		if (empty($name)) {
-			return false;
-		}
-
-		if ($owner_guid == 0) {
-			$owner_guid = $this->session->getLoggedInUserGuid();
-		}
-
-		$query = "
+        $row = $this->entities->getRow($entity->guid, $user_guid);
+
+        elgg_set_ignore_access($ia);
+
+        return !empty($row);
+    }
+
+    /**
+     * Returns an array of access permissions that the user is allowed to save content with.
+     * Permissions returned are of the form (id => 'name').
+     *
+     * Example return value in English:
+     * array(
+     *     0 => 'Private',
+     *    -2 => 'Friends',
+     *     1 => 'Logged in users',
+     *     2 => 'Public',
+     *    34 => 'My favorite friends',
+     * );
+     *
+     * Plugin hook of 'access:collections:write', 'user'
+     *
+     * @warning this only returns access collections that the user owns plus the
+     * standard access levels. It does not return access collections that the user
+     * belongs to such as the access collection for a group.
+     *
+     * @param int   $user_guid    The user's GUID.
+     * @param bool  $flush        If this is set to true, this will ignore a cached access array
+     * @param array $input_params Some parameters passed into an input/access view
+     *
+     * @return array List of access permissions
+     */
+    public function getWriteAccessArray($user_guid = 0, $flush = false, array $input_params = []) {
+        global $init_finished;
+        $cache = $this->access_cache;
+
+        if ($flush) {
+            $cache->clear();
+        }
+
+        if ($user_guid == 0) {
+            $user_guid = $this->session->getLoggedInUserGuid();
+        }
+
+        $user_guid = (int) $user_guid;
+
+        $hash = $user_guid . 'get_write_access_array';
+
+        if ($cache[$hash]) {
+            $access_array = $cache[$hash];
+        } else {
+            // @todo is there such a thing as public write access?
+            $access_array = [
+                ACCESS_PRIVATE => $this->getReadableAccessLevel(ACCESS_PRIVATE),
+                ACCESS_LOGGED_IN => $this->getReadableAccessLevel(ACCESS_LOGGED_IN),
+                ACCESS_PUBLIC => $this->getReadableAccessLevel(ACCESS_PUBLIC)
+            ];
+
+            $collections = $this->getEntityCollections($user_guid);
+            if ($collections) {
+                foreach ($collections as $collection) {
+                    $access_array[$collection->id] = $collection->name;
+                }
+            }
+
+            if ($init_finished) {
+                $cache[$hash] = $access_array;
+            }
+        }
+
+        $options = [
+            'user_id' => $user_guid,
+            'input_params' => $input_params,
+        ];
+        return $this->hooks->trigger('access:collections:write', 'user', $options, $access_array);
+    }
+
+    /**
+     * Can the user change this access collection?
+     *
+     * Use the plugin hook of 'access:collections:write', 'user' to change this.
+     * @see get_write_access_array() for details on the hook.
+     *
+     * Respects access control disabling for admin users and {@link elgg_set_ignore_access()}
+     *
+     * @see get_write_access_array()
+     *
+     * @param int   $collection_id The collection id
+     * @param mixed $user_guid     The user GUID to check for. Defaults to logged in user.
+     * @return bool
+     */
+    public function canEdit($collection_id, $user_guid = null) {
+        try {
+            $user = $this->entities->getUserForPermissionsCheck($user_guid);
+        } catch (UserFetchFailureException $e) {
+            return false;
+        }
+
+        $collection = $this->get($collection_id);
+
+        if (!$user || !$collection) {
+            return false;
+        }
+
+        if (elgg_check_access_overrides($user->guid)) {
+            return true;
+        }
+
+        $write_access = $this->getWriteAccessArray($user->guid, true);
+        return array_key_exists($collection_id, $write_access);
+    }
+
+    /**
+     * Creates a new access collection.
+     *
+     * Access colletions allow plugins and users to create granular access
+     * for entities.
+     *
+     * Triggers plugin hook 'access:collections:addcollection', 'collection'
+     *
+     * @internal Access collections are stored in the access_collections table.
+     * Memberships to collections are in access_collections_membership.
+     *
+     * @param string $name       The name of the collection.
+     * @param int    $owner_guid The GUID of the owner (default: currently logged in user).
+     *
+     * @return int|false The collection ID if successful and false on failure.
+     */
+    public function create($name, $owner_guid = 0) {
+        $name = trim($name);
+        if (empty($name)) {
+            return false;
+        }
+
+        if ($owner_guid == 0) {
+            $owner_guid = $this->session->getLoggedInUserGuid();
+        }
+
+        $query = "
 			INSERT INTO {$this->table}
 			SET name = :name,
 				owner_guid = :owner_guid
 		";
 
-		$params = [
-			':name' => $name,
-			':owner_guid' => (int) $owner_guid,
-		];
-
-		$id = $this->db->insertData($query, $params);
-		if (!$id) {
-			return false;
-		}
-
-		$this->access_cache->clear();
-
-		$hook_params = [
-			'collection_id' => $id,
-			'name' => $name,
-			'owner_guid' => $owner_guid,
-		];
-
-		if (!$this->hooks->trigger('access:collections:addcollection', 'collection', $hook_params, true)) {
-			$this->delete($id);
-			return false;
-		}
-
-		return $id;
-	}
-
-	/**
-	 * Renames an access collection
-	 *
-	 * @param int    $collection_id ID of the collection
-	 * @param string $name          The name of the collection
-	 * @return bool
-	 */
-	public function rename($collection_id, $name) {
-
-		$query = "
+        $params = [
+            ':name' => $name,
+            ':owner_guid' => (int) $owner_guid,
+        ];
+
+        $id = $this->db->insertData($query, $params);
+        if (!$id) {
+            return false;
+        }
+
+        $this->access_cache->clear();
+
+        $hook_params = [
+            'collection_id' => $id,
+            'name' => $name,
+            'owner_guid' => $owner_guid,
+        ];
+
+        if (!$this->hooks->trigger('access:collections:addcollection', 'collection', $hook_params, true)) {
+            $this->delete($id);
+            return false;
+        }
+
+        return $id;
+    }
+
+    /**
+     * Renames an access collection
+     *
+     * @param int    $collection_id ID of the collection
+     * @param string $name          The name of the collection
+     * @return bool
+     */
+    public function rename($collection_id, $name) {
+
+        $query = "
 			UPDATE {$this->table}
 			SET name = :name
 			WHERE id = :id
 		";
 
-		$params = [
-			':name' => $name,
-			':id' => (int) $collection_id,
-		];
-
-		if ($this->db->insertData($query, $params)) {
-			$this->access_cache->clear();
-			return (int) $collection_id;
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Updates the membership in an access collection.
-	 *
-	 * @warning Expects a full list of all members that should
-	 * be part of the access collection
-	 *
-	 * @note This will run all hooks associated with adding or removing
-	 * members to access collections.
-	 *
-	 * @param int   $collection_id ID of the collection.
-	 * @param array $new_members   Array of member entities or GUIDs
-	 * @return bool
-	 */
-	public function update($collection_id, array $new_members = []) {
-		$acl = $this->get($collection_id);
-
-		if (!$acl) {
-			return false;
-		}
+        $params = [
+            ':name' => $name,
+            ':id' => (int) $collection_id,
+        ];
+
+        if ($this->db->insertData($query, $params)) {
+            $this->access_cache->clear();
+            return (int) $collection_id;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Updates the membership in an access collection.
+     *
+     * @warning Expects a full list of all members that should
+     * be part of the access collection
+     *
+     * @note This will run all hooks associated with adding or removing
+     * members to access collections.
+     *
+     * @param int   $collection_id ID of the collection.
+     * @param array $new_members   Array of member entities or GUIDs
+     * @return bool
+     */
+    public function update($collection_id, array $new_members = []) {
+        $acl = $this->get($collection_id);
+
+        if (!$acl) {
+            return false;
+        }
 		
-		$to_guid = function($elem) {
-			if (empty($elem)) {
-				return 0;
-			}
-			if (is_object($elem)) {
-				return (int) $elem->guid;
-			}
-			return (int) $elem;
-		};
+        $to_guid = function($elem) {
+            if (empty($elem)) {
+                return 0;
+            }
+            if (is_object($elem)) {
+                return (int) $elem->guid;
+            }
+            return (int) $elem;
+        };
 		
-		$current_members = [];
-		$new_members = array_map($to_guid, $new_members);
+        $current_members = [];
+        $new_members = array_map($to_guid, $new_members);
 
-		$current_members_batch = $this->getMembers($collection_id, [
-			'batch' => true,
-			'limit' => 0,
-			'callback' => false,
-		]);
+        $current_members_batch = $this->getMembers($collection_id, [
+            'batch' => true,
+            'limit' => 0,
+            'callback' => false,
+        ]);
 
-		foreach ($current_members_batch as $row) {
-			$current_members[] = $to_guid($row);
-		}
+        foreach ($current_members_batch as $row) {
+            $current_members[] = $to_guid($row);
+        }
 
-		$remove_members = array_diff($current_members, $new_members);
-		$add_members = array_diff($new_members, $current_members);
+        $remove_members = array_diff($current_members, $new_members);
+        $add_members = array_diff($new_members, $current_members);
 
-		$result = true;
+        $result = true;
 
-		foreach ($add_members as $guid) {
-			$result = $result && $this->addUser($guid, $collection_id);
-		}
+        foreach ($add_members as $guid) {
+            $result = $result && $this->addUser($guid, $collection_id);
+        }
 
-		foreach ($remove_members as $guid) {
-			$result = $result && $this->removeUser($guid, $collection_id);
-		}
+        foreach ($remove_members as $guid) {
+            $result = $result && $this->removeUser($guid, $collection_id);
+        }
 
-		$this->access_cache->clear();
+        $this->access_cache->clear();
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Deletes a collection and its membership information
-	 *
-	 * @param int $collection_id ID of the collection
-	 * @return bool
-	 */
-	public function delete($collection_id) {
-		$collection_id = (int) $collection_id;
+    /**
+     * Deletes a collection and its membership information
+     *
+     * @param int $collection_id ID of the collection
+     * @return bool
+     */
+    public function delete($collection_id) {
+        $collection_id = (int) $collection_id;
 
-		$params = [
-			'collection_id' => $collection_id,
-		];
+        $params = [
+            'collection_id' => $collection_id,
+        ];
 
-		if (!$this->hooks->trigger('access:collections:deletecollection', 'collection', $params, true)) {
-			return false;
-		}
+        if (!$this->hooks->trigger('access:collections:deletecollection', 'collection', $params, true)) {
+            return false;
+        }
 
-		// Deleting membership doesn't affect result of deleting ACL.
-		$query = "
+        // Deleting membership doesn't affect result of deleting ACL.
+        $query = "
 			DELETE FROM {$this->membership_table}
 			WHERE access_collection_id = :access_collection_id
 		";
-		$this->db->deleteData($query, [
-			':access_collection_id' => $collection_id,
-		]);
+        $this->db->deleteData($query, [
+            ':access_collection_id' => $collection_id,
+        ]);
 
-		$query = "
+        $query = "
 			DELETE FROM {$this->table}
 			WHERE id = :id
 		";
-		$result = $this->db->deleteData($query, [
-			':id' => $collection_id,
-		]);
+        $result = $this->db->deleteData($query, [
+            ':id' => $collection_id,
+        ]);
 
-		$this->access_cache->clear();
+        $this->access_cache->clear();
 		
-		return (bool) $result;
-	}
-
-	/**
-	 * Transforms a database row to an instance of ElggAccessCollection
-	 *
-	 * @param \stdClass $row Database row
-	 * @return \ElggAccessCollection
-	 */
-	public function rowToElggAccessCollection(\stdClass $row) {
-		return new \ElggAccessCollection($row);
-	}
-
-	/**
-	 * Get a specified access collection
-	 *
-	 * @note This doesn't return the members of an access collection,
-	 * just the database row of the actual collection.
-	 *
-	 * @see get_members_of_access_collection()
-	 *
-	 * @param int $collection_id The collection ID
-	 * @return \ElggAccessCollection|false
-	 */
-	public function get($collection_id) {
-
-		$callback = [$this, 'rowToElggAccessCollection'];
-
-		$query = "
+        return (bool) $result;
+    }
+
+    /**
+     * Transforms a database row to an instance of ElggAccessCollection
+     *
+     * @param \stdClass $row Database row
+     * @return \ElggAccessCollection
+     */
+    public function rowToElggAccessCollection(\stdClass $row) {
+        return new \ElggAccessCollection($row);
+    }
+
+    /**
+     * Get a specified access collection
+     *
+     * @note This doesn't return the members of an access collection,
+     * just the database row of the actual collection.
+     *
+     * @see get_members_of_access_collection()
+     *
+     * @param int $collection_id The collection ID
+     * @return \ElggAccessCollection|false
+     */
+    public function get($collection_id) {
+
+        $callback = [$this, 'rowToElggAccessCollection'];
+
+        $query = "
 			SELECT * FROM {$this->table}
 			WHERE id = :id
 		";
 
-		return $this->db->getDataRow($query, $callback, [
-			':id' => (int) $collection_id,
-		]);
-	}
-
-	/**
-	 * Check if user is already in the collection
-	 *
-	 * @param int $user_guid     GUID of the user
-	 * @param int $collection_id ID of the collection
-	 * @return bool
-	 */
-	public function hasUser($user_guid, $collection_id) {
-		$options = [
-			'guids' => (int) $user_guid,
-			'count' => true,
-		];
-		return (bool) $this->getMembers($collection_id, $options);
-	}
-
-	/**
-	 * Adds a user to an access collection.
-	 *
-	 * Triggers the 'access:collections:add_user', 'collection' plugin hook.
-	 *
-	 * @param int $user_guid     GUID of the user to add
-	 * @param int $collection_id ID of the collection to add them to
-	 * @return bool
-	 */
-	public function addUser($user_guid, $collection_id) {
-
-		$collection = $this->get($collection_id);
-
-		if (!$collection) {
-			return false;
-		}
-
-		if (!$this->entities->exists($user_guid)) {
-			return false;
-		}
-
-		$hook_params = [
-			'collection_id' => $collection->id,
-			'user_guid' => (int) $user_guid
-		];
-
-		$result = $this->hooks->trigger('access:collections:add_user', 'collection', $hook_params, true);
-		if ($result == false) {
-			return false;
-		}
-
-		// if someone tries to insert the same data twice, we do a no-op on duplicate key
-		$query = "
+        return $this->db->getDataRow($query, $callback, [
+            ':id' => (int) $collection_id,
+        ]);
+    }
+
+    /**
+     * Check if user is already in the collection
+     *
+     * @param int $user_guid     GUID of the user
+     * @param int $collection_id ID of the collection
+     * @return bool
+     */
+    public function hasUser($user_guid, $collection_id) {
+        $options = [
+            'guids' => (int) $user_guid,
+            'count' => true,
+        ];
+        return (bool) $this->getMembers($collection_id, $options);
+    }
+
+    /**
+     * Adds a user to an access collection.
+     *
+     * Triggers the 'access:collections:add_user', 'collection' plugin hook.
+     *
+     * @param int $user_guid     GUID of the user to add
+     * @param int $collection_id ID of the collection to add them to
+     * @return bool
+     */
+    public function addUser($user_guid, $collection_id) {
+
+        $collection = $this->get($collection_id);
+
+        if (!$collection) {
+            return false;
+        }
+
+        if (!$this->entities->exists($user_guid)) {
+            return false;
+        }
+
+        $hook_params = [
+            'collection_id' => $collection->id,
+            'user_guid' => (int) $user_guid
+        ];
+
+        $result = $this->hooks->trigger('access:collections:add_user', 'collection', $hook_params, true);
+        if ($result == false) {
+            return false;
+        }
+
+        // if someone tries to insert the same data twice, we do a no-op on duplicate key
+        $query = "
 			INSERT INTO {$this->membership_table}
 				SET access_collection_id = :access_collection_id,
 				    user_guid = :user_guid
 				ON DUPLICATE KEY UPDATE user_guid = user_guid
 		";
 
-		$result = $this->db->insertData($query, [
-			':access_collection_id' => (int) $collection->id,
-			':user_guid' => (int) $user_guid,
-		]);
+        $result = $this->db->insertData($query, [
+            ':access_collection_id' => (int) $collection->id,
+            ':user_guid' => (int) $user_guid,
+        ]);
 
-		$this->access_cache->clear();
+        $this->access_cache->clear();
 		
-		return $result !== false;
-	}
-
-	/**
-	 * Removes a user from an access collection.
-	 *
-	 * Triggers the 'access:collections:remove_user', 'collection' plugin hook.
-	 *
-	 * @param int $user_guid     GUID of the user
-	 * @param int $collection_id ID of the collection
-	 * @return bool
-	 */
-	public function removeUser($user_guid, $collection_id) {
-
-		$params = [
-			'collection_id' => (int) $collection_id,
-			'user_guid' => (int) $user_guid,
-		];
-
-		if (!$this->hooks->trigger('access:collections:remove_user', 'collection', $params, true)) {
-			return false;
-		}
-
-		$query = "
+        return $result !== false;
+    }
+
+    /**
+     * Removes a user from an access collection.
+     *
+     * Triggers the 'access:collections:remove_user', 'collection' plugin hook.
+     *
+     * @param int $user_guid     GUID of the user
+     * @param int $collection_id ID of the collection
+     * @return bool
+     */
+    public function removeUser($user_guid, $collection_id) {
+
+        $params = [
+            'collection_id' => (int) $collection_id,
+            'user_guid' => (int) $user_guid,
+        ];
+
+        if (!$this->hooks->trigger('access:collections:remove_user', 'collection', $params, true)) {
+            return false;
+        }
+
+        $query = "
 			DELETE FROM {$this->membership_table}
 			WHERE access_collection_id = :access_collection_id
 				AND user_guid = :user_guid
 		";
 
-		$this->access_cache->clear();
+        $this->access_cache->clear();
 
-		return (bool) $this->db->deleteData($query, [
-			':access_collection_id' => (int) $collection_id,
-			':user_guid' => (int) $user_guid,
-		]);
-	}
+        return (bool) $this->db->deleteData($query, [
+            ':access_collection_id' => (int) $collection_id,
+            ':user_guid' => (int) $user_guid,
+        ]);
+    }
 
-	/**
-	 * Returns access collections owned by the user
-	 *
-	 * @param int $owner_guid GUID of the owner
-	 * @return ElggAccessCollection[]|false
-	 */
-	public function getEntityCollections($owner_guid) {
+    /**
+     * Returns access collections owned by the user
+     *
+     * @param int $owner_guid GUID of the owner
+     * @return ElggAccessCollection[]|false
+     */
+    public function getEntityCollections($owner_guid) {
 
-		$callback = [$this, 'rowToElggAccessCollection'];
+        $callback = [$this, 'rowToElggAccessCollection'];
 
-		$query = "
+        $query = "
 			SELECT * FROM {$this->table}
 				WHERE owner_guid = :owner_guid
 				ORDER BY name ASC
 		";
 
-		$params = [
-			':owner_guid' => (int) $owner_guid,
-		];
+        $params = [
+            ':owner_guid' => (int) $owner_guid,
+        ];
 
-		return $this->db->getData($query, $callback, $params);
-	}
+        return $this->db->getData($query, $callback, $params);
+    }
 
-	/**
-	 * Get members of an access collection
-	 *
-	 * @param int   $collection_id The collection's ID
-	 * @param array $options       Ege* options
-	 * @return ElggEntity[]|false
-	 */
-	public function getMembers($collection_id, array $options = []) {
+    /**
+     * Get members of an access collection
+     *
+     * @param int   $collection_id The collection's ID
+     * @param array $options       Ege* options
+     * @return ElggEntity[]|false
+     */
+    public function getMembers($collection_id, array $options = []) {
 
-		$options['joins'][] = "JOIN {$this->membership_table} acm";
+        $options['joins'][] = "JOIN {$this->membership_table} acm";
 
-		$collection_id = (int) $collection_id;
-		$options['wheres'][] = "e.guid = acm.user_guid AND acm.access_collection_id = {$collection_id}";
+        $collection_id = (int) $collection_id;
+        $options['wheres'][] = "e.guid = acm.user_guid AND acm.access_collection_id = {$collection_id}";
 
-		return $this->entities->getEntities($options);
-	}
+        return $this->entities->getEntities($options);
+    }
 
-	/**
-	 * Return an array of collections that the entity is member of
-	 *
-	 * @param int $member_guid GUID of th member
-	 *
-	 * @return ElggAccessCollection[]|false
-	 */
-	public function getCollectionsByMember($member_guid) {
+    /**
+     * Return an array of collections that the entity is member of
+     *
+     * @param int $member_guid GUID of th member
+     *
+     * @return ElggAccessCollection[]|false
+     */
+    public function getCollectionsByMember($member_guid) {
 
-		$callback = [$this, 'rowToElggAccessCollection'];
+        $callback = [$this, 'rowToElggAccessCollection'];
 
-		$query = "
+        $query = "
 			SELECT ac.* FROM {$this->table} ac
 				JOIN {$this->membership_table} acm
 					ON ac.id = acm.access_collection_id
@@ -873,58 +873,58 @@ 
 				ORDER BY name ASC
 		";
 
-		return $this->db->getData($query, $callback, [
-			':member_guid' => (int) $member_guid,
-		]);
-	}
-
-	/**
-	 * Return the name of an ACCESS_* constant or an access collection,
-	 * but only if the logged in user owns the access collection or is an admin.
-	 * Ownership requirement prevents us from exposing names of access collections
-	 * that current user has been added to by other members and may contain
-	 * sensitive classification of the current user (e.g. close friends vs acquaintances).
-	 *
-	 * Returns a string in the language of the user for global access levels, e.g.'Public, 'Friends', 'Logged in', 'Private';
-	 * or a name of the owned access collection, e.g. 'My work colleagues';
-	 * or a name of the group or other access collection, e.g. 'Group: Elgg technical support';
-	 * or 'Limited' if the user access is restricted to read-only, e.g. a friends collection the user was added to
-	 *
-	 * @param int $entity_access_id The entity's access id
-	 *
-	 * @return string
-	 * @since 1.11
-	 */
-	public function getReadableAccessLevel($entity_access_id) {
-		$access = (int) $entity_access_id;
-
-		$translator = $this->translator;
-
-		// Check if entity access id is a defined global constant
-		$access_array = [
-			ACCESS_PRIVATE => $translator->translate("PRIVATE"),
-			ACCESS_FRIENDS => $translator->translate("access:friends:label"),
-			ACCESS_LOGGED_IN => $translator->translate("LOGGED_IN"),
-			ACCESS_PUBLIC => $translator->translate("PUBLIC"),
-		];
-
-		if (array_key_exists($access, $access_array)) {
-			return $access_array[$access];
-		}
-
-		// Entity access id is probably a custom access collection
-		// Check if the user has write access to it and can see it's label
-		// Admins should always be able to see the readable version
-		$collection = $this->get($access);
-
-		$user_guid = $this->session->getLoggedInUserGuid();
+        return $this->db->getData($query, $callback, [
+            ':member_guid' => (int) $member_guid,
+        ]);
+    }
+
+    /**
+     * Return the name of an ACCESS_* constant or an access collection,
+     * but only if the logged in user owns the access collection or is an admin.
+     * Ownership requirement prevents us from exposing names of access collections
+     * that current user has been added to by other members and may contain
+     * sensitive classification of the current user (e.g. close friends vs acquaintances).
+     *
+     * Returns a string in the language of the user for global access levels, e.g.'Public, 'Friends', 'Logged in', 'Private';
+     * or a name of the owned access collection, e.g. 'My work colleagues';
+     * or a name of the group or other access collection, e.g. 'Group: Elgg technical support';
+     * or 'Limited' if the user access is restricted to read-only, e.g. a friends collection the user was added to
+     *
+     * @param int $entity_access_id The entity's access id
+     *
+     * @return string
+     * @since 1.11
+     */
+    public function getReadableAccessLevel($entity_access_id) {
+        $access = (int) $entity_access_id;
+
+        $translator = $this->translator;
+
+        // Check if entity access id is a defined global constant
+        $access_array = [
+            ACCESS_PRIVATE => $translator->translate("PRIVATE"),
+            ACCESS_FRIENDS => $translator->translate("access:friends:label"),
+            ACCESS_LOGGED_IN => $translator->translate("LOGGED_IN"),
+            ACCESS_PUBLIC => $translator->translate("PUBLIC"),
+        ];
+
+        if (array_key_exists($access, $access_array)) {
+            return $access_array[$access];
+        }
+
+        // Entity access id is probably a custom access collection
+        // Check if the user has write access to it and can see it's label
+        // Admins should always be able to see the readable version
+        $collection = $this->get($access);
+
+        $user_guid = $this->session->getLoggedInUserGuid();
 		
-		if (!$collection || !$user_guid) {
-			// return 'Limited' if there is no logged in user or collection can not be loaded
-			return $translator->translate('access:limited:label');
-		}
+        if (!$collection || !$user_guid) {
+            // return 'Limited' if there is no logged in user or collection can not be loaded
+            return $translator->translate('access:limited:label');
+        }
 
-		return $collection->getDisplayName();
-	}
+        return $collection->getDisplayName();
+    }
 
 }

engine/classes/ElggAccessCollection.php

Indentation +219 added lines, -219 removed lines

@@ -12,225 +12,225 @@
  */
 class ElggAccessCollection extends ElggData {
 
-	/**
-	 * Create an access collection object
-	 *
-	 * @param stdClass $row Database row
-	 * @throws InvalidArgumentException
-	 */
-	public function __construct(stdClass $row = null) {
-		$this->initializeAttributes();
-
-		foreach ((array) $row as $key => $value) {
-			$this->attributes[$key] = $value;
-		}
-	}
-
-	/**
-	 * Initialize the attributes array
-	 *
-	 * @see ElggData::initializeAttributes()
-	 * @return void
-	 */
-	protected function initializeAttributes() {
-		parent::initializeAttributes();
-
-		$this->attributes['id'] = null;
-		$this->attributes['owner_guid'] = null;
-		$this->attributes['name'] = null;
-	}
-
-	/**
-	 * Set an attribute
-	 *
-	 * @param string $name  Name
-	 * @param mixed  $value Value
-	 * @return void
-	 * @throws RuntimeException
-	 */
-	public function __set($name, $value) {
-		if (in_array($name, ['id', 'owner_guid'])) {
-			throw new RuntimeException("$name can not be set at runtime");
-		}
-		$this->attributes[$name] = $value;
-	}
-
-	/**
-	 * Get an attribute
-	 *
-	 * @param string $name Name
-	 * @return mixed
-	 */
-	public function __get($name) {
-		if (array_key_exists($name, $this->attributes)) {
-			return $this->attributes[$name];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns owner entity of the collection
-	 * @return \ElggEntity|false
-	 */
-	public function getOwnerEntity() {
-		return _elgg_services()->entityTable->get($this->owner_guid);
-	}
-
-	/**
-	 * Get readable access level name for this collection
-	 * @return string
-	 */
-	public function getDisplayName() {
-
-		$filter = function($name = null) {
-			if (!isset($name)) {
-				$name = _elgg_services()->translator->translate('access:limited:label');
-			}
-			$params = [
-				'access_collection' => $this,
-			];
-			return _elgg_services()->hooks->trigger('access_collection:name', $this->getType(), $params, $name);
-		};
-
-		$user = _elgg_services()->session->getLoggedInUser();
-		$owner = $this->getOwnerEntity();
-		if (!$user || !$owner) {
-			// User is not logged in or does not access to the owner entity:
-			// return default 'Limited' label
-			return $filter();
-		}
+    /**
+     * Create an access collection object
+     *
+     * @param stdClass $row Database row
+     * @throws InvalidArgumentException
+     */
+    public function __construct(stdClass $row = null) {
+        $this->initializeAttributes();
+
+        foreach ((array) $row as $key => $value) {
+            $this->attributes[$key] = $value;
+        }
+    }
+
+    /**
+     * Initialize the attributes array
+     *
+     * @see ElggData::initializeAttributes()
+     * @return void
+     */
+    protected function initializeAttributes() {
+        parent::initializeAttributes();
+
+        $this->attributes['id'] = null;
+        $this->attributes['owner_guid'] = null;
+        $this->attributes['name'] = null;
+    }
+
+    /**
+     * Set an attribute
+     *
+     * @param string $name  Name
+     * @param mixed  $value Value
+     * @return void
+     * @throws RuntimeException
+     */
+    public function __set($name, $value) {
+        if (in_array($name, ['id', 'owner_guid'])) {
+            throw new RuntimeException("$name can not be set at runtime");
+        }
+        $this->attributes[$name] = $value;
+    }
+
+    /**
+     * Get an attribute
+     *
+     * @param string $name Name
+     * @return mixed
+     */
+    public function __get($name) {
+        if (array_key_exists($name, $this->attributes)) {
+            return $this->attributes[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns owner entity of the collection
+     * @return \ElggEntity|false
+     */
+    public function getOwnerEntity() {
+        return _elgg_services()->entityTable->get($this->owner_guid);
+    }
+
+    /**
+     * Get readable access level name for this collection
+     * @return string
+     */
+    public function getDisplayName() {
+
+        $filter = function($name = null) {
+            if (!isset($name)) {
+                $name = _elgg_services()->translator->translate('access:limited:label');
+            }
+            $params = [
+                'access_collection' => $this,
+            ];
+            return _elgg_services()->hooks->trigger('access_collection:name', $this->getType(), $params, $name);
+        };
+
+        $user = _elgg_services()->session->getLoggedInUser();
+        $owner = $this->getOwnerEntity();
+        if (!$user || !$owner) {
+            // User is not logged in or does not access to the owner entity:
+            // return default 'Limited' label
+            return $filter();
+        }
 		
-		if ($user->isAdmin() || $owner->guid == $user->guid) {
-			return $filter($this->name);
-		}
-
-		return $filter();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function save() {
-		if ($this->id > 0) {
-			return _elgg_services()->accessCollections->rename($this->id, $this->name);
-		} else {
-			return _elgg_services()->accessCollections->create($this->name, $this->owner_guid);
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function delete() {
-		return _elgg_services()->accessCollections->delete($this->id);
-	}
-
-	/**
-	 * Check if user can this collection
-	 *
-	 * @param int $user_guid GUID of the user
-	 * @return bool
-	 */
-	public function canEdit($user_guid = null) {
-		return _elgg_services()->accessCollections->canEdit($this->id, $user_guid);
-	}
-
-	/**
-	 * Returns members of the access collection
-	 *
-	 * @param array $options ege options
-	 * @return ElggEntity|int|false
-	 */
-	public function getMembers(array $options = []) {
-		return _elgg_services()->accessCollections->getMembers($this->id, $options);
-	}
-
-	/**
-	 * Checks if user is already in access collection
-	 *
-	 * @param int $member_guid GUID of the user
-	 * @return bool
-	 */
-	public function hasMember($member_guid = 0) {
-		return _elgg_services()->accessCollections->hasUser($member_guid, $this->id);
-	}
-
-	/**
-	 * Adds a new member to access collection
-	 *
-	 * @param int $member_guid GUID of the user
-	 * @return bool
-	 */
-	public function addMember($member_guid = 0) {
-		return _elgg_services()->accessCollections->addUser($member_guid, $this->id);
-	}
-
-	/**
-	 * Removes a user from access collection
-	 *
-	 * @param int $member_guid GUID of the user
-	 * @return bool
-	 */
-	public function removeMember($member_guid = 0) {
-		return _elgg_services()->accessCollections->removeUser($member_guid, $this->id);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getURL() {
-		$type = $this->getType();
-		$params = [
-			'access_collection' => $this,
-		];
-		$url = _elgg_services()->hooks->trigger('access_collection:url', $type, $params, $url);
-		return elgg_normalize_url($url);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function toObject() {
-		$object = new stdClass();
-		$object->type = $this->getType();
-		$object->subtype = $this->getSubtype();
-		$object->id = $this->id;
-		$object->owner_guid = $this->owner_guid;
-		$object->name = $this->name;
-
-		$params = [
-			'access_collection' => $this,
-		];
-		return _elgg_services()->hooks->trigger('to:object', 'access_collection', $params, $object);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getSystemLogID() {
-		return $this->id;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getObjectFromID($id) {
-		return _elgg_services()->accessCollections->get($id);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getType() {
-		return 'access_collection';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getSubtype() {
-		return $this->name;
-	}
+        if ($user->isAdmin() || $owner->guid == $user->guid) {
+            return $filter($this->name);
+        }
+
+        return $filter();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save() {
+        if ($this->id > 0) {
+            return _elgg_services()->accessCollections->rename($this->id, $this->name);
+        } else {
+            return _elgg_services()->accessCollections->create($this->name, $this->owner_guid);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete() {
+        return _elgg_services()->accessCollections->delete($this->id);
+    }
+
+    /**
+     * Check if user can this collection
+     *
+     * @param int $user_guid GUID of the user
+     * @return bool
+     */
+    public function canEdit($user_guid = null) {
+        return _elgg_services()->accessCollections->canEdit($this->id, $user_guid);
+    }
+
+    /**
+     * Returns members of the access collection
+     *
+     * @param array $options ege options
+     * @return ElggEntity|int|false
+     */
+    public function getMembers(array $options = []) {
+        return _elgg_services()->accessCollections->getMembers($this->id, $options);
+    }
+
+    /**
+     * Checks if user is already in access collection
+     *
+     * @param int $member_guid GUID of the user
+     * @return bool
+     */
+    public function hasMember($member_guid = 0) {
+        return _elgg_services()->accessCollections->hasUser($member_guid, $this->id);
+    }
+
+    /**
+     * Adds a new member to access collection
+     *
+     * @param int $member_guid GUID of the user
+     * @return bool
+     */
+    public function addMember($member_guid = 0) {
+        return _elgg_services()->accessCollections->addUser($member_guid, $this->id);
+    }
+
+    /**
+     * Removes a user from access collection
+     *
+     * @param int $member_guid GUID of the user
+     * @return bool
+     */
+    public function removeMember($member_guid = 0) {
+        return _elgg_services()->accessCollections->removeUser($member_guid, $this->id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getURL() {
+        $type = $this->getType();
+        $params = [
+            'access_collection' => $this,
+        ];
+        $url = _elgg_services()->hooks->trigger('access_collection:url', $type, $params, $url);
+        return elgg_normalize_url($url);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toObject() {
+        $object = new stdClass();
+        $object->type = $this->getType();
+        $object->subtype = $this->getSubtype();
+        $object->id = $this->id;
+        $object->owner_guid = $this->owner_guid;
+        $object->name = $this->name;
+
+        $params = [
+            'access_collection' => $this,
+        ];
+        return _elgg_services()->hooks->trigger('to:object', 'access_collection', $params, $object);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSystemLogID() {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getObjectFromID($id) {
+        return _elgg_services()->accessCollections->get($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType() {
+        return 'access_collection';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSubtype() {
+        return $this->name;
+    }
 
 }