Merge tag '1.8.11' of git://github.com/Elgg/Elgg

Elgg 1.8.11 release

6 files changed, 143 insertions, 61 deletions

diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index 2d7e1f023..d0689be2e 100644
--- a/mod/groups/actions/groups/edit.php
+++ b/mod/groups/actions/groups/edit.php
@@ -5,9 +5,6 @@
  * @package ElggGroups
  */
 
-// Load configuration
-global $CONFIG;
-
 elgg_make_sticky_form('groups');
 
 /**
@@ -19,9 +16,10 @@ function profile_array_decoder(&$v) {
 
 // Get group fields
 $input = array();
-foreach ($CONFIG->group as $shortname => $valuetype) {
-	// another work around for Elgg's encoding problems: #561, #1963
+foreach (elgg_get_config('group') as $shortname => $valuetype) {
 	$input[$shortname] = get_input($shortname);
+
+	// @todo treat profile fields as unescaped: don't filter, encode on output
 	if (is_array($input[$shortname])) {
 		array_walk_recursive($input[$shortname], 'profile_array_decoder');
 	} else {
@@ -38,15 +36,17 @@ $input['name'] = htmlspecialchars(get_input('name', '', false), ENT_QUOTES, 'UTF
 $user = elgg_get_logged_in_user_entity();
 
 $group_guid = (int)get_input('group_guid');
-$new_group_flag = $group_guid == 0;
+$is_new_group = $group_guid == 0;
 
-if ($new_group_flag && elgg_get_plugin_setting('limited_groups', 'groups') == 'yes' && !elgg_is_admin_logged_in()) {
+if ($is_new_group
+		&& (elgg_get_plugin_setting('limited_groups', 'groups') == 'yes')
+		&& !$user->isAdmin()) {
 	register_error(elgg_echo("groups:cantcreate"));
 	forward(REFERER);
 }
 
 $group = new ElggGroup($group_guid); // load if present, if not create a new group
-if (($group_guid) && (!$group->canEdit())) {
+if ($group_guid && !$group->canEdit()) {
 	register_error(elgg_echo("groups:cantedit"));
 	forward(REFERER);
 }
@@ -61,37 +61,46 @@ if (sizeof($input) > 0) {
 // Validate create
 if (!$group->name) {
 	register_error(elgg_echo("groups:notitle"));
-
 	forward(REFERER);
 }
 
 
 // Set group tool options
-if (isset($CONFIG->group_tool_options)) {
-	foreach ($CONFIG->group_tool_options as $group_option) {
-		$group_option_toggle_name = $group_option->name . "_enable";
-		if ($group_option->default_on) {
-			$group_option_default_value = 'yes';
-		} else {
-			$group_option_default_value = 'no';
-		}
-		$group->$group_option_toggle_name = get_input($group_option_toggle_name, $group_option_default_value);
+$tool_options = elgg_get_config('group_tool_options');
+if ($tool_options) {
+	foreach ($tool_options as $group_option) {
+		$option_toggle_name = $group_option->name . "_enable";
+		$option_default = $group_option->default_on ? 'yes' : 'no';
+		$group->$option_toggle_name = get_input($option_toggle_name, $option_default);
 	}
 }
 
 // Group membership - should these be treated with same constants as access permissions?
-switch (get_input('membership')) {
-	case ACCESS_PUBLIC:
-		$group->membership = ACCESS_PUBLIC;
-		break;
-	default:
-		$group->membership = ACCESS_PRIVATE;
-}
+$is_public_membership = (get_input('membership') == ACCESS_PUBLIC);
+$group->membership = $is_public_membership ? ACCESS_PUBLIC : ACCESS_PRIVATE;
 
-if ($new_group_flag) {
+if ($is_new_group) {
 	$group->access_id = ACCESS_PUBLIC;
 }
 
+$old_owner_guid = $is_new_group ? 0 : $group->owner_guid;
+$new_owner_guid = (int) get_input('owner_guid');
+
+$owner_has_changed = false;
+$old_icontime = null;
+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;
+		
+		// @todo Remove this when #4683 fixed
+		$owner_has_changed = true;
+		$old_icontime = $group->icontime;
+	}
+}
+
+$must_move_icons = ($owner_has_changed && $old_icontime);
+
 $group->save();
 
 // Invisible group support
@@ -115,14 +124,18 @@ $group->save();
 elgg_clear_sticky_form('groups');
 
 // group creator needs to be member of new group and river entry created
-if ($new_group_flag) {
+if ($is_new_group) {
+
+	// @todo this should not be necessary...
 	elgg_set_page_owner_guid($group->guid);
+
 	$group->join($user);
 	add_to_river('river/group/create', 'create', $user->guid, $group->guid, $group->access_id);
 }
 
-// Now see if we have a file icon
-if ((isset($_FILES['icon'])) && (substr_count($_FILES['icon']['type'],'image/'))) {
+$has_uploaded_icon = (!empty($_FILES['icon']['type']) && substr_count($_FILES['icon']['type'], 'image/'));
+
+if ($has_uploaded_icon) {
 
 	$icon_sizes = elgg_get_config('icon_sizes');
 
@@ -134,38 +147,58 @@ if ((isset($_FILES['icon'])) && (substr_count($_FILES['icon']['type'],'image/'))
 	$filehandler->open("write");
 	$filehandler->write(get_uploaded_file('icon'));
 	$filehandler->close();
+	$filename = $filehandler->getFilenameOnFilestore();
+
+	$sizes = array('tiny', 'small', 'medium', 'large');
+
+	$thumbs = array();
+	foreach ($sizes as $size) {
+		$thumbs[$size] = get_resized_image_from_existing_file(
+			$filename,
+			$icon_sizes[$size]['w'],
+			$icon_sizes[$size]['h'],
+			$icon_sizes[$size]['square']
+		);
+	}
 
-	$thumbtiny = get_resized_image_from_existing_file($filehandler->getFilenameOnFilestore(), $icon_sizes['tiny']['w'], $icon_sizes['tiny']['h'], $icon_sizes['tiny']['square']);
-	$thumbsmall = get_resized_image_from_existing_file($filehandler->getFilenameOnFilestore(), $icon_sizes['small']['w'], $icon_sizes['small']['h'], $icon_sizes['small']['square']);
-	$thumbmedium = get_resized_image_from_existing_file($filehandler->getFilenameOnFilestore(), $icon_sizes['medium']['w'], $icon_sizes['medium']['h'], $icon_sizes['medium']['square']);
-	$thumblarge = get_resized_image_from_existing_file($filehandler->getFilenameOnFilestore(), $icon_sizes['large']['w'], $icon_sizes['large']['h'], $icon_sizes['large']['square']);
-	if ($thumbtiny) {
-
+	if ($thumbs['tiny']) { // just checking if resize successful
 		$thumb = new ElggFile();
 		$thumb->owner_guid = $group->owner_guid;
 		$thumb->setMimeType('image/jpeg');
 
-		$thumb->setFilename($prefix."tiny.jpg");
-		$thumb->open("write");
-		$thumb->write($thumbtiny);
-		$thumb->close();
+		foreach ($sizes as $size) {
+			$thumb->setFilename("{$prefix}{$size}.jpg");
+			$thumb->open("write");
+			$thumb->write($thumbs[$size]);
+			$thumb->close();
+		}
+
+		$group->icontime = time();
+	}
+}
 
-		$thumb->setFilename($prefix."small.jpg");
-		$thumb->open("write");
-		$thumb->write($thumbsmall);
-		$thumb->close();
+// @todo Remove this when #4683 fixed
+if ($must_move_icons) {
+	$filehandler = new ElggFile();
+	$filehandler->setFilename('groups');
+	$filehandler->owner_guid = $old_owner_guid;
+	$old_path = $filehandler->getFilenameOnFilestore();
 
-		$thumb->setFilename($prefix."medium.jpg");
-		$thumb->open("write");
-		$thumb->write($thumbmedium);
-		$thumb->close();
+	$sizes = array('', 'tiny', 'small', 'medium', 'large');
 
-		$thumb->setFilename($prefix."large.jpg");
-		$thumb->open("write");
-		$thumb->write($thumblarge);
-		$thumb->close();
+	if ($has_uploaded_icon) {
+		// delete those under old owner
+		foreach ($sizes as $size) {
+			unlink("$old_path/{$group_guid}{$size}.jpg");
+		}
+	} else {
+		// move existing to new owner
+		$filehandler->owner_guid = $group->owner_guid;
+		$new_path = $filehandler->getFilenameOnFilestore();
 
-		$group->icontime = time();
+		foreach ($sizes as $size) {
+			rename("$old_path/{$group_guid}{$size}.jpg", "$new_path/{$group_guid}{$size}.jpg");
+		}
 	}
 }
 
diff --git a/mod/groups/icon.php b/mod/groups/icon.php
index 1bd240ea6..ebdc1eb6d 100644
--- a/mod/groups/icon.php
+++ b/mod/groups/icon.php
@@ -18,7 +18,7 @@ if (!($group instanceof ElggGroup)) {
 
 // If is the same ETag, content didn't changed.
 $etag = $group->icontime . $group_guid;
-if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == "\"$etag\"") {
 	header("HTTP/1.1 304 Not Modified");
 	exit;
 }
@@ -46,9 +46,9 @@ if (!$success) {
 }
 
 header("Content-type: image/jpeg");
-header('Expires: ' . date('r',time() + 864000));
+header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', strtotime("+10 days")), true);
 header("Pragma: public");
 header("Cache-Control: public");
 header("Content-Length: " . strlen($contents));
-header("ETag: $etag");
+header("ETag: \"$etag\"");
 echo $contents;
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 0ca980108..0d57f1680 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -35,6 +35,7 @@ $english = array(
 	'groups:membership' => "Group membership permissions",
 	'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',
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 532e89c35..41d97e6c3 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -83,6 +83,42 @@ if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
 <?php 	
 }
 
+if (isset($vars['entity'])) {
+	$entity     = $vars['entity'];
+	$owner_guid = $vars['entity']->owner_guid;
+} else {
+	$entity = false;
+}
+
+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) {
+		$members[$member->guid] = "$member->name (@$member->username)";
+	}
+?>
+
+<div>
+	<label>
+			<?php echo elgg_echo('groups:owner'); ?><br />
+			<?php echo elgg_view('input/dropdown', array(
+				'name' => 'owner_guid',
+				'value' =>  $owner_guid,
+				'options_values' => $members,
+				'class' => 'groups-owner-input',
+			));
+			?>
+	</label>
+	<?php
+	if ($owner_guid == elgg_get_logged_in_user_guid()) {
+		echo '<span class="elgg-text-help">' . elgg_echo('groups:owner:warning') . '</span>';
+	}
+	?>
+</div>
+
+<?php 	
+}
+
 $tools = elgg_get_config('group_tool_options');
 if ($tools) {
 	usort($tools, create_function('$a,$b', 'return strcmp($a->label,$b->label);'));
@@ -111,7 +147,7 @@ if ($tools) {
 <div class="elgg-foot">
 <?php
 
-if (isset($entity)) {
+if ($entity) {
 	echo elgg_view('input/hidden', array(
 		'name' => 'group_guid',
 		'value' => $entity->getGUID(),
@@ -120,7 +156,7 @@ if (isset($entity)) {
 
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
 
-if (isset($entity)) {
+if ($entity) {
 	$delete_url = 'action/groups/delete?guid=' . $entity->getGUID();
 	echo elgg_view('output/confirmlink', array(
 		'text' => elgg_echo('groups:delete'),
diff --git a/mod/groups/views/default/groups/js.php b/mod/groups/views/default/groups/js.php
index 1b4d33f32..0319be14a 100644
--- a/mod/groups/views/default/groups/js.php
+++ b/mod/groups/views/default/groups/js.php
@@ -1,3 +1,10 @@
+<?php
+/**
+ * Javascript for Groups forms
+ *
+ * @package ElggGroups
+ */
+?>
 
 // this adds a class to support IE8 and older
 elgg.register_hook_handler('init', 'system', function() {
diff --git a/mod/groups/views/rss/groups/profile/layout.php b/mod/groups/views/rss/groups/profile/layout.php
index 3eeb9eaf2..0dafe78ad 100644
--- a/mod/groups/views/rss/groups/profile/layout.php
+++ b/mod/groups/views/rss/groups/profile/layout.php
@@ -7,7 +7,12 @@
  * @uses $vars['entity'] ElggGroup object
  */
 
-echo elgg_list_entities(array(
-	'type' => 'object',
-	'container_guid' => $vars['entity']->getGUID(),
-));
+$entities = elgg_get_config('registered_entities');
+
+if (!empty($entities['object'])) {
+	echo elgg_list_entities(array(
+		'type' => 'object',
+		'subtypes' => $entities['object'],
+		'container_guid' => $vars['entity']->getGUID(),
+	));
+}