Replaced some 'switch' with the 'match' expression (#1173)

This commit is contained in:
Roman Kelesidis 2023-11-27 20:21:00 +03:00 committed by GitHub
commit 961bbd6306
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 20 deletions

View file

@ -59,7 +59,7 @@ $mod_admin_login = (IS_AM && !$user->data['session_admin']);
$login_username = ($mod_admin_login) ? $userdata['username'] : ($_POST['login_username'] ?? ''); $login_username = ($mod_admin_login) ? $userdata['username'] : ($_POST['login_username'] ?? '');
$login_password = $_POST['login_password'] ?? ''; $login_password = $_POST['login_password'] ?? '';
// Проверка на неверную комбинацию логин/пароль // Checking for incorrect login/password combination
$need_captcha = false; $need_captcha = false;
if (!$mod_admin_login) { if (!$mod_admin_login) {
$need_captcha = CACHE('bb_login_err')->get('l_err_' . USER_IP); $need_captcha = CACHE('bb_login_err')->get('l_err_' . USER_IP);

View file

@ -429,7 +429,7 @@ if ($can_watch_topic) {
} }
} }
// If we've got a hightlight set pass it on to pagination, // If we've got a highlight set pass it on to pagination,
$pg_url = TOPIC_URL . $topic_id; $pg_url = TOPIC_URL . $topic_id;
$pg_url .= $post_days ? "&postdays=$post_days" : ''; $pg_url .= $post_days ? "&postdays=$post_days" : '';
$pg_url .= ($post_order != 'asc') ? "&postorder=$post_order" : ''; $pg_url .= ($post_order != 'asc') ? "&postorder=$post_order" : '';
@ -573,7 +573,7 @@ for ($i = 0; $i < $total_posts; $i++) {
$poster_joined = !$poster_guest ? $lang['JOINED'] . ': ' . bb_date($postrow[$i]['user_regdate'], 'Y-m-d H:i') : ''; $poster_joined = !$poster_guest ? $lang['JOINED'] . ': ' . bb_date($postrow[$i]['user_regdate'], 'Y-m-d H:i') : '';
$poster_longevity = !$poster_guest ? delta_time($postrow[$i]['user_regdate']) : ''; $poster_longevity = !$poster_guest ? delta_time($postrow[$i]['user_regdate']) : '';
$post_id = $postrow[$i]['post_id']; $post_id = $postrow[$i]['post_id'];
$mc_type = $postrow[$i]['mc_type']; $mc_type = (int)$postrow[$i]['mc_type'];
$mc_comment = $postrow[$i]['mc_comment']; $mc_comment = $postrow[$i]['mc_comment'];
$mc_user_id = profile_url(['username' => $postrow[$i]['mc_username'], 'user_id' => $postrow[$i]['mc_user_id'], 'user_rank' => $postrow[$i]['mc_user_rank']]); $mc_user_id = profile_url(['username' => $postrow[$i]['mc_username'], 'user_id' => $postrow[$i]['mc_user_id'], 'user_rank' => $postrow[$i]['mc_user_rank']]);
@ -666,23 +666,13 @@ for ($i = 0; $i < $total_posts; $i++) {
$pg_row_class = !($i % 2) ? 'row2' : 'row1'; $pg_row_class = !($i % 2) ? 'row2' : 'row1';
// Mod comment // Mod comment
switch ($mc_type) { $mc_class = match ($mc_type) {
case 1: // Комментарий 1 => 'success',
$mc_class = 'success'; 2 => 'info',
break; 3 => 'warning',
case 2: // Информация 4 => 'danger',
$mc_class = 'info'; default => '',
break; };
case 3: // Предупреждение
$mc_class = 'warning';
break;
case 4: // Нарушение
$mc_class = 'danger';
break;
default:
$mc_class = '';
break;
}
$mc_select_type = []; $mc_select_type = [];
foreach ($lang['MC_COMMENT'] as $key => $value) { foreach ($lang['MC_COMMENT'] as $key => $value) {
$mc_select_type[$key] = $value['type']; $mc_select_type[$key] = $value['type'];