github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-19 21:03:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "Replaced some 'switch' with the 'match' expression (#1147)"

Browse source 
This reverts commit 4cea325b6c.
This commit is contained in:
Roman Kelesidis 2023-11-21 09:37:05 +07:00
commit ed3e28827b
11 changed files with 176 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,7 +5,6 @@
**Merged pull requests:** **Merged pull requests:**
- Replaced some 'switch' with the 'match' expression [\#1147](https://github.com/torrentpier/torrentpier/pull/1147) ([belomaxorka](https://github.com/belomaxorka))
- Vote button code improvements [\#1140](https://github.com/torrentpier/torrentpier/pull/1140), [\#1142](https://github.com/torrentpier/torrentpier/pull/1142), [\#1143](https://github.com/torrentpier/torrentpier/pull/1143), [\#1146](https://github.com/torrentpier/torrentpier/pull/1146) ([belomaxorka](https://github.com/belomaxorka)) - Vote button code improvements [\#1140](https://github.com/torrentpier/torrentpier/pull/1140), [\#1142](https://github.com/torrentpier/torrentpier/pull/1142), [\#1143](https://github.com/torrentpier/torrentpier/pull/1143), [\#1146](https://github.com/torrentpier/torrentpier/pull/1146) ([belomaxorka](https://github.com/belomaxorka))
- Vote button and v2 file list topic url display [\#1138](https://github.com/torrentpier/torrentpier/pull/1138) ([kovalensky](https://github.com/kovalensky)) - Vote button and v2 file list topic url display [\#1138](https://github.com/torrentpier/torrentpier/pull/1138) ([kovalensky](https://github.com/kovalensky))
- Removed topic watch useless code [\#1137](https://github.com/torrentpier/torrentpier/pull/1137) ([belomaxorka](https://github.com/belomaxorka)) - Removed topic watch useless code [\#1137](https://github.com/torrentpier/torrentpier/pull/1137) ([belomaxorka](https://github.com/belomaxorka))

24
library/ajax/post_mod_comment.php
View file

@ -46,13 +46,23 @@ if ($mc_type && $post['poster_id'] != $userdata['user_id']) {
\TorrentPier\Sessions::cache_rm_user_sessions($post['poster_id']); \TorrentPier\Sessions::cache_rm_user_sessions($post['poster_id']);
} }
$mc_class = match ($mc_type) { switch ($mc_type) {
1 => 'success', case 1: // Комментарий
2 => 'info', $mc_class = 'success';
3 => 'warning', break;
4 => 'danger', case 2: // Информация
default => '', $mc_class = 'info';
}; break;
case 3: // Предупреждение
$mc_class = 'warning';
break;
case 4: // Нарушение
$mc_class = 'danger';
break;
default:
$mc_class = '';
break;
}
$this->response['mc_type'] = $mc_type; $this->response['mc_type'] = $mc_type;
$this->response['post_id'] = $post_id; $this->response['post_id'] = $post_id;

31
library/attach_mod/includes/functions_thumbs.php
View file

@ -132,15 +132,28 @@ function create_thumbnail($source, $new_file, $mimetype)
$type = get_supported_image_types($type); $type = get_supported_image_types($type);
if ($type['gd']) { if ($type['gd']) {
$image = match ($type['format']) { switch ($type['format']) {
IMG_GIF => imagecreatefromgif($source), case IMG_GIF:
IMG_JPG => imagecreatefromjpeg($source), $image = imagecreatefromgif($source);
IMG_PNG => imagecreatefrompng($source), break;
IMG_BMP => imagecreatefrombmp($source), case IMG_JPG:
IMG_WBMP => imagecreatefromwbmp($source), $image = imagecreatefromjpeg($source);
IMG_WEBP => imagecreatefromwebp($source), break;
default => throw new Exception('Unknown file format: ' . $type['format']), case IMG_PNG:
}; $image = imagecreatefrompng($source);
break;
case IMG_BMP:
$image = imagecreatefrombmp($source);
break;
case IMG_WBMP:
$image = imagecreatefromwbmp($source);
break;
case IMG_WEBP:
$image = imagecreatefromwebp($source);
break;
default:
throw new Exception('Unknown file format: ' . $type['format']);
}
if ($type['version'] == 1 || !$attach_config['use_gd2']) { if ($type['version'] == 1 || !$attach_config['use_gd2']) {
$new_image = imagecreate($new_width, $new_height); $new_image = imagecreate($new_width, $new_height);

73
library/includes/functions.php
View file

@ -384,14 +384,30 @@ function auth($type, $forum_id, $ug_data, array $f_access = [], $group_perm = UG
if (!isset($f_data[$auth_type])) { if (!isset($f_data[$auth_type])) {
continue; continue;
} }
$auth[$f_id][$auth_type] = match ($f_data[$auth_type]) { switch ($f_data[$auth_type]) {
AUTH_ALL => true, case AUTH_ALL:
AUTH_REG => !$is_guest, $auth[$f_id][$auth_type] = true;
AUTH_ACL => (auth_check('forum_perm', $auth_type, $u_access, $f_id, $is_admin) || $auth[$f_id]['auth_mod']), break;
AUTH_MOD => $auth[$f_id]['auth_mod'],
AUTH_ADMIN => $is_admin, case AUTH_REG:
default => false, $auth[$f_id][$auth_type] = !$is_guest;
}; break;
case AUTH_ACL:
$auth[$f_id][$auth_type] = (auth_check('forum_perm', $auth_type, $u_access, $f_id, $is_admin) || $auth[$f_id]['auth_mod']);
break;
case AUTH_MOD:
$auth[$f_id][$auth_type] = $auth[$f_id]['auth_mod'];
break;
case AUTH_ADMIN:
$auth[$f_id][$auth_type] = $is_admin;
break;
default:
$auth[$f_id][$auth_type] = false;
}
if ($add_auth_type_desc) { if ($add_auth_type_desc) {
$auth[$f_id][$auth_type . '_type'] =& $lang['AUTH_TYPES'][$f_data[$auth_type]]; $auth[$f_id][$auth_type . '_type'] =& $lang['AUTH_TYPES'][$f_data[$auth_type]];
} }
@ -929,13 +945,22 @@ function get_db_stat($mode)
$row = DB()->sql_fetchrow($result); $row = DB()->sql_fetchrow($result);
return match ($mode) { switch ($mode) {
'usercount' => $row['total'], case 'usercount':
'newestuser' => $row, return $row['total'];
'postcount' => $row['post_total'], break;
'topiccount' => $row['topic_total'], case 'newestuser':
default => false, return $row;
}; break;
case 'postcount':
return $row['post_total'];
break;
case 'topiccount':
return $row['topic_total'];
break;
}
return false;
} }
function clean_username($username) function clean_username($username)
@ -1976,11 +2001,19 @@ function gender_image($gender): string
return $user_gender; return $user_gender;
} }
return match ($gender) { switch ($gender) {
MALE => '<img src="' . $images['icon_male'] . '" alt="' . $lang['GENDER_SELECT'][MALE] . '" title="' . $lang['GENDER_SELECT'][MALE] . '" border="0" />', case MALE:
FEMALE => '<img src="' . $images['icon_female'] . '" alt="' . $lang['GENDER_SELECT'][FEMALE] . '" title="' . $lang['GENDER_SELECT'][FEMALE] . '" border="0" />', $user_gender = '<img src="' . $images['icon_male'] . '" alt="' . $lang['GENDER_SELECT'][MALE] . '" title="' . $lang['GENDER_SELECT'][MALE] . '" border="0" />';
default => '<img src="' . $images['icon_nogender'] . '" alt="' . $lang['GENDER_SELECT'][NOGENDER] . '" title="' . $lang['GENDER_SELECT'][NOGENDER] . '" border="0" />', break;
}; case FEMALE:
$user_gender = '<img src="' . $images['icon_female'] . '" alt="' . $lang['GENDER_SELECT'][FEMALE] . '" title="' . $lang['GENDER_SELECT'][FEMALE] . '" border="0" />';
break;
default:
$user_gender = '<img src="' . $images['icon_nogender'] . '" alt="' . $lang['GENDER_SELECT'][NOGENDER] . '" title="' . $lang['GENDER_SELECT'][NOGENDER] . '" border="0" />';
break;
}
return $user_gender;
} }
function is_gold($type): string function is_gold($type): string

24
posting.php
View file

@ -205,13 +205,23 @@ if (!$is_auth[$is_auth_type]) {
bb_die(sprintf($lang['SORRY_' . strtoupper($is_auth_type)], $is_auth[$is_auth_type . '_type'])); bb_die(sprintf($lang['SORRY_' . strtoupper($is_auth_type)], $is_auth[$is_auth_type . '_type']));
} }
$redirect = match ($mode) { switch ($mode) {
'newtopic' => "mode=newtopic&f=$forum_id", case 'newtopic':
'new_rel' => "mode=new_rel&f=$forum_id", $redirect = "mode=newtopic&f=$forum_id";
'reply' => "mode=reply&t=$topic_id", break;
'quote', 'editpost' => "mode=quote&p=$post_id", case 'new_rel':
default => '', $redirect = "mode=new_rel&f=$forum_id";
}; break;
case 'reply':
$redirect = "mode=reply&t=$topic_id";
break;
case 'quote':
case 'editpost':
$redirect = "mode=quote&p=$post_id";
break;
default:
$redirect = '';
}
redirect(LOGIN_URL . "?redirect=/" . POSTING_URL . "?$redirect"); redirect(LOGIN_URL . "?redirect=/" . POSTING_URL . "?$redirect");
} }

