3 files changed, 192 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index d47c12eafd..5e6ebcaa7d 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -35,6 +35,12 @@ class acp_groups
 		$form_key = 'acp_groups';
 		add_form_key($form_key);
 
+		if ($mode == 'position')
+		{
+			$this->manage_position();
+			return;
+		}
+
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 
 		// Check and set some common vars
@@ -306,6 +312,7 @@ class acp_groups
 						'rank'				=> request_var('group_rank', 0),
 						'receive_pm'		=> isset($_REQUEST['group_receive_pm']) ? 1 : 0,
 						'legend'			=> isset($_REQUEST['group_legend']) ? 1 : 0,
+						'teampage'			=> isset($_REQUEST['group_teampage']) ? 1 : 0,
 						'message_limit'		=> request_var('group_message_limit', 0),
 						'max_recipients'	=> request_var('group_max_recipients', 0),
 						'founder_manage'	=> 0,
@@ -419,6 +426,7 @@ class acp_groups
 							'avatar_height'	=> 'int',
 							'receive_pm'	=> 'int',
 							'legend'		=> 'int',
+							'teampage'		=> 'int',
 							'message_limit'	=> 'int',
 							'max_recipients'=> 'int',
 							'founder_manage'=> 'int',
@@ -584,6 +592,7 @@ class acp_groups
 					'GROUP_RECEIVE_PM'		=> (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
 					'GROUP_FOUNDER_MANAGE'	=> (isset($group_row['group_founder_manage']) && $group_row['group_founder_manage']) ? ' checked="checked"' : '',
 					'GROUP_LEGEND'			=> (isset($group_row['group_legend']) && $group_row['group_legend']) ? ' checked="checked"' : '',
+					'GROUP_TEAMPAGE'		=> (isset($group_row['group_teampage']) && $group_row['group_teampage']) ? ' checked="checked"' : '',
 					'GROUP_MESSAGE_LIMIT'	=> (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
 					'GROUP_MAX_RECIPIENTS'	=> (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0,
 					'GROUP_COLOUR'			=> (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',
@@ -793,4 +802,119 @@ class acp_groups
 			}
 		}
 	}
+
+	public function manage_position()
+	{
+		global $config, $db, $template, $user;
+
+		$this->tpl_name = 'acp_groups_position';
+		$this->page_title = 'ACP_GROUPS_POSITION';
+
+		$field = request_var('field', '');
+		$action = request_var('action', '');
+		$group_id = request_var('g', 0);
+
+		if ($field && !in_array($field, array('legend', 'teampage')))
+		{
+			// Invalid mode
+			trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		switch ($action)
+		{
+			case 'set_config_legend':
+				set_config('legend_sort_groupname', request_var('legend_sort_groupname', 0));
+			break;
+
+
+			case 'set_config_teampage':
+				set_config('teampage_forums', request_var('teampage_forums', 0));
+				set_config('teampage_multiple', request_var('teampage_multiple', 0));
+			break;
+
+			case 'add':
+				phpbb_group_positions::add_group($field, $group_id);
+			break;
+
+			case 'delete':
+				phpbb_group_positions::delete_group($field, $group_id);
+			break;
+
+			case 'move_up':
+				phpbb_group_positions::move_up($field, $group_id);
+			break;
+
+			case 'move_down':
+				phpbb_group_positions::move_down($field, $group_id);
+			break;
+		}
+
+		$sql = 'SELECT group_id, group_name, group_colour, group_type, group_legend
+			FROM ' . GROUPS_TABLE . '
+			ORDER BY group_legend, group_name ASC';
+		$result = $db->sql_query($sql);
+
+		$s_group_select_legend = '';
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
+			if ($row['group_legend'])
+			{
+				$template->assign_block_vars('legend', array(
+					'GROUP_NAME' => $group_name,
+					'GROUP_COLOUR' => ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
+					'GROUP_TYPE' => $user->lang[phpbb_group_positions::group_type_language($row['group_type'])],
+
+					'U_MOVE_DOWN' => "{$this->u_action}&amp;field=legend&amp;action=move_down&amp;g=" . $row['group_id'],
+					'U_MOVE_UP' => "{$this->u_action}&amp;field=legend&amp;action=move_up&amp;g=" . $row['group_id'],
+					'U_DELETE' => "{$this->u_action}&amp;field=legend&amp;action=delete&amp;g=" . $row['group_id'],
+				));
+			}
+			else
+			{
+				$s_group_select_legend .= '<option value="' . (int) $row['group_id'] . '">' . $group_name . '</option>';
+			}
+		}
+		$db->sql_freeresult($result);
+
+		$sql = 'SELECT group_id, group_name, group_colour, group_type, group_teampage
+			FROM ' . GROUPS_TABLE . '
+			ORDER BY group_teampage, group_name ASC';
+		$result = $db->sql_query($sql);
+
+		$s_group_select_teampage = '';
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
+			if ($row['group_teampage'])
+			{
+				$template->assign_block_vars('teampage', array(
+					'GROUP_NAME' => $group_name,
+					'GROUP_COLOUR' => ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
+					'GROUP_TYPE' => $user->lang[phpbb_group_positions::group_type_language($row['group_type'])],
+
+					'U_MOVE_DOWN' => "{$this->u_action}&amp;field=teampage&amp;action=move_down&amp;g=" . $row['group_id'],
+					'U_MOVE_UP' => "{$this->u_action}&amp;field=teampage&amp;action=move_up&amp;g=" . $row['group_id'],
+					'U_DELETE' => "{$this->u_action}&amp;field=teampage&amp;action=delete&amp;g=" . $row['group_id'],
+				));
+			}
+			else
+			{
+				$s_group_select_teampage .= '<option value="' . (int) $row['group_id'] . '">' . $group_name . '</option>';
+			}
+		}
+		$db->sql_freeresult($result);
+
+		$template->assign_vars(array(
+			'U_ACTION' => $this->u_action,
+			'U_ACTION_LEGEND' => $this->u_action . '&amp;field=legend',
+			'U_ACTION_TEAMPAGE' => $this->u_action . '&amp;field=teampage',
+
+			'S_GROUP_SELECT_LEGEND' => $s_group_select_legend,
+			'S_GROUP_SELECT_TEAMPAGE' => $s_group_select_teampage,
+			'DISPLAY_FORUMS' => ($config['teampage_forums']) ? true : false,
+			'DISPLAY_MULTIPLE' => ($config['teampage_multiple']) ? true : false,
+			'LEGEND_SORT_GROUPNAME' => ($config['legend_sort_groupname']) ? true : false,
+		));
+	}
 }
