diff --git a/admin/admin_attach_cp.php b/admin/admin_attach_cp.php index fea906603..8502372b1 100644 --- a/admin/admin_attach_cp.php +++ b/admin/admin_attach_cp.php @@ -118,7 +118,7 @@ $view_types = array('stats', 'search'); $select_view = ''; for ($i = 0, $iMax = count($view_types_text); $i < $iMax; $i++) { - $selected = ($view === $view_types[$i]) ? ' selected="selected"' : ''; + $selected = ($view === $view_types[$i]) ? ' selected' : ''; $select_view .= '' . $view_types_text[$i] . ''; } $select_view .= ''; @@ -127,7 +127,7 @@ if (count($mode_types_text) > 0) { $select_sort_mode = ''; for ($i = 0, $iMax = count($mode_types_text); $i < $iMax; $i++) { - $selected = ($mode === $mode_types[$i]) ? ' selected="selected"' : ''; + $selected = ($mode === $mode_types[$i]) ? ' selected' : ''; $select_sort_mode .= '' . $mode_types_text[$i] . ''; } $select_sort_mode .= ''; @@ -135,9 +135,9 @@ if (count($mode_types_text) > 0) { $select_sort_order = ''; if ($sort_order === 'ASC') { - $select_sort_order .= '' . $lang['ASC'] . '' . $lang['DESC'] . ''; + $select_sort_order .= '' . $lang['ASC'] . '' . $lang['DESC'] . ''; } else { - $select_sort_order .= '' . $lang['ASC'] . '' . $lang['DESC'] . ''; + $select_sort_order .= '' . $lang['ASC'] . '' . $lang['DESC'] . ''; } $select_sort_order .= ''; @@ -385,7 +385,7 @@ if ($view === 'attachments') { foreach ($delete_id_list as $jValue) { if ($jValue == $attachments[$i]['attach_id']) { - $delete_box = ''; + $delete_box = ''; break; } } diff --git a/admin/admin_attachments.php b/admin/admin_attachments.php index c08d0e1c9..64ba92967 100644 --- a/admin/admin_attachments.php +++ b/admin/admin_attachments.php @@ -246,12 +246,12 @@ if ($mode == 'manage') { 'MAX_FILESIZE_PM' => $new_attach['max_filesize_pm'], 'MAX_ATTACHMENTS' => $new_attach['max_attachments'], 'MAX_ATTACHMENTS_PM' => $new_attach['max_attachments_pm'], - 'DISABLE_MOD_YES' => $new_attach['disable_mod'] !== '0' ? 'checked="checked"' : '', - 'DISABLE_MOD_NO' => $new_attach['disable_mod'] === '0' ? 'checked="checked"' : '', - 'PM_ATTACH_YES' => $new_attach['allow_pm_attach'] !== '0' ? 'checked="checked"' : '', - 'PM_ATTACH_NO' => $new_attach['allow_pm_attach'] === '0' ? 'checked="checked"' : '', - 'DISPLAY_ORDER_ASC' => $new_attach['display_order'] !== '0' ? 'checked="checked"' : '', - 'DISPLAY_ORDER_DESC' => $new_attach['display_order'] === '0' ? 'checked="checked"' : '', + 'DISABLE_MOD_YES' => $new_attach['disable_mod'] !== '0' ? 'checked' : '', + 'DISABLE_MOD_NO' => $new_attach['disable_mod'] === '0' ? 'checked' : '', + 'PM_ATTACH_YES' => $new_attach['allow_pm_attach'] !== '0' ? 'checked' : '', + 'PM_ATTACH_NO' => $new_attach['allow_pm_attach'] === '0' ? 'checked' : '', + 'DISPLAY_ORDER_ASC' => $new_attach['display_order'] !== '0' ? 'checked' : '', + 'DISPLAY_ORDER_DESC' => $new_attach['display_order'] === '0' ? 'checked' : '', )); } @@ -281,14 +281,14 @@ if ($mode == 'cats') { } } - $display_inlined_yes = ($new_attach['img_display_inlined'] != '0') ? 'checked="checked"' : ''; - $display_inlined_no = ($new_attach['img_display_inlined'] == '0') ? 'checked="checked"' : ''; + $display_inlined_yes = ($new_attach['img_display_inlined'] != '0') ? 'checked' : ''; + $display_inlined_no = ($new_attach['img_display_inlined'] == '0') ? 'checked' : ''; - $create_thumbnail_yes = ($new_attach['img_create_thumbnail'] != '0') ? 'checked="checked"' : ''; - $create_thumbnail_no = ($new_attach['img_create_thumbnail'] == '0') ? 'checked="checked"' : ''; + $create_thumbnail_yes = ($new_attach['img_create_thumbnail'] != '0') ? 'checked' : ''; + $create_thumbnail_no = ($new_attach['img_create_thumbnail'] == '0') ? 'checked' : ''; - $use_gd2_yes = ($new_attach['use_gd2'] != '0') ? 'checked="checked"' : ''; - $use_gd2_no = ($new_attach['use_gd2'] == '0') ? 'checked="checked"' : ''; + $use_gd2_yes = ($new_attach['use_gd2'] != '0') ? 'checked' : ''; + $use_gd2_no = ($new_attach['use_gd2'] == '0') ? 'checked' : ''; // Check Thumbnail Support if (!is_imagick() && !@extension_loaded('gd')) { diff --git a/admin/admin_bt_forum_cfg.php b/admin/admin_bt_forum_cfg.php index 965c4292a..3e57012f2 100644 --- a/admin/admin_bt_forum_cfg.php +++ b/admin/admin_bt_forum_cfg.php @@ -121,7 +121,7 @@ foreach ($db_fields_bool as $field_name => $field_def_val) { foreach ($rowset as $rid => $forum) { foreach ($db_fields_bool as $field_name => $field_def_val) { $forum_name = $forum['forum_name']; - $selected = $forum[$field_name] ? ' selected="selected"' : ''; + $selected = $forum[$field_name] ? ' selected' : ''; $forum_name = str_short($forum_name, $max_forum_name_len); diff --git a/admin/admin_extensions.php b/admin/admin_extensions.php index d8ca7246b..a7529b93a 100644 --- a/admin/admin_extensions.php +++ b/admin/admin_extensions.php @@ -404,7 +404,7 @@ if ($mode == 'groups') { $extension_group[$i]['max_filesize'] = round($extension_group[$i]['max_filesize'] / 1024 * 100) / 100; } - $s_allowed = ($extension_group[$i]['allow_group'] == 1) ? 'checked="checked"' : ''; + $s_allowed = ($extension_group[$i]['allow_group'] == 1) ? 'checked' : ''; $template->assign_block_vars('grouprow', array( 'GROUP_ID' => $extension_group[$i]['group_id'], diff --git a/admin/admin_forumauth.php b/admin/admin_forumauth.php index f6458d540..0bec210a4 100644 --- a/admin/admin_forumauth.php +++ b/admin/admin_forumauth.php @@ -165,7 +165,7 @@ if (empty($forum_id)) { $simple_auth = ''; for ($j = 0, $jMax = count($simple_auth_types); $j < $jMax; $j++) { - $selected = ($matched_type == $j) ? ' selected="selected"' : ''; + $selected = ($matched_type == $j) ? ' selected' : ''; $simple_auth .= '' . $simple_auth_types[$j] . ''; } @@ -183,7 +183,7 @@ if (empty($forum_id)) { $custom_auth[$j] = ' '; for ($k = 0, $kMax = count($forum_auth_levels); $k < $kMax; $k++) { - $selected = ($forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k]) ? ' selected="selected"' : ''; + $selected = ($forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k]) ? ' selected' : ''; $custom_auth[$j] .= '' . $lang['FORUM_' . strtoupper($forum_auth_levels[$k])] . ''; } $custom_auth[$j] .= ' '; diff --git a/admin/admin_forumauth_list.php b/admin/admin_forumauth_list.php index d1e24a12a..95187030e 100644 --- a/admin/admin_forumauth_list.php +++ b/admin/admin_forumauth_list.php @@ -292,7 +292,7 @@ if (empty($forum_id) && empty($cat_id)) { $custom_auth[$j] = ''; for ($k = 0, $kMax = count($forum_auth_levels); $k < $kMax; $k++) { - $selected = (!empty($forum_rows) && $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k]) ? ' selected="selected"' : ''; + $selected = (!empty($forum_rows) && $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k]) ? ' selected' : ''; $custom_auth[$j] .= '' . $lang['FORUM_' . $forum_auth_levels[$k]] . ''; } $custom_auth[$j] .= ''; diff --git a/admin/admin_forums.php b/admin/admin_forums.php index 4b00eb03b..8ec6ad8f2 100644 --- a/admin/admin_forums.php +++ b/admin/admin_forums.php @@ -117,7 +117,7 @@ if ($mode) { $catlist = get_list('category', $cat_id, true); $forumlocked = $forumunlocked = ''; - $forumstatus == FORUM_LOCKED ? $forumlocked = 'selected="selected"' : $forumunlocked = 'selected="selected"'; + $forumstatus == FORUM_LOCKED ? $forumlocked = 'selected' : $forumunlocked = 'selected'; $statuslist = '' . $lang['STATUS_UNLOCKED'] . '\n'; $statuslist .= '' . $lang['STATUS_LOCKED'] . '\n'; @@ -854,7 +854,7 @@ function get_list($mode, $id, $select) while ($row = DB()->sql_fetchrow($result)) { $s = ''; if ($row[$idfield] == $id) { - $s = ' selected="selected"'; + $s = ' selected'; } $catlist .= ' ' . htmlCHR(str_short($row[$namefield], 60)) . '\n'; } diff --git a/admin/admin_rebuild_search.php b/admin/admin_rebuild_search.php index a815f6e24..e8e7bf5d4 100644 --- a/admin/admin_rebuild_search.php +++ b/admin/admin_rebuild_search.php @@ -365,7 +365,7 @@ if ($mode == 'submit' || $mode == 'refresh') { // check our last status if ($last_session_data['rebuild_session_status'] == REBUILD_SEARCH_PROCESSED) { $last_saved_processing = sprintf($lang['INFO_PROCESSING_STOPPED'], $last_saved_post_id, $total_posts_processed, $last_saved_date); - $clear_search_disabled = 'disabled="disabled"'; + $clear_search_disabled = 'disabled'; $template->assign_block_vars('start_select_input', array()); } elseif ($last_session_data['rebuild_session_status'] == REBUILD_SEARCH_ABORTED) { @@ -374,7 +374,7 @@ if ($mode == 'submit' || $mode == 'refresh') { if (TIMENOW - $last_session_data['end_time'] < $last_session_data['last_cycle_time']) { $last_saved_processing .= '' . $lang['INFO_PROCESSING_ABORTED_SOON']; } - $clear_search_disabled = 'disabled="disabled"'; + $clear_search_disabled = 'disabled'; $template->assign_block_vars('start_select_input', array()); } else { @@ -382,7 +382,7 @@ if ($mode == 'submit' || $mode == 'refresh') { if ($last_session_data['end_post_id'] < $max_post_id) { $last_saved_processing = sprintf($lang['INFO_PROCESSING_FINISHED_NEW'], $last_saved_post_id, $total_posts_processed, $last_saved_date, $total_posts - $total_posts_processed); - $clear_search_disabled = 'disabled="disabled"'; + $clear_search_disabled = 'disabled'; $template->assign_block_vars('start_select_input', array()); } else { diff --git a/admin/admin_smilies.php b/admin/admin_smilies.php index 5138ee872..72ef308a8 100644 --- a/admin/admin_smilies.php +++ b/admin/admin_smilies.php @@ -203,7 +203,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) { $filename_list = $smiley_edit_img = ''; for ($i = 0, $iMax = count($smiley_images); $i < $iMax; $i++) { if ($smiley_images[$i] == $smile_data['smile_url']) { - $smiley_selected = 'selected="selected"'; + $smiley_selected = 'selected'; $smiley_edit_img = $smiley_images[$i]; } else { $smiley_selected = ''; diff --git a/admin/admin_ug_auth.php b/admin/admin_ug_auth.php index 087839ce9..a2cc7beb5 100644 --- a/admin/admin_ug_auth.php +++ b/admin/admin_ug_auth.php @@ -266,13 +266,13 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { $s_user_type = ($this_userdata['user_level'] == ADMIN) ? ' - ' . $lang['AUTH_ADMIN'] . ' + ' . $lang['AUTH_ADMIN'] . ' ' . $lang['AUTH_USER'] . ' ' : ' ' . $lang['AUTH_ADMIN'] . ' - ' . $lang['AUTH_USER'] . ' + ' . $lang['AUTH_USER'] . ' '; diff --git a/dl.php b/dl.php index 3d85a4f47..5f3a903f5 100644 --- a/dl.php +++ b/dl.php @@ -182,7 +182,7 @@ if ($download_mode == PHYSICAL_LINK) { exit; } -if (IS_GUEST && !bb_captcha('check')) { +if (IS_GUEST && !$bb_cfg['captcha']['disabled'] && !bb_captcha('check')) { global $template; $redirect_url = $_POST['redirect_url'] ?? $_SERVER['HTTP_REFERER'] ?? '/'; diff --git a/group.php b/group.php index c8e925121..fd7b92288 100644 --- a/group.php +++ b/group.php @@ -387,9 +387,9 @@ if (!$group_id) { 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, - 'S_GROUP_OPEN_CHECKED' => ($group_info['group_type'] == GROUP_OPEN) ? ' checked="checked"' : '', - 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked="checked"' : '', - 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked="checked"' : '', + 'S_GROUP_OPEN_CHECKED' => ($group_info['group_type'] == GROUP_OPEN) ? ' checked' : '', + 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked' : '', + 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked' : '', 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_MODE_SELECT' => $select_sort_mode, 'S_ORDER_SELECT' => $select_sort_order, diff --git a/group_edit.php b/group_edit.php index f337666ce..3d4bdd778 100644 --- a/group_edit.php +++ b/group_edit.php @@ -71,9 +71,9 @@ if ($is_moderator) { 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, - 'S_GROUP_OPEN_CHECKED' => ($group_info['group_type'] == GROUP_OPEN) ? ' checked="checked"' : '', - 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked="checked"' : '', - 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked="checked"' : '', + 'S_GROUP_OPEN_CHECKED' => ($group_info['group_type'] == GROUP_OPEN) ? ' checked' : '', + 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked' : '', + 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked' : '', 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_GROUP_CONFIG_ACTION' => "group_edit.php?" . POST_GROUPS_URL . "=$group_id", diff --git a/library/attach_mod/includes/functions_selects.php b/library/attach_mod/includes/functions_selects.php index 711b78d82..3a3bc1c6e 100644 --- a/library/attach_mod/includes/functions_selects.php +++ b/library/attach_mod/includes/functions_selects.php @@ -36,9 +36,9 @@ function group_select($select_name, $default_group = 0) for ($i = 0, $iMax = count($group_name); $i < $iMax; $i++) { if (!$default_group) { - $selected = ($i == 0) ? ' selected="selected"' : ''; + $selected = ($i == 0) ? ' selected' : ''; } else { - $selected = ($group_name[$i]['group_id'] == $default_group) ? ' selected="selected"' : ''; + $selected = ($group_name[$i]['group_id'] == $default_group) ? ' selected' : ''; } $group_select .= '' . $group_name[$i]['group_name'] . ''; @@ -79,9 +79,9 @@ function download_select($select_name, $group_id = 0) for ($i = 0, $iMax = count($types_download); $i < $iMax; $i++) { if (!$group_id) { - $selected = ($types_download[$i] == INLINE_LINK) ? ' selected="selected"' : ''; + $selected = ($types_download[$i] == INLINE_LINK) ? ' selected' : ''; } else { - $selected = ($row['download_mode'] == $types_download[$i]) ? ' selected="selected"' : ''; + $selected = ($row['download_mode'] == $types_download[$i]) ? ' selected' : ''; } $group_select .= '' . $modes_download[$i] . ''; @@ -132,9 +132,9 @@ function category_select($select_name, $group_id = 0) for ($i = 0, $iMax = count($types); $i < $iMax; $i++) { if (!$group_id) { - $selected = ($types[$i] == NONE_CAT) ? ' selected="selected"' : ''; + $selected = ($types[$i] == NONE_CAT) ? ' selected' : ''; } else { - $selected = ($types[$i] == $category_type) ? ' selected="selected"' : ''; + $selected = ($types[$i] == $category_type) ? ' selected' : ''; } $group_select .= '' . $modes[$i] . ''; @@ -158,7 +158,7 @@ function size_select($select_name, $size_compare) $select_field = ''; for ($i = 0, $iMax = count($size_types_text); $i < $iMax; $i++) { - $selected = ($size_compare == $size_types[$i]) ? ' selected="selected"' : ''; + $selected = ($size_compare == $size_types[$i]) ? ' selected' : ''; $select_field .= '' . $size_types_text[$i] . ''; } @@ -191,7 +191,7 @@ function quota_limit_select($select_name, $default_quota = 0) DB()->sql_freeresult($result); foreach ($quota_name as $i => $iValue) { - $selected = ($quota_name[$i]['quota_limit_id'] == $default_quota) ? ' selected="selected"' : ''; + $selected = ($quota_name[$i]['quota_limit_id'] == $default_quota) ? ' selected' : ''; $quota_select .= '' . $quota_name[$i]['quota_desc'] . ''; } $quota_select .= ''; @@ -223,7 +223,7 @@ function default_quota_limit_select($select_name, $default_quota = 0) DB()->sql_freeresult($result); foreach ($quota_name as $i => $iValue) { - $selected = ($quota_name[$i]['quota_limit_id'] == $default_quota) ? ' selected="selected"' : ''; + $selected = ($quota_name[$i]['quota_limit_id'] == $default_quota) ? ' selected' : ''; $quota_select .= '' . $quota_name[$i]['quota_desc'] . ''; } $quota_select .= ''; diff --git a/library/includes/functions.php b/library/includes/functions.php index 3dd91db70..91dab9e6b 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -1434,7 +1434,7 @@ function get_forum_display_sort_option($selected_row = 0, $action = 'list', $lis // build list if ($action == 'list') { foreach ($listrow['lang_key'] as $i => $iValue) { - $selected = ($i == $selected_row) ? ' selected="selected"' : ''; + $selected = ($i == $selected_row) ? ' selected' : ''; $l_value = $lang[$listrow['lang_key'][$i]] ?? $iValue; $res .= '' . $l_value . ''; } diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php index 07363a0e4..cee5db6d2 100644 --- a/library/includes/init_bb.php +++ b/library/includes/init_bb.php @@ -292,10 +292,10 @@ define('USER_AGENT', strtolower($_SERVER['HTTP_USER_AGENT'])); define('HTML_SELECT_MAX_LENGTH', 60); define('HTML_WBR_LENGTH', 12); -define('HTML_CHECKED', ' checked="checked" '); -define('HTML_DISABLED', ' disabled="disabled" '); -define('HTML_READONLY', ' readonly="readonly" '); -define('HTML_SELECTED', ' selected="selected" '); +define('HTML_CHECKED', ' checked '); +define('HTML_DISABLED', ' disabled '); +define('HTML_READONLY', ' readonly '); +define('HTML_SELECTED', ' selected '); define('HTML_SF_SPACER', ' |- '); diff --git a/memberlist.php b/memberlist.php index a4b6f0714..18c11eb9a 100644 --- a/memberlist.php +++ b/memberlist.php @@ -48,7 +48,7 @@ $mode_types = array( $select_sort_mode = ''; for ($i = 0, $iMax = count($mode_types_text); $i < $iMax; $i++) { - $selected = ($mode == $mode_types[$i]) ? ' selected="selected"' : ''; + $selected = ($mode == $mode_types[$i]) ? ' selected' : ''; $select_sort_mode .= '' . $mode_types_text[$i] . ''; } $select_sort_mode .= ''; @@ -57,9 +57,9 @@ $select_sort_mode .= ''; $select_sort_order = ''; if ($sort_order == 'ASC') { - $select_sort_order .= '' . $lang['ASC'] . '' . $lang['DESC'] . ''; + $select_sort_order .= '' . $lang['ASC'] . '' . $lang['DESC'] . ''; } else { - $select_sort_order .= '' . $lang['ASC'] . '' . $lang['DESC'] . ''; + $select_sort_order .= '' . $lang['ASC'] . '' . $lang['DESC'] . ''; } $select_sort_order .= ''; diff --git a/posting.php b/posting.php index 770bc971d..1ac2633e6 100644 --- a/posting.php +++ b/posting.php @@ -513,7 +513,7 @@ if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post'])) { if ($is_auth['auth_sticky']) { $topic_type_toggle .= ' '; } @@ -521,13 +521,13 @@ if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post'])) { if ($is_auth['auth_announce']) { $topic_type_toggle .= ' '; } if ($topic_type_toggle != '') { - $topic_type_toggle = $lang['POST_TOPIC_AS'] . ': ' . $lang['POST_NORMAL'] . ' ' . $topic_type_toggle; + $topic_type_toggle = $lang['POST_TOPIC_AS'] . ': ' . $lang['POST_NORMAL'] . ' ' . $topic_type_toggle; } } //bt @@ -551,12 +551,12 @@ if ($post_info['allow_reg_tracker'] && $post_data['first_post'] && ($topic_dl_ty $dl_type_val = ($topic_dl_type) ? 1 : 0; if (!$post_info['allow_reg_tracker'] && !$is_auth['auth_mod']) { - $dl_ds = ' disabled="disabled" '; + $dl_ds = ' disabled '; $dl_hid = ''; $dl_type_name = ''; } - $dl_ch = ($mode == 'editpost' && $post_data['first_post'] && $topic_dl_type) ? ' checked="checked" ' : ''; + $dl_ch = ($mode == 'editpost' && $post_data['first_post'] && $topic_dl_type) ? ' checked ' : ''; $topic_type_toggle .= ' ' . $lang['POST_DOWNLOAD'] . ''; $topic_type_toggle .= $dl_hid; @@ -617,7 +617,7 @@ $template->assign_vars(array( 'U_VIEW_FORUM' => "viewforum.php?" . POST_FORUM_URL . "=$forum_id", 'USERNAME' => @$username, - 'CAPTCHA_HTML' => (IS_GUEST) ? bb_captcha('get') : '', + 'CAPTCHA_HTML' => (IS_GUEST && !$bb_cfg['captcha']['disabled']) ? bb_captcha('get') : '', 'SUBJECT' => $subject, 'MESSAGE' => $message, @@ -626,7 +626,7 @@ $template->assign_vars(array( 'U_VIEWTOPIC' => ($mode == 'reply') ? "viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&postorder=desc" : '', - 'S_NOTIFY_CHECKED' => ($notify_user) ? 'checked="checked"' : '', + 'S_NOTIFY_CHECKED' => ($notify_user) ? 'checked' : '', 'S_TYPE_TOGGLE' => $topic_type_toggle, 'S_TOPIC_ID' => $topic_id, 'S_POST_ACTION' => POSTING_URL, diff --git a/privmsg.php b/privmsg.php index 89374472c..97eccdb60 100644 --- a/privmsg.php +++ b/privmsg.php @@ -1294,7 +1294,7 @@ if ($mode == 'read') { $select_msg_days = ''; for ($i = 0, $iMax = count($previous_days); $i < $iMax; $i++) { - $selected = ($msg_days == $previous_days[$i]) ? ' selected="selected"' : ''; + $selected = ($msg_days == $previous_days[$i]) ? ' selected' : ''; $select_msg_days .= '' . $previous_days_text[$i] . ''; } diff --git a/src/Legacy/Admin/Torrent.php b/src/Legacy/Admin/Torrent.php index 3e82fd51c..433b78e8d 100644 --- a/src/Legacy/Admin/Torrent.php +++ b/src/Legacy/Admin/Torrent.php @@ -81,7 +81,7 @@ class Torrent global $template, $lang; foreach ($default_cfg as $config_name => $config_value) { - // YES/NO 'checked="checked"' + // YES/NO 'checked' $template->assign_vars([ strtoupper($config_name) . '_YES' => ($cfg[$config_name]) ? HTML_CHECKED : '', strtoupper($config_name) . '_NO' => (!$cfg[$config_name]) ? HTML_CHECKED : '', diff --git a/src/Legacy/Post.php b/src/Legacy/Post.php index daf3be915..d2eb262c2 100644 --- a/src/Legacy/Post.php +++ b/src/Legacy/Post.php @@ -68,7 +68,7 @@ class Post } } - if (IS_GUEST && !bb_captcha('check')) { + if (IS_GUEST && !$bb_cfg['captcha']['disabled'] && !bb_captcha('check')) { $error_msg .= (!empty($error_msg)) ? '' . $lang['CAPTCHA_WRONG'] : $lang['CAPTCHA_WRONG']; } } diff --git a/src/Legacy/Select.php b/src/Legacy/Select.php index a834d8b1f..be0eb2f38 100644 --- a/src/Legacy/Select.php +++ b/src/Legacy/Select.php @@ -32,7 +32,7 @@ class Select foreach ($bb_cfg['lang'] as $key => $data) { $selected = ''; if ($key == $default_lang) { - $selected = ' selected="selected"'; + $selected = ' selected'; } $lang_select .= '' . $data['name'] . ''; $x++; @@ -59,7 +59,7 @@ class Select $tz_select = ''; foreach ($lang['TZ'] as $offset => $zone) { - $selected = ($offset == $default) ? ' selected="selected"' : ''; + $selected = ($offset == $default) ? ' selected' : ''; $tz_select .= '' . $zone . ''; } $tz_select .= ''; @@ -84,7 +84,7 @@ class Select foreach ($bb_cfg['templates'] as $folder => $name) { $selected = ''; if ($folder == $default_style) { - $selected = ' selected="selected"'; + $selected = ' selected'; } $templates_select .= '' . $name . ''; $x++; diff --git a/styles/templates/admin/admin_board.tpl b/styles/templates/admin/admin_board.tpl index 72045d2d8..2074955b2 100644 --- a/styles/templates/admin/admin_board.tpl +++ b/styles/templates/admin/admin_board.tpl @@ -28,15 +28,15 @@ {L_FORUMS_DISABLE}{L_BOARD_DISABLE_EXPLAIN} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_ALLOW_AUTOLOGIN}{L_ALLOW_AUTOLOGIN_EXPLAIN} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -96,8 +96,8 @@ {L_ENABLE_PRUNE} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -110,15 +110,15 @@ {L_ALLOW_BBCODE} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_ALLOW_SMILIES} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -128,8 +128,8 @@ {L_ALLOW_SIG} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -139,8 +139,8 @@ {L_ALLOW_NAME_CHANGE} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -167,29 +167,29 @@ {L_MAGNET} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} {L_GENDER} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} {L_CALLSEED} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} {L_TRACKER_STATS} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} @@ -199,29 +199,29 @@ {L_SHOW_MOD_HOME_PAGE} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} {L_SHOW_BOARD_STARTED_INDEX} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} {L_PREMOD_HELP} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} {L_TOR_COMMENT} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} @@ -231,8 +231,8 @@ {L_LATEST_NEWS} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} @@ -254,8 +254,8 @@ {L_NETWORK_NEWS} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} @@ -277,8 +277,8 @@ {L_BIRTHDAY_ENABLE} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} @@ -300,8 +300,8 @@ {L_SEED_BONUS} - checked="checked" />{L_ENABLED} - checked="checked" />{L_DISABLED} + checked />{L_ENABLED} + checked />{L_DISABLED} diff --git a/styles/templates/admin/admin_bt_forum_cfg.tpl b/styles/templates/admin/admin_bt_forum_cfg.tpl index 62f7478ad..674cbea2e 100644 --- a/styles/templates/admin/admin_bt_forum_cfg.tpl +++ b/styles/templates/admin/admin_bt_forum_cfg.tpl @@ -166,7 +166,7 @@ - + {L_CONFIRM} diff --git a/styles/templates/admin/admin_cron.tpl b/styles/templates/admin/admin_cron.tpl index 285e4e598..a1695eb82 100644 --- a/styles/templates/admin/admin_cron.tpl +++ b/styles/templates/admin/admin_cron.tpl @@ -105,14 +105,14 @@ tr.hl-tr:hover td { background-color: #CFC !important; } {L_WITH_SELECTED} - » {L_NOTHING} + » {L_NOTHING} {L_CRON_RUN} {L_CRON_DEL} {L_CRON_DISABLE} {L_CRON_ENABLE} - + @@ -146,8 +146,8 @@ tr.hl-tr:hover td { background-color: #CFC !important; } {L_CRON_ACTIVE_EXPL} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -189,8 +189,8 @@ tr.hl-tr:hover td { background-color: #CFC !important; } {L_LOG_ENABLED} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -200,15 +200,15 @@ tr.hl-tr:hover td { background-color: #CFC !important; } {L_LOG_SQL_QUERIES} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_FORUM_DISABLE}{L_BOARD_DISABLE_EXPL} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -219,7 +219,7 @@ tr.hl-tr:hover td { background-color: #CFC !important; } - + {L_CONFIRM} diff --git a/styles/templates/admin/admin_forums.tpl b/styles/templates/admin/admin_forums.tpl index ba99d9016..04c808728 100644 --- a/styles/templates/admin/admin_forums.tpl +++ b/styles/templates/admin/admin_forums.tpl @@ -49,8 +49,8 @@ function toggle_cat_list (val) {L_SF_SHOW_ON_INDEX} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} diff --git a/styles/templates/admin/admin_groups.tpl b/styles/templates/admin/admin_groups.tpl index f8624464f..d5d2df1a7 100644 --- a/styles/templates/admin/admin_groups.tpl +++ b/styles/templates/admin/admin_groups.tpl @@ -35,8 +35,8 @@ {L_RELEASE_GROUP} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} diff --git a/styles/templates/admin/admin_mass_email.tpl b/styles/templates/admin/admin_mass_email.tpl index f6e146cbb..c46f28967 100644 --- a/styles/templates/admin/admin_mass_email.tpl +++ b/styles/templates/admin/admin_mass_email.tpl @@ -16,7 +16,7 @@ {L_MASS_EMAIL_MESSAGE_TYPE} - text/plain + text/plain text/html diff --git a/styles/templates/admin/admin_rebuild_search.tpl b/styles/templates/admin/admin_rebuild_search.tpl index 7507d59a5..0a4a24f2a 100644 --- a/styles/templates/admin/admin_rebuild_search.tpl +++ b/styles/templates/admin/admin_rebuild_search.tpl @@ -58,13 +58,13 @@ function swap_values() {L_STARTING_POST_ID}{L_STARTING_POST_ID_EXPLAIN} - + 0 ({L_START_OPTION_BEGINNING}) - {NEXT_START_POST_ID} ({L_START_OPTION_CONTINUE}) + {NEXT_START_POST_ID} ({L_START_OPTION_CONTINUE}) @@ -72,7 +72,7 @@ function swap_values() {L_CLEAR_SEARCH_TABLES}{L_CLEAR_SEARCH_TABLES_EXPLAIN} - {L_CLEAR_SEARCH_NO} + {L_CLEAR_SEARCH_NO} {L_CLEAR_SEARCH_DELETE} {L_CLEAR_SEARCH_TRUNCATE} diff --git a/styles/templates/admin/admin_smilies.tpl b/styles/templates/admin/admin_smilies.tpl index edc1dc3d2..a0422eb0c 100644 --- a/styles/templates/admin/admin_smilies.tpl +++ b/styles/templates/admin/admin_smilies.tpl @@ -103,7 +103,7 @@ function update_smiley(newimage) - {L_SMILE_CONFLICTS} {L_REPLACE_EXISTING} {L_KEEP_EXISTING} + {L_SMILE_CONFLICTS} {L_REPLACE_EXISTING} {L_KEEP_EXISTING} diff --git a/styles/templates/admin/admin_ug_auth.tpl b/styles/templates/admin/admin_ug_auth.tpl index a3baff3f1..fb98941a9 100644 --- a/styles/templates/admin/admin_ug_auth.tpl +++ b/styles/templates/admin/admin_ug_auth.tpl @@ -167,9 +167,9 @@ thead tr { -disabled="disabled" /> +disabled /> -disabled="disabled" /> +disabled /> diff --git a/styles/templates/admin/admin_user_search.tpl b/styles/templates/admin/admin_user_search.tpl index f4cbe822f..8d3fd0019 100644 --- a/styles/templates/admin/admin_user_search.tpl +++ b/styles/templates/admin/admin_user_search.tpl @@ -31,7 +31,7 @@ - {L_SEARCH_USERS_JOINED} {L_BEFORE}{L_AFTER} // {L_SEARCH_USERS_JOINED_EXPLAIN} + {L_SEARCH_USERS_JOINED} {L_BEFORE}{L_AFTER} // {L_SEARCH_USERS_JOINED_EXPLAIN} @@ -53,13 +53,13 @@ - {L_POSTCOUNT} {L_EQUALS}{L_LESS_THAN}{L_GREATER_THAN} {L_SEARCH_USERS_POSTCOUNT_EXPLAIN} + {L_POSTCOUNT} {L_EQUALS}{L_LESS_THAN}{L_GREATER_THAN} {L_SEARCH_USERS_POSTCOUNT_EXPLAIN} - {L_USERFIELD}: {L_ICQ}{L_SKYPE}{L_TWITTER}{L_WEBSITE}{L_LOCATION}{L_INTERESTS} {L_SEARCH_USERS_USERFIELD_EXPLAIN} + {L_USERFIELD}: {L_ICQ}{L_SKYPE}{L_TWITTER}{L_WEBSITE}{L_LOCATION}{L_INTERESTS} {L_SEARCH_USERS_USERFIELD_EXPLAIN} @@ -91,7 +91,7 @@ - {L_ADMINISTRATORS}{L_MODERATORS}{L_BANNED_USERS}{L_DISABLED_USERS} {L_SEARCH_USERS_MISC_EXPLAIN} + {L_ADMINISTRATORS}{L_MODERATORS}{L_BANNED_USERS}{L_DISABLED_USERS} {L_SEARCH_USERS_MISC_EXPLAIN} diff --git a/styles/templates/default/css/globals.css b/styles/templates/default/css/globals.css index 3113db651..de50059ef 100644 --- a/styles/templates/default/css/globals.css +++ b/styles/templates/default/css/globals.css @@ -588,7 +588,7 @@ input[type="checkbox"], input[type="radio"] { -moz-box-sizing: border-box; } -input[disabled="disabled"] { +input:disabled { color: #808080; } diff --git a/styles/templates/default/group_edit.tpl b/styles/templates/default/group_edit.tpl index f9516eaad..e1aa44107 100644 --- a/styles/templates/default/group_edit.tpl +++ b/styles/templates/default/group_edit.tpl @@ -64,8 +64,8 @@ {L_RELEASE_GROUP}: - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} diff --git a/styles/templates/default/login.tpl b/styles/templates/default/login.tpl index 2ad665c7e..04cbc2613 100644 --- a/styles/templates/default/login.tpl +++ b/styles/templates/default/login.tpl @@ -20,7 +20,7 @@ {L_USERNAME}: - readonly="readonly" style="color: gray" /> + readonly style="color: gray" /> @@ -34,7 +34,7 @@ - {L_AUTO_LOGIN}: disabled="disabled" checked="checked" /> + {L_AUTO_LOGIN}: disabled checked /> diff --git a/styles/templates/default/modcp.tpl b/styles/templates/default/modcp.tpl index 888cff736..f1c915170 100644 --- a/styles/templates/default/modcp.tpl +++ b/styles/templates/default/modcp.tpl @@ -80,7 +80,7 @@ {L_LEAVE_SHADOW_TOPIC} - {L_BOT_LEAVE_MSG_MOVED} + {L_BOT_LEAVE_MSG_MOVED} diff --git a/styles/templates/default/modcp_split.tpl b/styles/templates/default/modcp_split.tpl index d02bbe609..afb8e9338 100644 --- a/styles/templates/default/modcp_split.tpl +++ b/styles/templates/default/modcp_split.tpl @@ -50,9 +50,9 @@ function toggle_cbox (cb_id, tr_id) - {L_BOT_AFTER_SPLIT_TO_OLD} + {L_BOT_AFTER_SPLIT_TO_OLD} - {L_BOT_AFTER_SPLIT_TO_NEW} + {L_BOT_AFTER_SPLIT_TO_NEW} diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl index 741f01374..56e1053a8 100644 --- a/styles/templates/default/page_header.tpl +++ b/styles/templates/default/page_header.tpl @@ -324,7 +324,7 @@ $(document).ready(function() { - {L_TRACKER_S} + {L_TRACKER_S} {L_FORUM_S} {L_HASH_S} @@ -360,7 +360,7 @@ $(document).ready(function() { {L_USERNAME}: {L_PASSWORD}: - {L_REMEMBER} + {L_REMEMBER} · {L_FORGOTTEN_PASSWORD} diff --git a/styles/templates/default/posting.tpl b/styles/templates/default/posting.tpl index 2f8d16b08..9be24dc50 100644 --- a/styles/templates/default/posting.tpl +++ b/styles/templates/default/posting.tpl @@ -4,28 +4,27 @@ - - {L_NEW_POSTS_PREVIEW} - - - {L_AUTHOR} - {L_MESSAGE} - - - - - - {new_posts.POSTER} - - - - - {MINIPOST_IMG_NEW} {new_posts.POST_DATE} - {new_posts.MESSAGE} - - - - + + {L_NEW_POSTS_PREVIEW} + + + {L_AUTHOR} + {L_MESSAGE} + + + + + + {new_posts.POSTER} + + + + + {MINIPOST_IMG_NEW} {new_posts.POST_DATE} + {new_posts.MESSAGE} + + + @@ -37,12 +36,14 @@ - - {L_PREVIEW} - - - {PREVIEW_MSG} - + + {L_PREVIEW} + + + + {PREVIEW_MSG} + + @@ -51,114 +52,112 @@ - {T_INDEX} - » {FORUM_NAME} - » {POSTING_TOPIC_TITLE} + {T_INDEX} + » {FORUM_NAME} + » {POSTING_TOPIC_TITLE} -{S_HIDDEN_FORM_FIELDS} -{ADD_ATTACH_HIDDEN_FIELDS} -{POSTED_ATTACHMENTS_HIDDEN_FIELDS} + {S_HIDDEN_FORM_FIELDS} + {ADD_ATTACH_HIDDEN_FIELDS} + {POSTED_ATTACHMENTS_HIDDEN_FIELDS} - - - - - - - {POSTING_TYPE_TITLE} - - - - - - - - - {L_USERNAME} - - - - - - - - - {L_SUBJECT} - - - - - - - - {L_MESSAGE} - - - - - - - - - - - {L_MORE_EMOTICONS} - - - - - - - - - - - {L_OPTIONS} - - - - - - - checked="checked" /> - {L_UPDATE_POST_TIME} - - - - - - {L_NOTIFY} - - - - - - - - - - {L_POST_RELEASE_FROM_GROUP} - - - {L_CHOOSE_RELEASE_GROUP} - {POSTER_RGROUPS} - - checked/> {L_ATTACH_RG_SIG} - - - - - - - - {S_TYPE_TOGGLE} - - - - + + + + + + {POSTING_TYPE_TITLE} + + + + + + + + + {L_USERNAME} + + + + + + + + + {L_SUBJECT} + + + + + + + {L_MESSAGE} + + + + + + + + + + + {L_MORE_EMOTICONS} + + + + + + + + + + + {L_OPTIONS} + + + + + + + checked /> + {L_UPDATE_POST_TIME} + + + + + + {L_NOTIFY} + + + + + + + + + + {L_POST_RELEASE_FROM_GROUP} + + + {L_CHOOSE_RELEASE_GROUP} + {POSTER_RGROUPS} + + checked /> {L_ATTACH_RG_SIG} + + + + + + + + {S_TYPE_TOGGLE} + + + + @@ -167,28 +166,27 @@ - - {L_TOPIC_REVIEW} - - - {L_AUTHOR} - {L_MESSAGE} - - - - - - {review.POSTER} - - - - - {MINIPOST_IMG} {review.POST_DATE} - {review.MESSAGE} - - - - + + {L_TOPIC_REVIEW} + + + {L_AUTHOR} + {L_MESSAGE} + + + + + + {review.POSTER} + + + + + {MINIPOST_IMG} {review.POST_DATE} + {review.MESSAGE} + + + diff --git a/styles/templates/default/posting_editor.tpl b/styles/templates/default/posting_editor.tpl index 0ff704172..0bb8bf279 100644 --- a/styles/templates/default/posting_editor.tpl +++ b/styles/templates/default/posting_editor.tpl @@ -11,7 +11,7 @@ ajax.callback.posts = function(data) { - {L_QR_FONT_SEL}: + {L_QR_FONT_SEL}: Monospace Serif Sans Serif @@ -29,7 +29,7 @@ ajax.callback.posts = function(data) { - {L_QR_COLOR_SEL}: + {L_QR_COLOR_SEL}: {L_COLOR_DARK_RED} {L_COLOR_BROWN} {L_COLOR_ORANGE} @@ -46,11 +46,11 @@ ajax.callback.posts = function(data) { - {L_QR_SIZE_SEL}: + {L_QR_SIZE_SEL}: {L_FONT_SMALL} size=10 size=11 - {L_FONT_NORMAL} + {L_FONT_NORMAL} size=14 size=16 {L_FONT_LARGE} @@ -62,7 +62,7 @@ ajax.callback.posts = function(data) { - {L_ALIGN} + {L_ALIGN} {L_LEFT} {L_RIGHT} {L_CENTER} diff --git a/styles/templates/default/usercp_register.tpl b/styles/templates/default/usercp_register.tpl index e2f6fe49f..2094f34da 100644 --- a/styles/templates/default/usercp_register.tpl +++ b/styles/templates/default/usercp_register.tpl @@ -83,7 +83,7 @@ {L_EMAIL}: * {L_EMAIL_EXPLAIN} - readonly="readonly" style="color: gray;" /> + readonly style="color: gray;" /> @@ -213,31 +213,31 @@ {L_PUBLIC_VIEW_EMAIL}: - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_HIDE_USER}: - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_ALWAYS_NOTIFY}:{L_ALWAYS_NOTIFY_EXPLAIN} - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_NOTIFY_ON_PRIVMSG}: - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -253,29 +253,29 @@ {L_HIDE_PORN_FORUMS}: - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_ADD_RETRACKER}: - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_HIDE_DOWNLOADS}: - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} {L_CALLSEED_EXPLAIN}: - checked="checked" />{L_YES} - checked="checked" />{L_NO} + checked />{L_YES} + checked />{L_NO} @@ -334,7 +334,7 @@ - id="agreement" disabled="disabled" name="submit" value="{L_SUBMIT}" class="main"/> + id="agreement" disabled name="submit" value="{L_SUBMIT}" class="main"/> diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl index 75c754239..2f604120c 100644 --- a/styles/templates/default/viewtopic.tpl +++ b/styles/templates/default/viewtopic.tpl @@ -503,16 +503,16 @@ function build_poll_add_form (src_el) - {L_BOT_AFTER_SPLIT_TO_OLD} + {L_BOT_AFTER_SPLIT_TO_OLD} - {L_BOT_AFTER_SPLIT_TO_NEW} + {L_BOT_AFTER_SPLIT_TO_NEW} - - - + + + {L_CONFIRM} - checked="checked" disabled="disabled" /> + checked disabled /> {L_QR_NOTIFY} diff --git a/styles/templates/default/viewtopic_attach.tpl b/styles/templates/default/viewtopic_attach.tpl index 8b68184a2..0e27a0344 100644 --- a/styles/templates/default/viewtopic_attach.tpl +++ b/styles/templates/default/viewtopic_attach.tpl @@ -111,7 +111,7 @@ } - » {L_SELECT_ACTION} + » {L_SELECT_ACTION} {L_DELETE_TORRENT} {L_DELETE_MOVE_TORRENT} @@ -239,7 +239,7 @@ } - » {L_SELECT_ACTION} + » {L_SELECT_ACTION} {L_DELETE_TORRENT} {L_DELETE_MOVE_TORRENT} diff --git a/tracker.php b/tracker.php index 5e40f9fc0..b1a6aa981 100644 --- a/tracker.php +++ b/tracker.php @@ -811,7 +811,7 @@ if (IS_AM && $bb_cfg['tracker']['search_by_tor_status']) { foreach (array_chunk($bb_cfg['tor_icons'], 2, true) as $statuses_part) { $statuses .= ''; foreach ($statuses_part as $status_id => $status_styles) { - $checked = (is_countable($status) && in_array($status_id, $status)) ? 'checked="checked"' : ''; + $checked = (is_countable($status) && in_array($status_id, $status)) ? 'checked' : ''; $statuses .= '' . $status_styles . ' ' . $lang['TOR_STATUS_NAME'][$status_id] . ''; } $statuses .= ''; diff --git a/viewtopic.php b/viewtopic.php index fcd71a56b..9ca0e010c 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -775,7 +775,7 @@ if ($bb_cfg['show_quick_reply']) { 'QUICK_REPLY' => true, 'QR_POST_ACTION' => POSTING_URL, 'QR_TOPIC_ID' => $topic_id, - 'CAPTCHA_HTML' => (IS_GUEST) ? bb_captcha('get') : '', + 'CAPTCHA_HTML' => (IS_GUEST && !$bb_cfg['captcha']['disabled']) ? bb_captcha('get') : '', )); if (!IS_GUEST) {
{L_LEAVE_SHADOW_TOPIC}
{L_BOT_LEAVE_MSG_MOVED}
- {new_posts.POSTER} -
+ {new_posts.POSTER} +
- {T_INDEX} - » {FORUM_NAME} - » {POSTING_TOPIC_TITLE} + {T_INDEX} + » {FORUM_NAME} + » {POSTING_TOPIC_TITLE}
{L_MESSAGE}
{L_OPTIONS}
- {review.POSTER} -
+ {review.POSTER} +
' . $status_styles . ' ' . $lang['TOR_STATUS_NAME'][$status_id] . '