From ec4e9a92e61a9ed8357f13bf468171ede8164f19 Mon Sep 17 00:00:00 2001 From: SecretR Date: Mon, 11 Feb 2013 10:21:01 +0200 Subject: [PATCH] Fixes #104: Admin-ui Filter contains misleading and confusing terms --- e107_handlers/admin_ui.php | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 671d6ed48..9ca8cc81b 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -5214,14 +5214,27 @@ class e_admin_form_ui extends e_form case 'userclasses': $classes = e107::getUserClass()->uc_required_class_list(vartrue($parms['classlist'], 'public,nobody,guest,admin,main,classes')); $_option = array(); - foreach ($classes as $k => $v) + + if($type == 'batch') { - $option['ucadd__'.$key.'__'.$k] = 'Add '.$v; - $_option['ucremove__'.$key.'__'.$k] = 'Remove '.$v; + // FIXME Lan + foreach ($classes as $k => $v) + { + $option['ucadd__'.$key.'__'.$k] = LAN_ADD.' '.$v; + $_option['ucremove__'.$key.'__'.$k] = 'Remove '.$v; + } + $option['ucaddall__'.$key] = '(add all)'; + $_option['ucdelall__'.$key] = '(clear all)'; + $option = array_merge($option, $_option); } - $option['ucaddall__'.$key] = '(add all)'; - $_option['ucdelall__'.$key] = '(clear all)'; - $option = array_merge($option, $_option); + else + { + foreach ($classes as $k => $v) + { + $option[$key.'__'.$k] = $v; + } + } + unset($_option); break;