From 79e8f8d2997b271fad7e710d94c2bdc6b618c198 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 5 Feb 2004 14:35:37 +0000 Subject: [PATCH] Some re-arrangement of options git-svn-id: file:///svn/phpbb/trunk@4794 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/admin_board.php | 225 ++++++++++++++++++++------------------ 1 file changed, 118 insertions(+), 107 deletions(-) diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php index e743eba69d..d3ccc9fffd 100644 --- a/phpBB/adm/admin_board.php +++ b/phpBB/adm/admin_board.php @@ -146,7 +146,7 @@ switch ($mode) ?> - lang['COOKIE_DOMAIN']; ?>: + lang['COOKIE_DOMAIN']; ?>: @@ -159,7 +159,7 @@ switch ($mode) lang['COOKIE_SECURE']; ?>:
lang['COOKIE_SECURE_EXPLAIN']; ?> - />lang['DISABLED']; ?>    />lang['ENABLED']; ?> + />lang['DISABLED']; ?>   />lang['ENABLED']; ?> - lang['ALLOW_LOCAL']; ?>: + lang['ALLOW_LOCAL']; ?>: /> lang['YES']; ?>   /> lang['NO']; ?> @@ -220,25 +220,18 @@ switch ($mode) $dst_yes = ($new['board_dst']) ? 'checked="checked"' : ''; $dst_no = (!$new['board_dst']) ? 'checked="checked"' : ''; - $yes_no_switches = array('override_user_style', 'allow_topic_notify', 'allow_forum_notify', 'allow_html', 'allow_bbcode', 'allow_smilies', 'allow_sig', 'allow_nocensors', 'allow_namechange', 'allow_emailreuse', 'allow_attachments', 'allow_pm_attach'); + $yes_no_switches = array('override_user_style', 'allow_topic_notify', 'allow_forum_notify', 'allow_html', 'allow_bbcode', 'allow_smilies', 'allow_sig', 'allow_nocensors', 'allow_namechange', 'allow_attachments', 'allow_pm_attach', 'board_dst'); foreach ($yes_no_switches as $switch) { - eval('$' . str_replace('allow_', '', $switch) . '_yes = ($new[\'' . $switch . "']) ? 'checked=\"checked\"' : '';"); - eval('$' . str_replace('allow_', '', $switch) . '_no = (!$new[\'' . $switch . "']) ? 'checked=\"checked\"' : '';"); - } - - $user_char_ary = array('USERNAME_CHARS_ANY' => '.*', 'USERNAME_ALPHA_ONLY' => '[\w]+', 'USERNAME_ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+'); - $user_char_options = ''; - foreach ($user_char_ary as $lang => $value) - { - $selected = ($new['allow_name_chars'] == $value) ? ' selected="selected"' : ''; - $user_char_options .= ''; + $switch_var = str_replace('allow_', '', $switch); + ${$switch_var . '_yes'} = ($new[$switch]) ? ' checked="checked"' : ''; + ${$switch_var . '_no'} = (!$new[$switch]) ? ' checked="checked"' : ''; } ?> - lang['DEFAULT_STYLE']; ?> + lang['DEFAULT_STYLE']; ?> @@ -250,7 +243,7 @@ switch ($mode) - lang['DATE_FORMAT']; ?>:
lang['DATE_FORMAT_EXPLAIN']; ?> + lang['DEFAULT_DATE_FORMAT']; ?>:
lang['DEFAULT_DATE_FORMAT_EXPLAIN']; ?> @@ -259,19 +252,15 @@ switch ($mode) lang['SYSTEM_DST']; ?>: - /> lang['YES']; ?>   /> lang['NO']; ?> + /> lang['YES']; ?>   /> lang['NO']; ?> - lang['CHAR_LIMIT']; ?>:
lang['CHAR_LIMIT_EXPLAIN']; ?> - + lang['BOXES_MAX']; ?>:
lang['BOXES_MAX_EXPLAIN']; ?> + - lang['SMILIES_LIMIT']; ?>:
lang['SMILIES_LIMIT_EXPLAIN']; ?> - - - - lang['QUOTE_DEPTH_LIMIT']; ?>:
lang['QUOTE_DEPTH_LIMIT_EXPLAIN']; ?> - + lang['BOXES_LIMIT']; ?>:
lang['BOXES_LIMIT_EXPLAIN']; ?> + lang['ALLOW_TOPIC_NOTIFY']; ?>: @@ -285,22 +274,6 @@ switch ($mode) lang['ALLOW_NAME_CHANGE']; ?>: /> lang['YES']; ?>   /> lang['NO']; ?> - - lang['USERNAME_LENGTH']; ?>:
lang['USERNAME_LENGTH_EXPLAIN']; ?> - lang['MIN_CHARS']; ?>   lang['MAX_CHARS']; ?> - - - lang['USERNAME_CHARS']; ?>:
lang['USERNAME_CHARS_EXPLAIN']; ?> - - - - lang['PASSWORD_LENGTH']; ?>:
lang['PASSWORD_LENGTH_EXPLAIN']; ?> - lang['MIN_CHARS']; ?>   lang['MAX_CHARS']; ?> - - - lang['ALLOW_EMAIL_REUSE']; ?>:
lang['ALLOW_EMAIL_REUSE_EXPLAIN']; ?> - /> lang['YES']; ?>   /> lang['NO']; ?> - lang['ALLOW_ATTACHMENTS']; ?>: /> lang['YES']; ?>   /> lang['NO']; ?> @@ -343,65 +316,67 @@ switch ($mode) case 'setting': - $disable_board_yes = ($new['board_disable']) ? 'checked="checked"' : ''; - $disable_board_no = (!$new['board_disable']) ? 'checked="checked"' : ''; + $yes_no_switches = array('board_disable', 'enable_confirm', 'coppa_enable', 'privmsg_disable', 'display_last_edited', 'emailreuse'); - $confirm_enabled = ($new['enable_confirm']) ? 'checked="checked"' : ''; - $confirm_disabled = (!$new['enable_confirm']) ? 'checked="checked"' : ''; - - $coppa_enable_yes = ($new['coppa_enable']) ? 'checked="checked"' : ''; - $coppa_enable_no = (!$new['coppa_enable']) ? 'checked="checked"' : ''; + foreach ($yes_no_switches as $switch) + { + $switch_var = str_replace('allow_', '', $switch); + ${$switch_var . '_yes'} = ($new[$switch]) ? ' checked="checked"' : ''; + ${$switch_var . '_no'} = (!$new[$switch]) ? ' checked="checked"' : ''; + } - $activation_none = ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : ''; - $activation_user = ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : ''; - $activation_admin = ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : ''; - $activation_user_admin = ($new['require_activation'] == USER_ACTIVATION_SELF_ADMIN) ? 'checked="checked"' : ''; + $activation_none = ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : ''; + $activation_user = ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : ''; + $activation_admin = ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : ''; $activation_disable = ($new['require_activation'] == USER_ACTIVATION_DISABLE) ? 'checked="checked"' : ''; - $privmsg_on = (!$new['privmsg_disable']) ? 'checked="checked"' : ''; - $privmsg_off = ($new['privmsg_disable']) ? 'checked="checked"' : ''; - - $prune_yes = ($new['prune_enable']) ? 'checked="checked"' : ''; - $prune_no = (!$new['prune_enable']) ? 'checked="checked"' : ''; - - $display_last_edited_yes = ($new['display_last_edited']) ? 'checked="checked"' : ''; - $display_last_edited_no = (!$new['display_last_edited']) ? 'checked="checked"' : ''; - - $bump_type = (string) preg_replace('#^[0-9]+([m|h|d])$#', '\1', $new['bump_interval']); - $bump_time = (int) preg_replace('#^([0-9]+)[m|h|d]$#', '\1', $new['bump_interval']); + preg_match('#^([0-9]+)([m|h|d])$#', $new['bump_interval'], $match); + $bump_time = $match[1]; $s_bump_type = ''; $types = array('m' => 'MINUTES', 'h' => 'HOURS', 'd' => 'DAYS'); foreach ($types as $type => $lang) { - $selected = ($type == $bump_type) ? 'selected="selected" ' : ''; + $selected = ($type == $match[2]) ? 'selected="selected" ' : ''; $s_bump_type .= ''; } + + $user_char_ary = array('USERNAME_CHARS_ANY' => '.*', 'USERNAME_ALPHA_ONLY' => '[\w]+', 'USERNAME_ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+'); + $user_char_options = ''; + foreach ($user_char_ary as $lang => $value) + { + $selected = ($new['allow_name_chars'] == $value) ? ' selected="selected"' : ''; + $user_char_options .= ''; + } + + $pass_type_ary = array('PASS_TYPE_ANY' => '.*', 'PASS_TYPE_CASE' => '[a-zA-Z]', 'PASS_TYPE_ALPHA' => '[a-zA-Z0-9]', 'PASS_TYPE_SYMBOL' => '[a-zA-Z\W]'); + $pass_char_options = ''; + foreach ($pass_type_ary as $lang => $value) + { + $selected = ($new['allow_pass_chars'] == $value) ? ' selected="selected"' : ''; + $pass_char_options .= ''; + } + ?> - lang['SITE_NAME']; ?>: - + lang['SITE_NAME']; ?>: + lang['SITE_DESC']; ?>: - + - lang['BOARD_DISABLE']; ?>:
lang['BOARD_DISABLE_EXPLAIN']; ?> - /> lang['YES']; ?>   /> lang['NO']; ?>
+ lang['DISABLE_BOARD']; ?>:
lang['DISABLE_BOARD_EXPLAIN']; ?> + /> lang['YES']; ?>   /> lang['NO']; ?>
lang['ACC_ACTIVATION']; ?>:
lang['ACC_ACTIVATION_EXPLAIN']; ?> - /> lang['ACC_NONE']; ?>    /> lang['ACC_USER']; ?>    /> lang['ACC_ADMIN']; ?>    /> lang['ACC_DISABLE']; ?> + /> lang['ACC_NONE']; ?>   /> lang['ACC_USER']; ?>   /> lang['ACC_ADMIN']; ?>   /> lang['ACC_DISABLE']; ?> - - lang['VISUAL_CONFIRM']; ?>:
lang['VISUAL_CONFIRM_EXPLAIN']; ?> - /> lang['YES'] ?>    /> lang['NO']; ?> - - lang['ENABLE_COPPA']; ?>:
lang['ENABLE_COPPA_EXPLAIN']; ?> - /> lang['YES']; ?>   /> lang['NO']; ?> + /> lang['YES']; ?>   /> lang['NO']; ?> lang['COPPA_FAX']; ?>: @@ -411,17 +386,41 @@ switch ($mode) lang['COPPA_MAIL']; ?>:
lang['COPPA_MAIL_EXPLAIN']; ?> + + lang['VISUAL_CONFIRM']; ?>:
lang['VISUAL_CONFIRM_EXPLAIN']; ?> + /> lang['YES'] ?>   /> lang['NO']; ?> + + + lang['REG_LIMIT']; ?>:
lang['REG_LIMIT_EXPLAIN']; ?> + + + + lang['USERNAME_LENGTH']; ?>:
lang['USERNAME_LENGTH_EXPLAIN']; ?> + lang['MIN_CHARS']; ?>   lang['MAX_CHARS']; ?> + + + lang['USERNAME_CHARS']; ?>:
lang['USERNAME_CHARS_EXPLAIN']; ?> + + + + lang['PASSWORD_LENGTH']; ?>:
lang['PASSWORD_LENGTH_EXPLAIN']; ?> + lang['MIN_CHARS']; ?>   lang['MAX_CHARS']; ?> + + + lang['PASSWORD_TYPE']; ?>:
lang['PASSWORD_TYPE_EXPLAIN']; ?> + + + + lang['FORCE_PASS_CHANGE']; ?>:
lang['FORCE_PASS_CHANGE_EXPLAIN']; ?> + lang['DAYS']; ?> + + + lang['ALLOW_EMAIL_REUSE']; ?>:
lang['ALLOW_EMAIL_REUSE_EXPLAIN']; ?> + /> lang['YES']; ?>   /> lang['NO']; ?> + lang['BOARD_PM']; ?>:
lang['BOARD_PM_EXPLAIN']; ?> - />lang['ENABLED']; ?>    />lang['DISABLED']; ?> - - - lang['BOXES_MAX']; ?>:
lang['BOXES_MAX_EXPLAIN']; ?> - - - - lang['BOXES_LIMIT']; ?>:
lang['BOXES_LIMIT_EXPLAIN']; ?> - + />lang['ENABLED']; ?>   />lang['DISABLED']; ?> lang['EDIT_TIME']; ?>:
lang['EDIT_TIME_EXPLAIN']; ?> @@ -429,7 +428,7 @@ switch ($mode) lang['DISPLAY_LAST_EDITED']; ?>:
lang['DISPLAY_LAST_EDITED_EXPLAIN']; ?> - />lang['YES']; ?>    />lang['NO']; ?> + />lang['YES']; ?>   />lang['NO']; ?> lang['FLOOD_INTERVAL']; ?>:
lang['FLOOD_INTERVAL_EXPLAIN']; ?> @@ -455,6 +454,18 @@ switch ($mode) lang['MAX_POLL_OPTIONS']; ?>: + + lang['CHAR_LIMIT']; ?>:
lang['CHAR_LIMIT_EXPLAIN']; ?> + + + + lang['SMILIES_LIMIT']; ?>:
lang['SMILIES_LIMIT_EXPLAIN']; ?> + + + + lang['QUOTE_DEPTH_LIMIT']; ?>:
lang['QUOTE_DEPTH_LIMIT_EXPLAIN']; ?> + + - lang['ENABLE_EMAIL']; ?>:
lang['ENABLE_EMAIL_EXPLAIN']; ?> + lang['ENABLE_EMAIL']; ?>:
lang['ENABLE_EMAIL_EXPLAIN']; ?> /> lang['ENABLED']; ?>   /> lang['DISABLED']; ?> @@ -548,7 +559,7 @@ switch ($mode) $gzip_no = (!$new['gzip_compress']) ? 'checked="checked"' : ''; ?> - lang['SERVER_NAME']; ?>:
lang['SERVER_NAME_EXPLAIN']; ?> + lang['SERVER_NAME']; ?>:
lang['SERVER_NAME_EXPLAIN']; ?> @@ -618,11 +629,11 @@ switch ($mode) ?> - lang['LIMIT_LOAD']; ?>:
lang['LIMIT_LOAD_EXPLAIN']; ?> + lang['LIMIT_LOAD']; ?>:
lang['LIMIT_LOAD_EXPLAIN']; ?> - lang['SESSION_LENGTH']; ?>: + lang['SESSION_LENGTH']; ?>:
lang['SESSION_LENGTH_EXPLAIN']; ?> @@ -631,39 +642,39 @@ switch ($mode) lang['YES_POST_MARKING']; ?>:
lang['YES_POST_MARKING_EXPLAIN']; ?> - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> lang['YES_READ_MARKING']; ?>:
lang['YES_READ_MARKING_EXPLAIN']; ?> - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> lang['YES_ONLINE']; ?>:
lang['YES_ONLINE_EXPLAIN']; ?> - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> lang['YES_ONLINE_TRACK']; ?>:
lang['YES_ONLINE_TRACK_EXPLAIN']; ?> - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> - lang['VIEW_ONLINE_TIME']; ?>:
lang['VIEW_ONLINE_TIME_EXPLAIN']; ?> + lang['ONLINE_LENGTH']; ?>:
lang['ONLINE_LENGTH_EXPLAIN']; ?> lang['YES_BIRTHDAYS']; ?>: - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> lang['YES_MODERATORS']; ?>: - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> lang['YES_JUMPBOX']; ?>: - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> lang['YES_SEARCH']; ?>:
lang['YES_SEARCH_EXPLAIN']; ?> - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> lang['SEARCH_INTERVAL']; ?>:
lang['SEARCH_INTERVAL_EXPLAIN']; ?> @@ -679,15 +690,15 @@ switch ($mode) lang['YES_SEARCH_UPDATE']; ?>:
lang['YES_SEARCH_UPDATE_EXPLAIN']; ?> - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> - + lang['RECOMPILE_TEMPLATES']; ?>:
lang['RECOMPILE_TEMPLATES_EXPLAIN']; ?> - />lang['YES'] ?>    /> lang['NO']; ?> + />lang['YES'] ?>   /> lang['NO']; ?> - lang['AUTH_METHOD']; ?>: + lang['AUTH_METHOD']; ?>: - lang['ENABLE_KARMA']; ?>: - />lang['YES'] ?>    /> lang['NO']; ?> + lang['ENABLE_KARMA']; ?>: + />lang['YES'] ?>   /> lang['NO']; ?> lang['MIN_RATINGS']; ?>:
lang['MIN_RATINGS_EXPLAIN']; ?>