diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-17 22:36:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-17 22:36:43 +0000 |
| commit | 8d456a0fd7c5b5acb298ae5fe8618a1640bd259f (patch) | |
| tree | 9602f2f527748eb696927d3570d4c1329ef5e3c9 /phpBB/includes/acp/auth.php | |
| parent | a0f8e1323a0fb50e6a4b7449f93b493377eddd2c (diff) | |
| download | forums-8d456a0fd7c5b5acb298ae5fe8618a1640bd259f.tar forums-8d456a0fd7c5b5acb298ae5fe8618a1640bd259f.tar.gz forums-8d456a0fd7c5b5acb298ae5fe8618a1640bd259f.tar.bz2 forums-8d456a0fd7c5b5acb298ae5fe8618a1640bd259f.tar.xz forums-8d456a0fd7c5b5acb298ae5fe8618a1640bd259f.zip | |
say hello to role descriptions, role ordering and tooltips on role selects
git-svn-id: file:///svn/phpbb/trunk@5791 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/auth.php')
| -rw-r--r-- | phpBB/includes/acp/auth.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index e8c2c12079..183e4a1db7 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -285,7 +285,8 @@ class auth_admin extends auth // Get available roles $sql = 'SELECT * FROM ' . ACL_ROLES_TABLE . " - WHERE role_type = '" . $db->sql_escape($permission_type) . "'"; + WHERE role_type = '" . $db->sql_escape($permission_type) . "' + ORDER BY role_order ASC"; $result = $db->sql_query($sql); $roles = array(); @@ -413,7 +414,8 @@ class auth_admin extends auth { if ($role_id == $current_role_id || !sizeof($role_row['groups']) || ($user_mode == 'group' && in_array($ug_id, $role_row['groups']))) { - $s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . '>' . $role_row['role_name'] . '</option>'; + $title = ($role_row['role_description']) ? ' title="' . nl2br($role_row['role_description']) . '"' : ''; + $s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_row['role_name'] . '</option>'; } } |
