aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-01-26 16:09:51 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-01-26 16:09:51 +0000
commitddddda47fb414095371b80f0873dee3986d0d308 (patch)
treeb71ec4da186fc10801e47bbc38586216031b3b0c /phpBB/includes/acp/acp_users.php
parent920fc0156db872c6200e85da79bf67eb2f416d02 (diff)
downloadforums-ddddda47fb414095371b80f0873dee3986d0d308.tar
forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.gz
forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.bz2
forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.xz
forums-ddddda47fb414095371b80f0873dee3986d0d308.zip
- fix some oddities (doubled spaces for example)
- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier. - Changed some permission namings based on suggestions by the community - Tried to comply to the permission field ordering within the language files while displaying permission sets. Hopefully it's worth the additional processing time. - Disable submit buttons after clicking for installation and conversions. git-svn-id: file:///svn/phpbb/trunk@6930 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php15
1 files changed, 4 insertions, 11 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 47db9dc0f4..9a8184453c 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -127,7 +127,7 @@ class acp_users
}
$selected = ($mode == $value) ? ' selected="selected"' : '';
- $s_form_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang['ACP_USER_' . strtoupper($value)] . '</option>';
+ $s_form_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang['ACP_USER_' . strtoupper($value)] . '</option>';
}
$template->assign_vars(array(
@@ -651,7 +651,7 @@ class acp_users
'email' => array(
array('string', false, 6, 60),
array('email', $user_row['user_email'])
- ),
+ ),
'email_confirm' => array('string', true, 6, 60)
);
}
@@ -806,7 +806,7 @@ class acp_users
$s_action_options = '<option class="sep" value="">' . $user->lang['SELECT_OPTION'] . '</option>';
foreach ($quick_tool_ary as $value => $lang)
{
- $s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>';
+ $s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>';
}
if ($config['load_onlinetrack'])
@@ -1917,14 +1917,7 @@ class acp_users
}
$s_forum_options = '<option value="0"' . ((!$forum_id) ? ' selected="selected"' : '') . '>' . $user->lang['VIEW_GLOBAL_PERMS'] . '</option>';
-
- $forum_list = make_forum_select($forum_id, false, true, false, false, false, true);
-
- // Build forum options
- foreach ($forum_list as $f_id => $f_row)
- {
- $s_forum_options .= '<option value="' . $f_id . '"' . (($f_row['selected']) ? ' selected="selected"' : '') . '>' . $f_row['padding'] . $f_row['forum_name'] . '</option>';
- }
+ $s_forum_options .= make_forum_select($forum_id, false, true, false, false, false);
$template->assign_vars(array(
'S_PERMISSIONS' => true,