mirror of
https://github.com/torrentpier/torrentpier
synced 2025-08-22 14:23:57 -07:00
refactor: replace $bb_cfg with config() in various admin files
- Updated multiple admin files to utilize the new Config class for configuration access. - Replaced instances of $bb_cfg with config()->get() for improved maintainability and consistency. - Ensured backward compatibility while transitioning to the new configuration system. Files modified: - common.php - index.php - admin_attach_cp.php - admin_log.php - admin_mass_email.php - admin_sitemap.php - admin_smilies.php - admin_terms.php - admin_user_search.php - admin_words.php - admin/index.php - admin/stats/tracker.php
This commit is contained in:
Yury Pikhtarev
parent
ab640b9d25
commit
b0230c3598
12 changed files with 38 additions and 38 deletions
|
|
@ -69,44 +69,44 @@ $order_by = '';
|
|||
if ($view === 'username') {
|
||||
switch ($mode) {
|
||||
case 'username':
|
||||
$order_by = 'ORDER BY u.username ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY u.username ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
case 'attachments':
|
||||
$order_by = 'ORDER BY total_attachments ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY total_attachments ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
case 'filesize':
|
||||
$order_by = 'ORDER BY total_size ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY total_size ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
default:
|
||||
$mode = 'attachments';
|
||||
$sort_order = 'DESC';
|
||||
$order_by = 'ORDER BY total_attachments ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY total_attachments ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
}
|
||||
} elseif ($view === 'attachments') {
|
||||
switch ($mode) {
|
||||
case 'real_filename':
|
||||
$order_by = 'ORDER BY a.real_filename ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY a.real_filename ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
case 'comment':
|
||||
$order_by = 'ORDER BY a.comment ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY a.comment ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
case 'extension':
|
||||
$order_by = 'ORDER BY a.extension ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY a.extension ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
case 'filesize':
|
||||
$order_by = 'ORDER BY a.filesize ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY a.filesize ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
case 'downloads':
|
||||
$order_by = 'ORDER BY a.download_count ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY a.download_count ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
case 'post_time':
|
||||
$order_by = 'ORDER BY a.filetime ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY a.filetime ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
default:
|
||||
$mode = 'a.real_filename';
|
||||
$sort_order = 'ASC';
|
||||
$order_by = 'ORDER BY a.real_filename ' . $sort_order . ' LIMIT ' . $start . ', ' . $bb_cfg['topics_per_page'];
|
||||
$order_by = 'ORDER BY a.real_filename ' . $sort_order . ' LIMIT ' . $start . ', ' . config()->get('topics_per_page');
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -470,8 +470,8 @@ if ($view === 'attachments') {
|
|||
}
|
||||
|
||||
// Generate Pagination
|
||||
if ($do_pagination && $total_rows > $bb_cfg['topics_per_page']) {
|
||||
generate_pagination('admin_attach_cp.php?view=' . $view . '&mode=' . $mode . '&order=' . $sort_order . '&uid=' . $uid, $total_rows, $bb_cfg['topics_per_page'], $start);
|
||||
if ($do_pagination && $total_rows > config()->get('topics_per_page')) {
|
||||
generate_pagination('admin_attach_cp.php?view=' . $view . '&mode=' . $mode . '&order=' . $sort_order . '&uid=' . $uid, $total_rows, config()->get('topics_per_page'), $start);
|
||||
}
|
||||
|
||||
print_page('admin_attach_cp.tpl', 'admin');
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ if ($var =& $_REQUEST[$daysback_key] && $var != $def_days) {
|
|||
$url = url_arg($url, $daysback_key, $daysback_val);
|
||||
}
|
||||
if ($var =& $_REQUEST[$datetime_key] && $var != $def_datetime) {
|
||||
$tz = TIMENOW + (3600 * $bb_cfg['board_timezone']);
|
||||
$tz = TIMENOW + (3600 * config()->get('board_timezone'));
|
||||
if (($tmp_timestamp = strtotime($var, $tz)) > 0) {
|
||||
$datetime_val = $tmp_timestamp;
|
||||
$url = url_arg($url, $datetime_key, date($dt_format, $datetime_val));
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ if (!empty($setmodules)) {
|
|||
|
||||
require __DIR__ . '/pagestart.php';
|
||||
|
||||
if (!$bb_cfg['emailer']['enabled']) {
|
||||
if (!config()->get('emailer.enabled')) {
|
||||
bb_die($lang['EMAILER_DISABLED']);
|
||||
}
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ set_time_limit(1200);
|
|||
$subject = trim(request_var('subject', ''));
|
||||
$message = (string)request_var('message', '');
|
||||
$group_id = (int)request_var(POST_GROUPS_URL, 0);
|
||||
$reply_to = (string)request_var('reply_to', $bb_cfg['board_email']);
|
||||
$reply_to = (string)request_var('reply_to', config()->get('board_email'));
|
||||
$message_type = (string)request_var('message_type', '');
|
||||
|
||||
$errors = $user_id_sql = [];
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ if (!$result = DB()->sql_query($sql)) {
|
|||
}
|
||||
}
|
||||
|
||||
$s_mess = $lang['SITEMAP_CREATED'] . ': <b>' . bb_date($new['sitemap_time'], $bb_cfg['post_date_format']) . '</b> ' . $lang['SITEMAP_AVAILABLE'] . ': <a href="' . make_url('sitemap/sitemap.xml') . '" target="_blank">' . make_url('sitemap/sitemap.xml') . '</a>';
|
||||
$s_mess = $lang['SITEMAP_CREATED'] . ': <b>' . bb_date($new['sitemap_time'], config()->get('post_date_format')) . '</b> ' . $lang['SITEMAP_AVAILABLE'] . ': <a href="' . make_url('sitemap/sitemap.xml') . '" target="_blank">' . make_url('sitemap/sitemap.xml') . '</a>';
|
||||
$message = is_file(SITEMAP_DIR . '/sitemap.xml') ? $s_mess : $lang['SITEMAP_NOT_CREATED'];
|
||||
|
||||
$template->assign_vars([
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ if ($mode == 'delete' && isset($_POST['cancel'])) {
|
|||
$mode = '';
|
||||
}
|
||||
|
||||
$pathToSmilesDir = BB_ROOT . $bb_cfg['smilies_path'];
|
||||
$pathToSmilesDir = BB_ROOT . config()->get('smilies_path');
|
||||
$delimeter = '=+:';
|
||||
$s_hidden_fields = '';
|
||||
$smiley_paks = $smiley_images = [];
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@ require INC_DIR . '/bbcode.php';
|
|||
|
||||
$preview = isset($_POST['preview']);
|
||||
|
||||
if (isset($_POST['post']) && ($bb_cfg['terms'] !== $_POST['message'])) {
|
||||
if (isset($_POST['post']) && (config()->get('terms') !== $_POST['message'])) {
|
||||
bb_update_config(['terms' => $_POST['message']]);
|
||||
bb_die($lang['TERMS_UPDATED_SUCCESSFULLY'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_TERMS_CONFIG'], '<a href="admin_terms.php">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'));
|
||||
}
|
||||
|
||||
$template->assign_vars([
|
||||
'S_ACTION' => 'admin_terms.php',
|
||||
'EXT_LINK_NW' => $bb_cfg['ext_link_new_win'],
|
||||
'MESSAGE' => $preview ? $_POST['message'] : $bb_cfg['terms'],
|
||||
'EXT_LINK_NW' => config()->get('ext_link_new_win'),
|
||||
'MESSAGE' => $preview ? $_POST['message'] : config()->get('terms'),
|
||||
'PREVIEW_HTML' => $preview ? bbcode2html($_POST['message']) : '',
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -841,10 +841,10 @@ if (!isset($_REQUEST['dosearch'])) {
|
|||
if ($page == 1) {
|
||||
$offset = 0;
|
||||
} else {
|
||||
$offset = (($page - 1) * $bb_cfg['topics_per_page']);
|
||||
$offset = (($page - 1) * config()->get('topics_per_page'));
|
||||
}
|
||||
|
||||
$limit = "LIMIT $offset, " . $bb_cfg['topics_per_page'];
|
||||
$limit = "LIMIT $offset, " . config()->get('topics_per_page');
|
||||
|
||||
$select_sql .= " $limit";
|
||||
|
||||
|
|
@ -859,7 +859,7 @@ if (!isset($_REQUEST['dosearch'])) {
|
|||
bb_die($lang['SEARCH_NO_RESULTS']);
|
||||
}
|
||||
}
|
||||
$num_pages = ceil($total_pages['total'] / $bb_cfg['topics_per_page']);
|
||||
$num_pages = ceil($total_pages['total'] / config()->get('topics_per_page'));
|
||||
|
||||
$pagination = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ if (!empty($setmodules)) {
|
|||
|
||||
require __DIR__ . '/pagestart.php';
|
||||
|
||||
if (!$bb_cfg['use_word_censor']) {
|
||||
bb_die('Word censor disabled <br /><br /> ($bb_cfg[\'use_word_censor\'] in config.php)');
|
||||
if (!config()->get('use_word_censor')) {
|
||||
bb_die('Word censor disabled <br /><br /> (use_word_censor in config.php)');
|
||||
}
|
||||
|
||||
$mode = request_var('mode', '');
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
|
|||
} elseif (isset($_GET['pane']) && $_GET['pane'] == 'right') {
|
||||
$template->assign_vars([
|
||||
'TPL_ADMIN_MAIN' => true,
|
||||
'ADMIN_LOCK' => (bool)$bb_cfg['board_disable'],
|
||||
'ADMIN_LOCK' => (bool)config()->get('board_disable'),
|
||||
'ADMIN_LOCK_CRON' => is_file(BB_DISABLED),
|
||||
]);
|
||||
|
||||
|
|
@ -98,8 +98,8 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
|
|||
$total_posts = $stats['postcount'];
|
||||
$total_topics = $stats['topiccount'];
|
||||
$total_users = $stats['usercount'];
|
||||
$start_date = bb_date($bb_cfg['board_startdate']);
|
||||
$boarddays = (TIMENOW - $bb_cfg['board_startdate']) / 86400;
|
||||
$start_date = bb_date(config()->get('board_startdate'));
|
||||
$boarddays = (TIMENOW - config()->get('board_startdate')) / 86400;
|
||||
|
||||
$posts_per_day = sprintf('%.2f', $total_posts / $boarddays);
|
||||
$topics_per_day = sprintf('%.2f', $total_topics / $boarddays);
|
||||
|
|
@ -107,10 +107,10 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
|
|||
|
||||
$avatar_dir_size = 0;
|
||||
|
||||
if ($avatar_dir = opendir($bb_cfg['avatars']['upload_path'])) {
|
||||
if ($avatar_dir = opendir(config()->get('avatars.upload_path'))) {
|
||||
while ($file = readdir($avatar_dir)) {
|
||||
if ($file != '.' && $file != '..') {
|
||||
$avatar_dir_size += @filesize($bb_cfg['avatars']['upload_path'] . $file);
|
||||
$avatar_dir_size += @filesize(config()->get('avatars.upload_path') . $file);
|
||||
}
|
||||
}
|
||||
closedir($avatar_dir);
|
||||
|
|
@ -187,7 +187,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
|
|||
'STARTED' => bb_date($onlinerow_reg[$i]['session_start'], 'd-M-Y H:i', false),
|
||||
'LASTUPDATE' => bb_date($onlinerow_reg[$i]['user_session_time'], 'd-M-Y H:i', false),
|
||||
'IP_ADDRESS' => $reg_ip,
|
||||
'U_WHOIS_IP' => $bb_cfg['whois_info'] . $reg_ip,
|
||||
'U_WHOIS_IP' => config()->get('whois_info') . $reg_ip,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -206,7 +206,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
|
|||
'STARTED' => bb_date($onlinerow_guest[$i]['session_start'], 'd-M-Y H:i', false),
|
||||
'LASTUPDATE' => bb_date($onlinerow_guest[$i]['session_time'], 'd-M-Y H:i', false),
|
||||
'IP_ADDRESS' => $guest_ip,
|
||||
'U_WHOIS_IP' => $bb_cfg['whois_info'] . $guest_ip,
|
||||
'U_WHOIS_IP' => config()->get('whois_info') . $guest_ip,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ if (!IS_ADMIN) {
|
|||
$peers_in_last_minutes = [30, 15, 5, 1];
|
||||
$peers_in_last_sec_limit = 300;
|
||||
|
||||
$announce_interval = (int)$bb_cfg['announce_interval'];
|
||||
$announce_interval = (int)config()->get('announce_interval');
|
||||
$stat = [];
|
||||
|
||||
define('TMP_TRACKER_TABLE', 'tmp_tracker');
|
||||
|
|
|
|||
|
|
@ -377,9 +377,9 @@ if (!defined('IN_TRACKER')) {
|
|||
} else {
|
||||
define('DUMMY_PEER', pack('Nn', \TorrentPier\Helpers\IPHelper::ip2long($_SERVER['REMOTE_ADDR']), !empty($_GET['port']) ? (int)$_GET['port'] : random_int(1000, 65000)));
|
||||
|
||||
define('PEER_HASH_EXPIRE', round($bb_cfg['announce_interval'] * (0.85 * $bb_cfg['tracker']['expire_factor'])));
|
||||
define('PEERS_LIST_EXPIRE', round($bb_cfg['announce_interval'] * 0.7));
|
||||
define('SCRAPE_LIST_EXPIRE', round($bb_cfg['scrape_interval'] * 0.7));
|
||||
define('PEER_HASH_EXPIRE', round(config()->get('announce_interval') * (0.85 * config()->get('tracker.expire_factor'))));
|
||||
define('PEERS_LIST_EXPIRE', round(config()->get('announce_interval') * 0.7));
|
||||
define('SCRAPE_LIST_EXPIRE', round(config()->get('scrape_interval') * 0.7));
|
||||
|
||||
define('PEER_HASH_PREFIX', 'peer_');
|
||||
define('PEERS_LIST_PREFIX', 'peers_list_');
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ $template->assign_vars([
|
|||
'TOTAL_TOPICS' => sprintf($lang['POSTED_TOPICS_TOTAL'], $stats['topiccount']),
|
||||
'TOTAL_POSTS' => sprintf($lang['POSTED_ARTICLES_TOTAL'], $stats['postcount']),
|
||||
'TOTAL_USERS' => sprintf($lang['REGISTERED_USERS_TOTAL'], $stats['usercount']),
|
||||
'TOTAL_GENDER' => $bb_cfg['gender'] ? sprintf(
|
||||
'TOTAL_GENDER' => config()->get('gender') ? sprintf(
|
||||
$lang['USERS_TOTAL_GENDER'],
|
||||
$stats['male'],
|
||||
$stats['female'],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue