Merge branch 'translations-fallback-js' of git://github.com/sembrestels/Elgg into lorea-preprod

Conflicts:
	mod/developers/views/default/theme_preview/grid.php

6 files changed, 58 insertions, 7 deletions

diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index b513a6098..df2464a65 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) {
@@ -39,10 +41,14 @@ $user = elgg_get_logged_in_user_entity();
 $group_guid = (int)get_input('group_guid');
 $new_group_flag = $group_guid == 0;
 
+if ($new_group_flag && elgg_get_plugin_setting('limited_groups', 'groups') == 'yes' && !elgg_is_admin_logged_in()) {
+	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())) {
 	register_error(elgg_echo("groups:cantedit"));
-
 	forward(REFERER);
 }
 
@@ -106,6 +112,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/languages/en.php b/mod/groups/languages/en.php
index 4868aa334..0ca980108 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -41,6 +41,7 @@ $english = array(
 	'groups:noaccess' => 'No access to group',
 	'groups:permissions:error' => 'You do not have the permissions for this',
 	'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:featured' => 'Featured groups',
@@ -259,6 +260,7 @@ or click below to view the group's join requests:
 	'groups:forumtopic:edited' => 'Forum topic successfully edited.',
 
 	'groups:allowhiddengroups' => 'Do you want to allow private (invisible) groups?',
+	'groups:whocancreate' => 'Who can create new groups?',
 
 	/**
 	 * Action messages
@@ -285,4 +287,4 @@ or click below to view the group's join requests:
 
 );
 
-add_translation("en", $english);
\ No newline at end of file
+add_translation("en", $english);
diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index 51ae89a87..dfbb1154b 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -12,7 +12,9 @@ function groups_handle_all_page() {
 	elgg_pop_breadcrumb();
 	elgg_push_breadcrumb(elgg_echo('groups'));
 
-	elgg_register_title_button();
+	if (elgg_get_plugin_setting('limited_groups', 'groups') != 'yes' || elgg_is_admin_logged_in()) {
+		elgg_register_title_button();
+	}
 
 	$selected_tab = get_input('filter', 'newest');
 
@@ -184,7 +186,11 @@ function groups_handle_edit_page($page, $guid = 0) {
 		elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 		$title = elgg_echo('groups:add');
 		elgg_push_breadcrumb($title);
-		$content = elgg_view('groups/edit');
+		if (elgg_get_plugin_setting('limited_groups', 'groups') != 'yes' || elgg_is_admin_logged_in()) {
+			$content = elgg_view('groups/edit');
+		} else {
+			$content = elgg_echo('groups:cantcreate');
+		}
 	} else {
 		$title = elgg_echo("groups:edit");
 		$group = get_entity($guid);
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 48df338c0..c591410c5 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -196,6 +196,10 @@ function groups_page_handler($page) {
 
 	elgg_load_library('elgg:groups');
 
+	if (!isset($page[0])) {
+		$page[0] = 'all';
+	}
+
 	elgg_push_breadcrumb(elgg_echo('groups'), "groups/all");
 
 	switch ($page[0]) {
@@ -785,6 +789,10 @@ function discussion_page_handler($page) {
 
 	elgg_load_library('elgg:discussion');
 
+	if (!isset($page[0])) {
+		$page[0] = 'all';
+	}
+
 	elgg_push_breadcrumb(elgg_echo('discussion'), 'discussion/all');
 
 	switch ($page[0]) {
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>';
 	}
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>';