20
privmsg.php
View file

@ -1335,12 +1335,20 @@ if ($mode == 'read') {
$template->assign_var('PM_BOX_SIZE_INFO'); $template->assign_var('PM_BOX_SIZE_INFO');
$l_box_size_status = match ($folder) { switch ($folder) {
'inbox' => sprintf($lang['INBOX_SIZE'], $box_limit_percent), case 'inbox':
'sentbox' => sprintf($lang['SENTBOX_SIZE'], $box_limit_percent), $l_box_size_status = sprintf($lang['INBOX_SIZE'], $box_limit_percent);
'savebox' => sprintf($lang['SAVEBOX_SIZE'], $box_limit_percent), break;
default => '', case 'sentbox':
}; $l_box_size_status = sprintf($lang['SENTBOX_SIZE'], $box_limit_percent);
break;
case 'savebox':
$l_box_size_status = sprintf($lang['SAVEBOX_SIZE'], $box_limit_percent);
break;
default:
$l_box_size_status = '';
break;
}
} }
// //

14
src/Ajax.php
View file

@ -293,11 +293,15 @@ class Ajax
} }
foreach (debug_backtrace() as $trace) { foreach (debug_backtrace() as $trace) {
if (!empty($trace['file']) && $trace['file'] !== __FILE__) { if (!empty($trace['file']) && $trace['file'] !== __FILE__) {
return match ($mode) { switch ($mode) {
'file' => $trace['file'], case 'file':
'line' => $trace['line'], return $trace['file'];
default => hide_bb_path($trace['file']) . '(' . $trace['line'] . ')', case 'line':
}; return $trace['line'];
case 'all':
default:
return hide_bb_path($trace['file']) . '(' . $trace['line'] . ')';
}
} }
} }
return 'src not found'; return 'src not found';

