diff --git a/phpBB/adm/admin_groups.php b/phpBB/adm/admin_groups.php index 11b1e9455f..62abc4ddf2 100644 --- a/phpBB/adm/admin_groups.php +++ b/phpBB/adm/admin_groups.php @@ -18,8 +18,7 @@ if (!empty($setmodules)) return; } - $module['GROUP']['MANAGE'] = basename(__FILE__) . "$SID&mode=manage"; - $module['GROUP']['GROUP_PREFS'] = basename(__FILE__) . "$SID&mode=prefs"; + $module['USER']['GROUP_MANAGE'] = basename(__FILE__) . "$SID&mode=manage"; return; } @@ -32,19 +31,20 @@ require('pagestart.' . $phpEx); include($phpbb_root_path . 'includes/functions_user.'.$phpEx); // Do we have general permissions? -if (!$auth->acl_get('a_group') ) +if (!$auth->acl_get('a_group')) { trigger_error($user->lang['NO_ADMIN']); } // Check and set some common vars $update = (isset($_POST['update'])) ? true : false; -$mode = (isset($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : false; -$group_id = (isset($_REQUEST['g'])) ? intval($_REQUEST['g']) : false; -$mark_ary = (!empty($_POST['mark'])) ? array_map('intval', $_POST['mark']) : false; -$name_ary = (!empty($_POST['usernames'])) ? array_unique(explode("\n", $_POST['usernames'])) : false; -$start = (isset($_GET['start']) && $action == 'member') ? intval($_GET['start']) : 0; -$start_mod = (isset($_GET['start']) && $action == 'leader') ? intval($_GET['start']) : 0; +$mode = request_var('mode', ''); +$group_id = request_var('g', 0); +$mark_ary = request_var('mark', 0); +$name_ary = request_var('usernames', ''); +$start = ($action == 'member') ? request_var('start', 0) : 0; +$start_mod = ($action == 'leader') ? request_var('start', 0) : 0; +//!empty($_POST['usernames'])) ? array_unique(explode("\n", $_POST['usernames'])) : false; $group_type = $group_name = $group_desc = $group_colour = $group_rank = $group_avatar = false; if (isset($_POST['add'])) @@ -104,9 +104,9 @@ switch ($mode) trigger_error($user->lang['GROUP_DEFS_UPDATED']); break; - case 'delete': - case 'deleteusers': case 'demote': + case 'deleteusers': + case 'delete': if (!$group_id) { trigger_error($user->lang['NO_GROUP']); @@ -278,13 +278,67 @@ function swatch() lang['GROUP_RANK']; ?>: - + + {L_CURRENT_IMAGE}:
{L_AVATAR_EXPLAIN} +
{AVATAR}

 {L_DELETE_AVATAR} + + + + {L_UPLOAD_AVATAR_FILE}: + + + + + + {L_UPLOAD_AVATAR_URL}:
{L_UPLOAD_AVATAR_URL_EXPLAIN} + + + + + + {L_LINK_REMOTE_AVATAR}:
{L_LINK_REMOTE_AVATAR_EXPLAIN} + + + + {L_LINK_REMOTE_SIZE}:
{L_LINK_REMOTE_SIZE_EXPLAIN} + px X px + + + + + {L_AVATAR_GALLERY}: + + + + + + {L_AVATAR_GALLERY} + + + {L_AVATAR_CATEGORY}:   {L_AVATAR_PAGE}:   + + + + + + + + + + + + + + + + + +
{avatar_row.avatar_column.AVATAR_NAME}
+ +   @@ -409,7 +463,7 @@ function swatch() ?> - Select option:   + Select option:   @@ -519,7 +573,7 @@ function swatch() ?> - Select option:   + Select option:   diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index 5cca809f47..b65a7210b7 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -24,9 +24,10 @@ $lang += array( 'ADMIN_INDEX' => 'Admin Index', 'DB_CAT' => 'Database', - 'DB_BACKUP' => 'DB Backup', - 'DB_RESTORE' => 'DB Restore', - 'SEARCH_INDEX' => 'Search indexing', + 'DB_BACKUP' => 'Backup Database', + 'DB_RESTORE' => 'Restore Database', + 'SEARCH_INDEX' => 'Search Indexing', + 'DB_UTILS' => 'Database Utilities', 'FORUM_CAT' => 'Forums', 'PRUNE' => 'Pruning', @@ -64,15 +65,15 @@ $lang += array( 'MANAGE_IMAGESET' => 'Imagesets', 'USER_CAT' => 'Users / Groups', + 'MANAGE_USERS' => 'Manage Users', 'BAN_EMAILS' => 'Ban Emails', 'BAN_IPS' => 'Ban IPs', 'BAN_USERS' => 'Ban Usernames', 'DISALLOW' => 'Disallow names', - 'RANKS' => 'Ranks', + 'RANKS' => 'Manage Ranks', 'PRUNE_USERS' => 'Prune users', - 'BOTS' => 'Bots', + 'BOTS' => 'Manage Bots', 'GROUP_MANAGE' => 'Manage groups', - 'GROUP_PREFS' => 'Group prefs', 'USER_PERMS' => 'User permissions', 'GROUP_PERMS' => 'Group permissions', @@ -1069,6 +1070,11 @@ $lang += array( 'GROUP_DST' => 'Group daylight savings', + 'GROUP_MODS_DEMOTED' => 'Group leaders demoted successfully', + 'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully', + 'GROUP_DELETED' => 'Group deleted and user default groups set successfully', + + 'GROUP_ERR_USERNAME' => 'No group name specified.', 'GROUP_ERR_USER_LONG' => 'Group name too long.', 'GROUP_ERR_DESC_LONG' => 'Group description too long.',