From 8c0897d92395d897a8e40a2d1b97e5f838520296 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Sun, 8 Jul 2012 12:21:19 +0200
Subject: Fixes #1792. Added pluggin setting in groups to set who can create
 groups, logged in users or only admins.

---
 mod/groups/views/default/plugins/groups/settings.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'mod/groups/views')

diff --git a/mod/groups/views/default/plugins/groups/settings.php b/mod/groups/views/default/plugins/groups/settings.php
index 7197dcb37..41ea146db 100644
--- a/mod/groups/views/default/plugins/groups/settings.php
+++ b/mod/groups/views/default/plugins/groups/settings.php
@@ -8,6 +8,11 @@ if (!isset($vars['entity']->hidden_groups)) {
 	$vars['entity']->hidden_groups = 'no';
 }
 
+// set default value
+if (!isset($vars['entity']->limited_groups)) {
+	$vars['entity']->limited_groups = 'no';
+}
+
 echo '<div>';
 echo elgg_echo('groups:allowhiddengroups');
 echo ' ';
@@ -20,3 +25,16 @@ echo elgg_view('input/dropdown', array(
 	'value' => $vars['entity']->hidden_groups,
 ));
 echo '</div>';
+
+echo '<div>';
+echo elgg_echo('groups:whocancreate');
+echo ' ';
+echo elgg_view('input/dropdown', array(
+	'name' => 'params[limited_groups]',
+	'options_values' => array(
+		'no' => elgg_echo('LOGGED_IN'),
+		'yes' => elgg_echo('admin')
+	),
+	'value' => $vars['entity']->limited_groups,
+));
+echo '</div>';
-- 
cgit v1.2.3


From 84666d49fcc1191075f45b75a164ed0383c2c375 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Wed, 11 Jul 2012 01:24:57 +0200
Subject: Fixes #4381. Group edit form made sticky.

---
 mod/groups/actions/groups/edit.php             |  5 +++++
 mod/groups/views/default/forms/groups/edit.php | 14 +++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'mod/groups/views')

diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index b513a6098..a3ad91622 100644
--- a/mod/groups/actions/groups/edit.php
+++ b/mod/groups/actions/groups/edit.php
@@ -15,6 +15,8 @@ function profile_array_decoder(&$v) {
 	$v = html_entity_decode($v, ENT_COMPAT, 'UTF-8');
 }
 
+elgg_make_sticky_form('groups');
+
 // Get group fields
 $input = array();
 foreach ($CONFIG->group as $shortname => $valuetype) {
@@ -106,6 +108,9 @@ if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
 
 $group->save();
 
+// group saved so clear sticky form
+elgg_clear_sticky_form('groups');
+
 // group creator needs to be member of new group and river entry created
 if ($new_group_flag) {
 	elgg_set_page_owner_guid($group->guid);
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 8055b6430..7540d1bf9 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -5,8 +5,16 @@
  * @package ElggGroups
  */
 
+if (elgg_is_sticky_form('groups')) {
+	$sticky_values = elgg_get_sticky_values('groups');
+	elgg_clear_sticky_form('groups');
+}
+
 // new groups default to open membership
-if (isset($vars['entity'])) {
+if (isset($sticky_values)) {
+	$membership = $sticky_values['membership'];
+	$access = $sticky_values['access_id'];
+} elseif (isset($vars['entity'])) {
 	$membership = $vars['entity']->membership;
 	$access = $vars['entity']->access_id;
 	if ($access != ACCESS_PUBLIC && $access != ACCESS_LOGGED_IN) {
@@ -27,7 +35,7 @@ if (isset($vars['entity'])) {
 	<label><?php echo elgg_echo("groups:name"); ?></label><br />
 	<?php echo elgg_view("input/text", array(
 		'name' => 'name',
-		'value' => $vars['entity']->name,
+		'value' => isset($sticky_values['name']) ? $sticky_values['name'] : $vars['entity']->name,
 	));
 	?>
 </div>
@@ -45,7 +53,7 @@ if ($group_profile_fields > 0) {
 		echo "</label>$line_break";
 		echo elgg_view("input/{$valtype}", array(
 			'name' => $shortname,
-			'value' => $vars['entity']->$shortname,
+			'value' => isset($sticky_values[$shortname]) ? $sticky_values[$shortname] : $vars['entity']->$shortname,
 		));
 		echo '</div>';
 	}
-- 
cgit v1.2.3