14
src/Legacy/Cache/Common.php
View file

@ -100,11 +100,15 @@ class Common
} }
foreach (debug_backtrace() as $trace) { foreach (debug_backtrace() as $trace) {
if (!empty($trace['file']) && $trace['file'] !== __FILE__) { if (!empty($trace['file']) && $trace['file'] !== __FILE__) {
return match ($mode) { switch ($mode) {
'file' => $trace['file'], case 'file':
'line' => $trace['line'], return $trace['file'];
default => hide_bb_path($trace['file']) . '(' . $trace['line'] . ')', case 'line':
}; return $trace['line'];
case 'all':
default:
return hide_bb_path($trace['file']) . '(' . $trace['line'] . ')';
}
} }
} }
return 'src not found'; return 'src not found';

14
src/Legacy/Datastore/Common.php
View file

@ -174,11 +174,15 @@ class Common
} }
foreach (debug_backtrace() as $trace) { foreach (debug_backtrace() as $trace) {
if (!empty($trace['file']) && $trace['file'] !== __FILE__) { if (!empty($trace['file']) && $trace['file'] !== __FILE__) {
return match ($mode) { switch ($mode) {
'file' => $trace['file'], case 'file':
'line' => $trace['line'], return $trace['file'];
default => hide_bb_path($trace['file']) . '(' . $trace['line'] . ')', case 'line':
}; return $trace['line'];
case 'all':
default:
return hide_bb_path($trace['file']) . '(' . $trace['line'] . ')';
}
} }
} }
return 'src not found'; return 'src not found';

14
src/Legacy/SqlDb.php
View file

@ -854,11 +854,15 @@ class SqlDb
} }
foreach (debug_backtrace() as $trace) { foreach (debug_backtrace() as $trace) {
if (!empty($trace['file']) && $trace['file'] !== __FILE__) { if (!empty($trace['file']) && $trace['file'] !== __FILE__) {
return match ($mode) { switch ($mode) {
'file' => $trace['file'], case 'file':
'line' => $trace['line'], return $trace['file'];
default => hide_bb_path($trace['file']) . '(' . $trace['line'] . ')', case 'line':
}; return $trace['line'];
case 'all':
default:
return hide_bb_path($trace['file']) . '(' . $trace['line'] . ')';
}
} }
} }
return 'src not found'; return 'src not found';

24
viewtopic.php
View file

@ -666,13 +666,23 @@ 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
$mc_class = match ($mc_type) { switch ($mc_type) {
1 => 'success', case 1: // Комментарий
2 => 'info', $mc_class = 'success';
3 => 'warning', break;
4 => 'danger', case 2: // Информация
default => '', $mc_class = 'info';
}; 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'];