diff --git a/phpBB/includes/acp/info/acp_groups.php b/phpBB/includes/acp/info/acp_groups.php
index bbf92d670e..36e8793007 100644
--- a/phpBB/includes/acp/info/acp_groups.php
+++ b/phpBB/includes/acp/info/acp_groups.php
@@ -21,6 +21,7 @@ class acp_groups_info
 			'version'	=> '1.0.0',
 			'modes'		=> array(
 				'manage'		=> array('title' => 'ACP_GROUPS_MANAGE', 'auth' => 'acl_a_group', 'cat' => array('ACP_GROUPS')),
+				'position'		=> array('title' => 'ACP_GROUPS_POSITION', 'auth' => 'acl_a_group', 'cat' => array('ACP_GROUPS')),
 			),
 		);
 	}
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 317578cd54..fba96f93e9 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2495,6 +2495,69 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 
 	if (!sizeof($error))
 	{
+
+		$current_legend = phpbb_group_positions::GROUP_DISABLED;
+		$current_teampage = phpbb_group_positions::GROUP_DISABLED;
+		if ($group_id)
+		{
+			$current_legend = phpbb_group_positions::get_group_value('legend', $group_id);
+			$current_teampage = phpbb_group_positions::get_group_value('teampage', $group_id);
+		}
+
+		if (isset($group_attributes['group_legend']))
+		{
+			if (($group_id && ($current_legend == phpbb_group_positions::GROUP_DISABLED)) || !$group_id)
+			{
+				// Old group currently not in the legend or new group, add at the end.
+				$group_attributes['group_legend'] = 1 + phpbb_group_positions::get_group_count('legend');
+			}
+			else
+			{
+				// Group stayes in the legend
+				$group_attributes['group_legend'] = $current_legend;
+			}
+		}
+		else if ($group_id && ($current_legend > phpbb_group_positions::GROUP_DISABLED))
+		{
+			// Group is removed from the legend
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_teampage = group_teampage - 1
+				WHERE group_teampage > ' . $current_legend;
+			$db->sql_query($sql);
+			$group_attributes['group_legend'] = phpbb_group_positions::GROUP_DISABLED;
+		}
+		else
+		{
+			$group_attributes['group_legend'] = phpbb_group_positions::GROUP_DISABLED;
+		}
+
+		if (isset($group_attributes['group_teampage']))
+		{
+			if (($group_id && ($current_teampage == phpbb_group_positions::GROUP_DISABLED)) || !$group_id)
+			{
+				// Old group currently not on the teampage or new group, add at the end.
+				$group_attributes['group_teampage'] = 1 + phpbb_group_positions::get_group_count('teampage');
+			}
+			else
+			{
+				// Group stayes on the teampage
+				$group_attributes['group_teampage'] = $current_teampage;
+			}
+		}
+		else if ($group_id && ($current_teampage > phpbb_group_positions::GROUP_DISABLED))
+		{
+			// Group is removed from the teampage
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_teampage = group_teampage - 1
+				WHERE group_teampage > ' . $current_teampage;
+			$db->sql_query($sql);
+			$group_attributes['group_teampage'] = phpbb_group_positions::GROUP_DISABLED;
+		}
+		else
+		{
+			$group_attributes['group_teampage'] = phpbb_group_positions::GROUP_DISABLED;
+		}
+
 		$user_ary = array();
 		$sql_ary = array(
 			'group_name'			=> (string) $name,
@@ -2719,6 +2782,10 @@ function group_delete($group_id, $group_name = false)
 	}
 	while ($start);
 
+	// Delete group from legend and teampage
+	phpbb_group_positions::delete_group('legend', $group_id);
+	phpbb_group_positions::delete_group('teampage', $group_id);
+
 	// Delete group
 	$sql = 'DELETE FROM ' . GROUPS_TABLE . "
 		WHERE group_id = $group_id";