From a2e8817b5fdac39be06b7e4fcfe6de7f2b10de66 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Thu, 24 Aug 2023 14:34:28 +0700 Subject: [PATCH] Minor improvements (#863) * Minor improvements * Update posting.tpl * Update posting.tpl * Updated * Update globals.css --- admin/admin_attach_cp.php | 10 +- admin/admin_attachments.php | 24 +- admin/admin_bt_forum_cfg.php | 2 +- admin/admin_extensions.php | 2 +- admin/admin_forumauth.php | 4 +- admin/admin_forumauth_list.php | 2 +- admin/admin_forums.php | 4 +- admin/admin_rebuild_search.php | 6 +- admin/admin_smilies.php | 2 +- admin/admin_ug_auth.php | 4 +- dl.php | 2 +- group.php | 6 +- group_edit.php | 6 +- .../attach_mod/includes/functions_selects.php | 18 +- library/includes/functions.php | 2 +- library/includes/init_bb.php | 8 +- memberlist.php | 6 +- posting.php | 14 +- privmsg.php | 2 +- src/Legacy/Admin/Torrent.php | 2 +- src/Legacy/Post.php | 2 +- src/Legacy/Select.php | 6 +- styles/templates/admin/admin_board.tpl | 76 ++--- styles/templates/admin/admin_bt_forum_cfg.tpl | 2 +- styles/templates/admin/admin_cron.tpl | 22 +- styles/templates/admin/admin_forums.tpl | 4 +- styles/templates/admin/admin_groups.tpl | 4 +- styles/templates/admin/admin_mass_email.tpl | 2 +- .../templates/admin/admin_rebuild_search.tpl | 6 +- styles/templates/admin/admin_smilies.tpl | 2 +- styles/templates/admin/admin_ug_auth.tpl | 4 +- styles/templates/admin/admin_user_search.tpl | 8 +- styles/templates/default/css/globals.css | 2 +- styles/templates/default/group_edit.tpl | 4 +- styles/templates/default/login.tpl | 4 +- styles/templates/default/modcp.tpl | 2 +- styles/templates/default/modcp_split.tpl | 4 +- styles/templates/default/page_header.tpl | 4 +- styles/templates/default/posting.tpl | 304 +++++++++--------- styles/templates/default/posting_editor.tpl | 10 +- styles/templates/default/usercp_register.tpl | 36 +-- styles/templates/default/viewtopic.tpl | 12 +- styles/templates/default/viewtopic_attach.tpl | 4 +- tracker.php | 2 +- viewtopic.php | 2 +- 45 files changed, 326 insertions(+), 328 deletions(-) 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 = ''; @@ -127,7 +127,7 @@ if (count($mode_types_text) > 0) { $select_sort_mode = ''; @@ -135,9 +135,9 @@ if (count($mode_types_text) > 0) { $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 ($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] .= ''; } $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] = ''; 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 = '\n'; $statuslist .= '\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 .= '\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) ? ' ' : ' '; 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 .= ''; @@ -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 .= ''; @@ -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 .= ''; @@ -158,7 +158,7 @@ function size_select($select_name, $size_compare) $select_field = ''; @@ -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_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 .= ''; } 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 = ''; @@ -57,9 +57,9 @@ $select_sort_mode .= ''; $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 .= '