Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop

1.8.18

Conflicts:
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js

12 files changed, 131 insertions, 70 deletions

diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index d0689be2e..f19b90566 100644
--- a/mod/groups/actions/groups/edit.php
+++ b/mod/groups/actions/groups/edit.php
@@ -54,6 +54,20 @@ if ($group_guid && !$group->canEdit()) {
 // Assume we can edit or this is a new group
 if (sizeof($input) > 0) {
 	foreach($input as $shortname => $value) {
+		// update access collection name if group name changes
+		if (!$is_new_group && $shortname == 'name' && $value != $group->name) {
+			$group_name = html_entity_decode($value, ENT_QUOTES, 'UTF-8');
+			$ac_name = sanitize_string(elgg_echo('groups:group') . ": " . $group_name);
+			$acl = get_access_collection($group->group_acl);
+			if ($acl) {
+				// @todo Elgg api does not support updating access collection name
+				$db_prefix = elgg_get_config('dbprefix');
+				$query = "UPDATE {$db_prefix}access_collections SET name = '$ac_name' 
+					WHERE id = $group->group_acl";
+				update_data($query);
+			}
+		}
+
 		$group->$shortname = $value;
 	}
 }
@@ -92,7 +106,21 @@ if (!$is_new_group && $new_owner_guid && $new_owner_guid != $old_owner_guid) {
 	// verify new owner is member and old owner/admin is logged in
 	if (is_group_member($group_guid, $new_owner_guid) && ($old_owner_guid == $user->guid || $user->isAdmin())) {
 		$group->owner_guid = $new_owner_guid;
-		
+		$group->container_guid = $new_owner_guid;
+
+		$metadata = elgg_get_metadata(array(
+			'guid' => $group_guid,
+			'limit' => false,
+		));
+		if ($metadata) {
+			foreach ($metadata as $md) {
+				if ($md->owner_guid == $old_owner_guid) {
+					$md->owner_guid = $new_owner_guid;
+					$md->save();
+				}
+			}
+		}
+
 		// @todo Remove this when #4683 fixed
 		$owner_has_changed = true;
 		$old_icontime = $group->icontime;
diff --git a/mod/groups/actions/groups/membership/invite.php b/mod/groups/actions/groups/membership/invite.php
index db90ecf3a..a96165b0e 100644
--- a/mod/groups/actions/groups/membership/invite.php
+++ b/mod/groups/actions/groups/membership/invite.php
@@ -7,43 +7,48 @@
 
 $logged_in_user = elgg_get_logged_in_user_entity();
 
-$user_guid = get_input('user_guid');
-if (!is_array($user_guid)) {
-	$user_guid = array($user_guid);
+$user_guids = get_input('user_guid');
+if (!is_array($user_guids)) {
+	$user_guids = array($user_guids);
 }
 $group_guid = get_input('group_guid');
+$group = get_entity($group_guid);
 
-if (sizeof($user_guid)) {
-	foreach ($user_guid as $u_id) {
-		$user = get_entity($u_id);
-		$group = get_entity($group_guid);
-
-		if ($user && $group && ($group instanceof ElggGroup) && $group->canEdit()) {
-
-			if (!check_entity_relationship($group->guid, 'invited', $user->guid)) {
-
-				// Create relationship
-				add_entity_relationship($group->guid, 'invited', $user->guid);
-
-				// Send email
-				$url = elgg_normalize_url("groups/invitations/$user->username");
-				$result = notify_user($user->getGUID(), $group->owner_guid,
-						elgg_echo('groups:invite:subject', array($user->name, $group->name)),
-						elgg_echo('groups:invite:body', array(
-							$user->name,
-							$logged_in_user->name,
-							$group->name,
-							$url,
-						)),
-						NULL);
-				if ($result) {
-					system_message(elgg_echo("groups:userinvited"));
-				} else {
-					register_error(elgg_echo("groups:usernotinvited"));
-				}
-			} else {
-				register_error(elgg_echo("groups:useralreadyinvited"));
-			}
+if (count($user_guids) > 0 && elgg_instanceof($group, 'group') && $group->canEdit()) {
+	foreach ($user_guids as $guid) {
+		$user = get_user($guid);
+		if (!$user) {
+			continue;
+		}
+
+		if (check_entity_relationship($group->guid, 'invited', $user->guid)) {
+			register_error(elgg_echo("groups:useralreadyinvited"));
+			continue;
+		}
+
+		if (check_entity_relationship($user->guid, 'member', $group->guid)) {
+			// @todo add error message
+			continue;
+		}
+
+		// Create relationship
+		add_entity_relationship($group->guid, 'invited', $user->guid);
+
+		// Send notification
+		$url = elgg_normalize_url("groups/invitations/$user->username");
+		$result = notify_user($user->getGUID(), $group->owner_guid,
+				elgg_echo('groups:invite:subject', array($user->name, $group->name)),
+				elgg_echo('groups:invite:body', array(
+					$user->name,
+					$logged_in_user->name,
+					$group->name,
+					$url,
+				)),
+				NULL);
+		if ($result) {
+			system_message(elgg_echo("groups:userinvited"));
+		} else {
+			register_error(elgg_echo("groups:usernotinvited"));
 		}
 	}
 }
diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index ab2fe4849..874e21b2d 100644
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -39,9 +39,8 @@ function discussion_handle_list_page($guid) {
 	elgg_set_page_owner_guid($guid);
 
 	$group = get_entity($guid);
-	if (!$group) {
-		register_error(elgg_echo('group:notfound'));
-		forward();
+	if (!elgg_instanceof($group, 'group')) {
+		forward('', '404');
 	}
 	elgg_push_breadcrumb($group->name);
 
diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index d8d0f568d..d5bec1862 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -55,7 +55,7 @@ function groups_handle_all_page() {
 	}
 
 	$filter = elgg_view('groups/group_sort_menu', array('selected' => $selected_tab));
-	
+
 	$sidebar = elgg_view('groups/sidebar/find');
 	$sidebar .= elgg_view('groups/sidebar/featured');
 
@@ -73,13 +73,14 @@ function groups_search_page() {
 	elgg_push_breadcrumb(elgg_echo('search'));
 
 	$tag = get_input("tag");
-	$title = elgg_echo('groups:search:title', array($tag));
+	$display_query = _elgg_get_display_query($tag);
+	$title = elgg_echo('groups:search:title', array($display_query));
 
 	// groups plugin saves tags as "interests" - see groups_fields_setup() in start.php
 	$params = array(
 		'metadata_name' => 'interests',
 		'metadata_value' => $tag,
-		'types' => 'group',
+		'type' => 'group',
 		'full_view' => FALSE,
 	);
 	$content = elgg_list_entities_from_metadata($params);
@@ -115,7 +116,9 @@ function groups_handle_owned_page() {
 	}
 	elgg_push_breadcrumb($title);
 
-	elgg_register_title_button();
+	if (elgg_get_plugin_setting('limited_groups', 'groups') != 'yes' || elgg_is_admin_logged_in()) {
+		elgg_register_title_button();
+	}
 
 	$content = elgg_list_entities(array(
 		'type' => 'group',
@@ -150,7 +153,9 @@ function groups_handle_mine_page() {
 	}
 	elgg_push_breadcrumb($title);
 
-	elgg_register_title_button();
+	if (elgg_get_plugin_setting('limited_groups', 'groups') != 'yes' || elgg_is_admin_logged_in()) {
+		elgg_register_title_button();
+	}
 
 	$content = elgg_list_entities_from_relationship(array(
 		'type' => 'group',
@@ -181,7 +186,7 @@ function groups_handle_mine_page() {
  */
 function groups_handle_edit_page($page, $guid = 0) {
 	gatekeeper();
-	
+
 	if ($page == 'add') {
 		elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 		$title = elgg_echo('groups:add');
@@ -204,7 +209,7 @@ function groups_handle_edit_page($page, $guid = 0) {
 			$content = elgg_echo('groups:noaccess');
 		}
 	}
-	
+
 	$params = array(
 		'content' => $content,
 		'title' => $title,
@@ -255,8 +260,8 @@ function groups_handle_profile_page($guid) {
 	elgg_push_context('group_profile');
 
 	$group = get_entity($guid);
-	if (!$group) {
-		forward('groups/all');
+	if (!elgg_instanceof($group, 'group')) {
+		forward('', '404');
 	}
 
 	elgg_push_breadcrumb($group->name);
@@ -266,7 +271,7 @@ function groups_handle_profile_page($guid) {
 	$content = elgg_view('groups/profile/layout', array('entity' => $group));
 	$sidebar = '';
 
-	if (group_gatekeeper(false)) {	
+	if (group_gatekeeper(false)) {
 		if (elgg_is_active_plugin('search')) {
 			$sidebar .= elgg_view('groups/sidebar/search', array('entity' => $group));
 		}
@@ -275,18 +280,18 @@ function groups_handle_profile_page($guid) {
 		$subscribed = false;
 		if (elgg_is_active_plugin('notifications')) {
 			global $NOTIFICATION_HANDLERS;
-			
+
 			foreach ($NOTIFICATION_HANDLERS as $method => $foo) {
 				$relationship = check_entity_relationship(elgg_get_logged_in_user_guid(),
 						'notify' . $method, $guid);
-				
+
 				if ($relationship) {
 					$subscribed = true;
 					break;
 				}
 			}
 		}
-		
+
 		$sidebar .= elgg_view('groups/sidebar/my_status', array(
 			'entity' => $group,
 			'subscribed' => $subscribed
@@ -334,7 +339,7 @@ function groups_handle_activity_page($guid) {
 	if (!$content) {
 		$content = '<p>' . elgg_echo('groups:activity:none') . '</p>';
 	}
-	
+
 	$params = array(
 		'content' => $content,
 		'title' => $title,
@@ -366,12 +371,15 @@ function groups_handle_members_page($guid) {
 	elgg_push_breadcrumb($group->name, $group->getURL());
 	elgg_push_breadcrumb(elgg_echo('groups:members'));
 
+	$db_prefix = elgg_get_config('dbprefix');
 	$content = elgg_list_entities_from_relationship(array(
 		'relationship' => 'member',
 		'relationship_guid' => $group->guid,
 		'inverse_relationship' => true,
-		'types' => 'user',
+		'type' => 'user',
 		'limit' => 20,
+		'joins' => array("JOIN {$db_prefix}users_entity u ON e.guid=u.guid"),
+		'order_by' => 'u.name ASC',
 	));
 
 	$params = array(
@@ -424,7 +432,7 @@ function groups_handle_invite_page($guid) {
 
 /**
  * Manage requests to join a group
- * 
+ *
  * @param int $guid Group entity GUID
  */
 function groups_handle_requests_page($guid) {
@@ -440,7 +448,7 @@ function groups_handle_requests_page($guid) {
 	if ($group && $group->canEdit()) {
 		elgg_push_breadcrumb($group->name, $group->getURL());
 		elgg_push_breadcrumb($title);
-		
+
 		$requests = elgg_get_entities_from_relationship(array(
 			'type' => 'user',
 			'relationship' => 'membership_request',
@@ -561,6 +569,8 @@ function groups_prepare_form_vars($group = null) {
 		if ($group->access_id != ACCESS_PUBLIC && $group->access_id != ACCESS_LOGGED_IN) {
 			// group only access - this is done to handle access not created when group is created
 			$values['vis'] = ACCESS_PRIVATE;
+		} else {
+			$values['vis'] = $group->access_id;
 		}
 
 		$values['entity'] = $group;
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 4e49d9e55..6002a535c 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -142,13 +142,17 @@ function groups_setup_sidebar_menus() {
 	$page_owner = elgg_get_page_owner_entity();
 
 	if (elgg_in_context('group_profile')) {
+		if (!elgg_instanceof($page_owner, 'group')) {
+			forward('', '404');
+		}
+
 		if (elgg_is_logged_in() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) {
 			$url = elgg_get_site_url() . "groups/requests/{$page_owner->getGUID()}";
 
 			$count = elgg_get_entities_from_relationship(array(
 				'type' => 'user',
 				'relationship' => 'membership_request',
-				'relationship_guid' => $guid,
+				'relationship_guid' => $page_owner->getGUID(),
 				'inverse_relationship' => true,
 				'count' => true,
 			));
@@ -572,7 +576,7 @@ function groups_write_acl_plugin_hook($hook, $entity_type, $returnvalue, $params
 					'relationship' => 'member',
 					'relationship_guid' => $user_guid,
 					'inverse_relationship' => FALSE,
-					'limit' => 999
+					'limit' => false
 				));
 
 		if ($groups) {
@@ -1013,7 +1017,7 @@ function discussion_reply_notifications($event, $type, $annotation) {
 				'relationship' => 'notify' . $method,
 				'relationship_guid' => $topic->getContainerGUID(),
 				'inverse_relationship' => true,
-				'types' => 'user',
+				'type' => 'user',
 				'limit' => 0,
 			));
 
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 41d97e6c3..e2dc5455a 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -91,9 +91,18 @@ if (isset($vars['entity'])) {
 }
 
 if ($entity && ($owner_guid == elgg_get_logged_in_user_guid() || elgg_is_admin_logged_in())) {
-	$owner_guid = $vars['entity']->owner_guid;
 	$members = array();
-	foreach ($vars['entity']->getMembers(0) as $member) {
+
+	$options = array(
+		'relationship' => 'member',
+		'relationship_guid' => $vars['entity']->getGUID(),
+		'inverse_relationship' => true,
+		'type' => 'user',
+		'limit' => 0,
+	);
+
+	$batch = new ElggBatch('elgg_get_entities_from_relationship', $options);
+	foreach ($batch as $member) {
 		$members[$member->guid] = "$member->name (@$member->username)";
 	}
 ?>
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 6f710ddab..32dd2b74d 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -9,10 +9,6 @@
 .groups-profile > .elgg-image {
 	margin-right: 10px;
 }
-.groups-profile img {
-	width: 100%;
-	height: auto;
-}
 .groups-stats {
 	background: #eeeeee;
 	padding: 5px;
diff --git a/mod/groups/views/default/groups/profile/summary.php b/mod/groups/views/default/groups/profile/summary.php
index f1221f19a..3f7496871 100644
--- a/mod/groups/views/default/groups/profile/summary.php
+++ b/mod/groups/views/default/groups/profile/summary.php
@@ -25,7 +25,14 @@ if (!$owner) {
 <div class="groups-profile clearfix elgg-image-block">
 	<div class="elgg-image">
 		<div class="groups-profile-icon">
-			<?php echo elgg_view_entity_icon($group, 'large', array('href' => '')); ?>
+			<?php
+				// we don't force icons to be square so don't set width/height
+				echo elgg_view_entity_icon($group, 'large', array(
+					'href' => '',
+					'width' => '',
+					'height' => '',
+				)); 
+			?>
 		</div>
 		<div class="groups-stats">
 			<p>
diff --git a/mod/groups/views/default/groups/sidebar/featured.php b/mod/groups/views/default/groups/sidebar/featured.php
index 8bd51ab5c..f3f8f8d2d 100644
--- a/mod/groups/views/default/groups/sidebar/featured.php
+++ b/mod/groups/views/default/groups/sidebar/featured.php
@@ -8,7 +8,7 @@
 $featured_groups = elgg_get_entities_from_metadata(array(
 	'metadata_name' => 'featured_group',
 	'metadata_value' => 'yes',
-	'types' => 'group',
+	'type' => 'group',
 	'limit' => 10,
 ));
 
diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php
index 11273d0e6..1199a0c34 100644
--- a/mod/groups/views/default/groups/sidebar/members.php
+++ b/mod/groups/views/default/groups/sidebar/members.php
@@ -20,7 +20,7 @@ $body = elgg_list_entities_from_relationship(array(
 	'relationship' => 'member',
 	'relationship_guid' => $vars['entity']->guid,
 	'inverse_relationship' => true,
-	'types' => 'user',
+	'type' => 'user',
 	'limit' => $limit,
 	'list_type' => 'gallery',
 	'gallery_class' => 'elgg-gallery-users',
diff --git a/mod/groups/views/default/groups/sidebar/my_status.php b/mod/groups/views/default/groups/sidebar/my_status.php
index 4c36c0213..1e4e84b80 100644
--- a/mod/groups/views/default/groups/sidebar/my_status.php
+++ b/mod/groups/views/default/groups/sidebar/my_status.php
@@ -14,7 +14,7 @@ $subscribed = elgg_extract('subscribed', $vars);
 if (!elgg_is_logged_in()) {
 	return true;
 }
-$t = new ElggMenuItem();
+
 // membership status
 $is_member = $group->isMember($user);
 $is_owner = $group->getOwnerEntity() == $user;
@@ -41,7 +41,7 @@ if ($is_owner) {
 }
 
 // notification info
-if (elgg_is_active_plugin('notifications')) {
+if (elgg_is_active_plugin('notifications') && $is_member) {
 	if ($subscribed) {
 		elgg_register_menu_item('groups:my_status', array(
 			'name' => 'subscription_status',
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 34e0ee3cc..e6988d16e 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -73,7 +73,10 @@ if ($full) {
 
 	$info = elgg_view_image_block($poster_icon, $list_body);
 
-	$body = elgg_view('output/longtext', array('value' => $topic->description));
+	$body = elgg_view('output/longtext', array(
+		'value' => $topic->description,
+		'class' => 'clearfix',
+	));
 
 	echo <<<HTML
 $info