From 85e76773a04995884e798a89cc285f48377bcb62 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Thu, 1 Jan 2015 15:54:16 +0100
Subject: Use grouped select field for role selection

---
 include/permissions.php | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

(limited to 'include/permissions.php')

diff --git a/include/permissions.php b/include/permissions.php
index 9e60223fb..ccbde1a7c 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -800,38 +800,18 @@ function get_role_perms($role) {
 }
 
 /**
- * @brief Creates a HTML select field with all available roles.
+ * @brief Returns a list or roles, grouped by type
  *
  * @param string $current The current role
- * @return string Returns the complete HTML code for this privacy-role-select field.
+ * @return string Returns an array of roles, grouped by type
  */
-function role_selector($current) {
-
-	if(! $current)
-		$current = 'custom';
-
+function get_roles() {
 	$roles = array(
-		'social' => array( t('Social Networking'), 
-			array('social' => t('Mostly Public'), 'social_restricted' => t('Restricted'), 'social_private' => t('Private'))),
-		'forum' => array( t('Community Forum'), 
-			array('forum' => t('Mostly Public'), 'forum_restricted' => t('Restricted'), 'forum_private' => t('Private'))),
-		'feed' => array( t('Feed Republish'), 
-			array('feed' => t('Mostly Public'), 'feed_restricted' => t('Restricted'))),
-		'special' => array( t('Special Purpose'),
-			array('soapbox' => t('Celebrity/Soapbox'), 'repository' => t('Group Repository'))),
-		'other' => array( t('Other'),
-			array('custom' => t('Custom/Expert Mode'))));
-
-	$o = '<select name="permissions_role" id="privacy-role-select">';
-	foreach($roles as $k => $v) {
-		$o .= '<optgroup label="'. htmlspecialchars($v[0]) . '">';
-		foreach($v[1] as $kk => $vv) {
-			$selected = (($kk === $current) ? ' selected="selected"' : '');
-			$o .= '<option value="' . $kk . '"' . $selected . '>' . htmlspecialchars($vv) . '</option>';
-		}
-		$o .= '</optgroup>';
-	}
-	$o .= '</select>';
+		t('Social Networking') => array('social' => t('Mostly Public'), 'social_restricted' => t('Restricted'), 'social_private' => t('Private')),
+		t('Community Forum') => array('forum' => t('Mostly Public'), 'forum_restricted' => t('Restricted'), 'forum_private' => t('Private')),
+		t('Feed Republish') => array('feed' => t('Mostly Public'), 'feed_restricted' => t('Restricted')),
+		t('Special Purpose') => array('soapbox' => t('Celebrity/Soapbox'), 'repository' => t('Group Repository')),
+		t('Other') => array('custom' => t('Custom/Expert Mode')));
 
-	return $o;
+	return $roles;
 }
-- 
cgit v1.2.3