\n";
$atom .= "$title \n";
$atom .= "" . $date . "T$time+00:00 \n";
$atom .= "tag:rto.feed,2000:/$mode/$id \n";
- $atom .= "';
$x = 0;
- foreach ($bb_cfg['templates'] as $folder => $name) {
+ foreach (config('tp.templates') as $folder => $name) {
$selected = '';
if ($folder == $default_style) {
$selected = ' selected="selected"';
@@ -70,5 +68,6 @@ function templates_select($default_style, $select_name = 'tpl_name')
$x++;
}
$templates_select .= ' ';
- return ($x > 1) ? $templates_select : reset($bb_cfg['templates']);
+ $templates = config('tp.templates');
+ return ($x > 1) ? $templates_select : reset($templates);
}
diff --git a/library/includes/functions_torrent.php b/library/includes/functions_torrent.php
index 9fd21df9f..a9f389ebe 100644
--- a/library/includes/functions_torrent.php
+++ b/library/includes/functions_torrent.php
@@ -65,7 +65,7 @@ function torrent_auth_check($forum_id, $poster_id)
function tracker_unregister($attach_id, $mode = '')
{
- global $lang, $bb_cfg;
+ global $lang;
$attach_id = (int)$attach_id;
$post_id = $topic_id = $forum_id = $info_hash = null;
@@ -99,7 +99,7 @@ function tracker_unregister($attach_id, $mode = '')
}
// Unset DL-Type for topic
- if ($bb_cfg['bt_unset_dltype_on_tor_unreg'] && $topic_id) {
+ if (config('tp.bt_unset_dltype_on_tor_unreg') && $topic_id) {
$sql = "UPDATE " . BB_TOPICS . " SET topic_dl_type = " . TOPIC_DL_TYPE_NORMAL . " WHERE topic_id = $topic_id";
if (!$result = OLD_DB()->sql_query($sql)) {
@@ -115,7 +115,7 @@ function tracker_unregister($attach_id, $mode = '')
}
// Ocelot
- if ($bb_cfg['ocelot']['enabled']) {
+ if (config('tp.ocelot.enabled')) {
if ($row = OLD_DB()->fetch_row("SELECT info_hash FROM " . BB_BT_TORRENTS . " WHERE attach_id = $attach_id LIMIT 1")) {
$info_hash = $row['info_hash'];
}
@@ -196,7 +196,7 @@ function change_tor_status($attach_id, $new_tor_status)
// Set gold/silver type for torrent
function change_tor_type($attach_id, $tor_status_gold)
{
- global $topic_id, $lang, $bb_cfg;
+ global $topic_id, $lang;
if (!$torrent = get_torrent_info($attach_id)) {
bb_die($lang['TOR_NOT_FOUND']);
@@ -213,7 +213,7 @@ function change_tor_type($attach_id, $tor_status_gold)
OLD_DB()->query("UPDATE " . BB_BT_TORRENTS . " SET tor_type = $tor_status_gold WHERE topic_id = $topic_id");
// Ocelot
- if ($bb_cfg['ocelot']['enabled']) {
+ if (config('tp.ocelot.enabled')) {
if ($row = OLD_DB()->fetch_row("SELECT info_hash FROM " . BB_BT_TORRENTS . " WHERE topic_id = $topic_id LIMIT 1")) {
$info_hash = $row['info_hash'];
}
@@ -223,7 +223,7 @@ function change_tor_type($attach_id, $tor_status_gold)
function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED, $reg_time = TIMENOW)
{
- global $bb_cfg, $lang, $reg_mode;
+ global $lang, $reg_mode;
$attach_id = (int)$attach_id;
$reg_mode = $mode;
@@ -269,18 +269,18 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
return torrent_error_exit('This is not a bencoded file');
}
- if ($bb_cfg['bt_disable_dht']) {
+ if (config('tp.bt_disable_dht')) {
$tor['info']['private'] = (int)1;
$fp = fopen($filename, 'wb+');
fwrite($fp, \Rych\Bencode\Bencode::encode($tor));
fclose($fp);
}
- if ($bb_cfg['bt_check_announce_url']) {
+ if (config('tp.bt_check_announce_url')) {
include INC_DIR . '/torrent_announce_urls.php';
$ann = (@$tor['announce']) ? $tor['announce'] : '';
- $announce_urls['main_url'] = $bb_cfg['bt_announce_url'];
+ $announce_urls['main_url'] = config('tp.bt_announce_url');
if (!$ann || !in_array($ann, $announce_urls)) {
$msg = sprintf($lang['INVALID_ANN_URL'], htmlspecialchars($ann), $announce_urls['main_url']);
@@ -299,7 +299,7 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
$info_hash_md5 = md5($info_hash);
// Ocelot
- if ($bb_cfg['ocelot']['enabled']) {
+ if (config('tp.ocelot.enabled')) {
ocelot_update_tracker('add_torrent', array('info_hash' => rawurlencode($info_hash), 'id' => $topic_id, 'freetorrent' => 0));
}
@@ -347,7 +347,7 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
}
// set DL-Type for topic
- if ($bb_cfg['bt_set_dltype_on_tor_reg']) {
+ if (config('tp.bt_set_dltype_on_tor_reg')) {
$sql = 'UPDATE ' . BB_TOPICS . ' SET topic_dl_type = ' . TOPIC_DL_TYPE_DL . " WHERE topic_id = $topic_id";
if (!$result = OLD_DB()->sql_query($sql)) {
@@ -355,7 +355,7 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
}
}
- if ($bb_cfg['tracker']['tor_topic_up']) {
+ if (config('tracker.tor_topic_up')) {
OLD_DB()->query("UPDATE " . BB_TOPICS . " SET topic_last_post_time = GREATEST(topic_last_post_time, " . (TIMENOW - 3 * 86400) . ") WHERE topic_id = $topic_id");
}
@@ -370,9 +370,9 @@ function tracker_register($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED
function send_torrent_with_passkey($filename)
{
- global $attachment, $auth_pages, $userdata, $bb_cfg, $lang;
+ global $attachment, $auth_pages, $userdata, $lang;
- if (!$bb_cfg['bt_add_auth_key'] || $attachment['extension'] !== TORRENT_EXT || !$size = @filesize($filename)) {
+ if (!config('tp.bt_add_auth_key') || $attachment['extension'] !== TORRENT_EXT || !$size = @filesize($filename)) {
return;
}
@@ -380,8 +380,8 @@ function send_torrent_with_passkey($filename)
$user_id = $userdata['user_id'];
$attach_id = $attachment['attach_id'];
- if (!$passkey_key = $bb_cfg['passkey_key']) {
- bb_die('Could not add passkey (wrong config $bb_cfg[\'passkey_key\'])');
+ if (!$passkey_key = config('tp.passkey_key')) {
+ bb_die('Could not add passkey (wrong config $cfg[\'passkey_key\'])');
}
// Get $post_id & $poster_id
@@ -416,13 +416,13 @@ function send_torrent_with_passkey($filename)
if (!$passkey_val) {
if (!$passkey_val = generate_passkey($user_id)) {
bb_simple_die('Could not generate passkey');
- } elseif ($bb_cfg['ocelot']['enabled']) {
+ } elseif (config('tp.ocelot.enabled')) {
ocelot_update_tracker('add_user', array('id' => $user_id, 'passkey' => $passkey_val));
}
}
// Ratio limits
- $min_ratio = $bb_cfg['bt_min_ratio_allow_dl_tor'];
+ $min_ratio = config('tp.bt_min_ratio_allow_dl_tor');
if ($min_ratio && $user_id != $poster_id && ($user_ratio = get_bt_ratio($bt_userdata)) !== null) {
if ($user_ratio < $min_ratio && $post_id) {
@@ -441,43 +441,46 @@ function send_torrent_with_passkey($filename)
}
// Announce URL
- $ann_url = $bb_cfg['bt_announce_url'];
+ $ann_url = config('tp.bt_announce_url');
$file_contents = file_get_contents($filename);
if (!$tor = \Rych\Bencode\Bencode::decode($file_contents)) {
bb_die('This is not a bencoded file');
}
- $announce = $bb_cfg['ocelot']['enabled'] ? (string)($bb_cfg['ocelot']['url'] . $passkey_val . "/announce") : (string)($ann_url . "?$passkey_key=$passkey_val");
+ $announce = config('tp.ocelot.enabled') ? (string)(config('tp.ocelot.url') . $passkey_val . "/announce") : (string)($ann_url . "?$passkey_key=$passkey_val");
// Replace original announce url with tracker default
- if ($bb_cfg['bt_replace_ann_url'] || !isset($tor['announce'])) {
+ if (config('tp.bt_replace_ann_url') || !isset($tor['announce'])) {
$tor['announce'] = $announce;
}
// Delete all additional urls
- if ($bb_cfg['bt_del_addit_ann_urls'] || $bb_cfg['bt_disable_dht']) {
+ if (config('tp.bt_del_addit_ann_urls') || config('tp.bt_disable_dht')) {
unset($tor['announce-list']);
} elseif (isset($tor['announce-list'])) {
$tor['announce-list'] = array_merge($tor['announce-list'], array(array($announce)));
}
// Add retracker
- if (isset($bb_cfg['tracker']['retracker']) && $bb_cfg['tracker']['retracker']) {
+ if (config('tracker.retracker')) {
if (bf($userdata['user_opt'], 'user_opt', 'user_retracker') || IS_GUEST) {
if (!isset($tor['announce-list'])) {
- $tor['announce-list'] = array(
- array($announce),
- array($bb_cfg['tracker']['retracker_host'])
- );
+ $tor['announce-list'] = [
+ [$announce],
+ [config('tracker.retracker_host')]
+ ];
} else {
- $tor['announce-list'] = array_merge($tor['announce-list'], array(array($bb_cfg['tracker']['retracker_host'])));
+ $tor['announce-list'] = array_merge(
+ $tor['announce-list'],
+ [[config('tracker.retracker_host')]]
+ );
}
}
}
// Add publisher & topic url
- $publisher_name = $bb_cfg['server_name'];
+ $publisher_name = config('tp.server_name');
$publisher_url = make_url(TOPIC_URL . $topic_id);
$tor['publisher'] = (string)$publisher_name;
@@ -491,7 +494,7 @@ function send_torrent_with_passkey($filename)
// Send torrent
$output = \Rych\Bencode\Bencode::encode($tor);
- $dl_fname = '[' . $bb_cfg['server_name'] . '].t' . $topic_id . '.torrent';
+ $dl_fname = '[' . config('tp.server_name') . '].t' . $topic_id . '.torrent';
if (!empty($_COOKIE['explain'])) {
$out = "attach path: $filenameGZIP ';
- $gzip_text .= ($bb_cfg['gzip_compress']) ? $lang['ON'] : $lang['OFF'];
+ $gzip_text = UA_GZIP_SUPPORTED ? 'GZIP ' : 'GZIP ';
+ $gzip_text .= config('tp.gzip_compress') ? $lang['ON'] : $lang['OFF'];
$stat = '[ ' . $lang['EXECUTION_TIME'] . " $gen_time_txt " . $lang['SEC'];
@@ -49,7 +49,7 @@ if ($show_dbg_info) {
$stat .= " | $gzip_text";
$stat .= ' | ' . $lang['MEMORY'];
- $stat .= humn_size($bb_cfg['mem_on_start'], 2) . ' / ';
+ $stat .= humn_size(config('tp.mem_on_start'), 2) . ' / ';
$stat .= humn_size(sys('mem_peak'), 2) . ' / ';
$stat .= humn_size(sys('mem'), 2);
@@ -87,7 +87,7 @@ echo '
if (defined('REQUESTED_PAGE') && !defined('DISABLE_CACHING_OUTPUT')) {
if (IS_GUEST === true) {
- caching_output(true, 'store', REQUESTED_PAGE . '_guest_' . $bb_cfg['default_lang']);
+ caching_output(true, 'store', REQUESTED_PAGE . '_guest_' . config('tp.default_lang'));
}
}
diff --git a/library/includes/page_header.php b/library/includes/page_header.php
index 82b6729b6..50ac8169d 100644
--- a/library/includes/page_header.php
+++ b/library/includes/page_header.php
@@ -16,7 +16,7 @@ if (defined('PAGE_HEADER_SENT')) {
// Parse and show the overall page header
-global $page_cfg, $userdata, $user, $ads, $bb_cfg, $template, $lang, $images;
+global $page_cfg, $userdata, $user, $ads, $template, $lang, $images;
$logged_in = (int)!empty($userdata['session_logged_in']);
@@ -50,7 +50,7 @@ if (defined('SHOW_ONLINE') && SHOW_ONLINE) {
'TOTAL_USERS_ONLINE' => ${$online_list}['stat'],
'LOGGED_IN_USER_LIST' => ${$online_list}['userlist'],
'USERS_ONLINE_COUNTS' => ${$online_list}['cnt'],
- 'RECORD_USERS' => sprintf($lang['RECORD_ONLINE_USERS'], $bb_cfg['record_online_users'], bb_date($bb_cfg['record_online_date'])),
+ 'RECORD_USERS' => sprintf($lang['RECORD_ONLINE_USERS'], config('tp.record_online_users'), bb_date(config('tp.record_online_date'))),
));
}
@@ -121,9 +121,9 @@ $template->assign_vars(array(
'USE_TABLESORTER' => !empty($page_cfg['use_tablesorter']),
- 'SITENAME' => $bb_cfg['sitename'],
+ 'SITENAME' => config('tp.sitename'),
'U_INDEX' => BB_ROOT . "index.php",
- 'T_INDEX' => sprintf($lang['FORUM_INDEX'], $bb_cfg['sitename']),
+ 'T_INDEX' => sprintf($lang['FORUM_INDEX'], config('tp.sitename')),
'IS_GUEST' => IS_GUEST,
'IS_USER' => IS_USER,
@@ -134,9 +134,9 @@ $template->assign_vars(array(
'FORUM_PATH' => FORUM_PATH,
'FULL_URL' => FULL_URL,
- 'CURRENT_TIME' => sprintf($lang['CURRENT_TIME'], bb_date(TIMENOW, $bb_cfg['last_visit_date_format'], false)),
- 'S_TIMEZONE' => preg_replace('/\(.*?\)/', '', sprintf($lang['ALL_TIMES'], $lang['TZ'][str_replace(',', '.', (float)$bb_cfg['board_timezone'])])),
- 'BOARD_TIMEZONE' => $bb_cfg['board_timezone'],
+ 'CURRENT_TIME' => sprintf($lang['CURRENT_TIME'], bb_date(TIMENOW, config('tp.last_visit_date_format'), false)),
+ 'S_TIMEZONE' => preg_replace('/\(.*?\)/', '', sprintf($lang['ALL_TIMES'], $lang['TZ'][str_replace(',', '.', (float)config('tp.board_timezone'))])),
+ 'BOARD_TIMEZONE' => config('tp.board_timezone'),
'PM_INFO' => $pm_info,
'PRIVMSG_IMG' => $icon_pm,
@@ -147,7 +147,7 @@ $template->assign_vars(array(
'THIS_USER' => profile_url($userdata),
'THIS_AVATAR' => get_avatar($userdata['user_id'], $userdata['avatar_ext_id'], !bf($userdata['user_opt'], 'user_opt', 'dis_avatar')),
'SHOW_LOGIN_LINK' => !defined('IN_LOGIN'),
- 'AUTOLOGIN_DISABLED' => !$bb_cfg['allow_autologin'],
+ 'AUTOLOGIN_DISABLED' => !config('tp.allow_autologin'),
'S_LOGIN_ACTION' => LOGIN_URL,
'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'],
@@ -163,11 +163,11 @@ $template->assign_vars(array(
'U_REGISTER' => "profile.php?mode=register",
'U_SEARCH' => "search.php",
'U_SEND_PASSWORD' => "profile.php?mode=sendpassword",
- 'U_TERMS' => $bb_cfg['terms_and_conditions_url'],
+ 'U_TERMS' => config('tp.terms_and_conditions_url'),
'U_TRACKER' => "tracker.php",
- 'SHOW_SIDEBAR1' => !empty(config('page.show_sidebar1.' . BB_SCRIPT)) || $bb_cfg['show_sidebar1_on_every_page'],
- 'SHOW_SIDEBAR2' => !empty(config('page.show_sidebar2.' . BB_SCRIPT)) || $bb_cfg['show_sidebar2_on_every_page'],
+ 'SHOW_SIDEBAR1' => !empty(config('page.show_sidebar1.' . BB_SCRIPT)) || config('tp.show_sidebar1_on_every_page'),
+ 'SHOW_SIDEBAR2' => !empty(config('page.show_sidebar2.' . BB_SCRIPT)) || config('tp.show_sidebar2_on_every_page'),
'HTML_AGREEMENT' => LANG_DIR . 'html/user_agreement.html',
'HTML_COPYRIGHT' => LANG_DIR . 'html/copyright_holders.html',
@@ -181,11 +181,11 @@ $template->assign_vars(array(
'DOWNLOAD_URL' => BB_ROOT . DOWNLOAD_URL,
'FORUM_URL' => BB_ROOT . FORUM_URL,
'GROUP_URL' => BB_ROOT . GROUP_URL,
- 'LOGIN_URL' => $bb_cfg['login_url'],
+ 'LOGIN_URL' => config('tp.login_url'),
'NEWEST_URL' => '&view=newest#newest',
- 'PM_URL' => $bb_cfg['pm_url'],
+ 'PM_URL' => config('tp.pm_url'),
'POST_URL' => BB_ROOT . POST_URL,
- 'POSTING_URL' => $bb_cfg['posting_url'],
+ 'POSTING_URL' => config('tp.posting_url'),
'PROFILE_URL' => BB_ROOT . PROFILE_URL,
'TOPIC_URL' => BB_ROOT . TOPIC_URL,
@@ -206,7 +206,45 @@ $template->assign_vars(array(
'SELECTED' => HTML_SELECTED,
'U_SEARCH_SELF_BY_LAST' => "search.php?uid={$userdata['user_id']}&o=5",
- 'U_WATCHED_TOPICS' => "profile.php?mode=watch",
+ 'U_WATCHED_TOPICS' => 'profile.php?mode=watch',
+
+ /** TODO: конфигурация используемая в шаблонах, избавиться */
+ 'CFG_GS_ENABLED' => config('tracker.gold_silver_enabled'),
+ 'CFG_UAU' => config('tp.user_agreement_url'),
+ 'CFG_CHU' => config('tp.copyright_holders_url'),
+ 'CFG_SHU' => config('tp.search_help_url'),
+ 'CFG_AU' => config('tp.advert_url'),
+ 'CFG_SB_E' => config('tp.seed_bonus_enabled'),
+ 'CFG_USE_AP' => config('tp.use_ajax_posts'),
+ 'CFG_JS_VER' => config('tp.js_ver'),
+ 'CFG_CSS_VER' => config('tp.css_ver'),
+ 'CFG_SCRIPT_PATH' => config('tp.script_path'),
+ 'CFG_COOKIE_DOMAIN' => config('tp.cookie_domain'),
+ 'CFG_COOKIE_PREFIX' => config('tp.cookie_prefix'),
+ 'CFG_COOKIE_SECURE' => config('tp.cookie_secure'),
+ 'CFG_TOR_COMMENT' => config('tp.tor_comment'),
+ 'CFG_AV_MS' => config('tp.avatars.max_size'),
+ 'CFG_AV_UA' => config('tp.avatars.up_allowed'),
+ 'CFG_GA_MS' => config('tp.group_avatars.max_size'),
+ 'CFG_GA_UA' => config('tp.group_avatars.up_allowed'),
+ 'CFG_PM_NE' => config('tp.pm_notify_enabled'),
+ 'CFG_AC_LANG' => config('tp.allow_change.language'),
+ 'CFG_BIRTH_E' => config('tp.birthday_enabled'),
+ 'CFG_GENDER' => config('tp.gender'),
+ 'CFG_EMAIL_E' => config('tp.email.enabled'),
+ 'CFG_REQ_EA' => config('tp.reg_email_activation'),
+ 'CFG_TOR_STATS' => config('tp.tor_stats'),
+ 'CFG_SEARCH_ET' => config('tp.search_engine_type'),
+ 'CFG_TB_ONLY_REG' => config('tp.bt_tor_browse_only_reg'),
+ 'CFG_RTU_HELP' => config('tp.ratio_url_help'),
+ 'CFG_WIT_HELP' => config('tp.what_is_torrent_url_help'),
+ 'CFG_HTD_HELP' => config('tp.how_to_download_url_help'),
+ 'CFG_MAX_PO' => config('tp.max_poll_options'),
+ 'CFG_LOG_DK' => config('tp.log_days_keep'),
+ 'CFG_AJAX_URL' => config('tp.ajax_url'),
+ 'CFG_TP_RD' => config('tp.tp_release_date'),
+ 'CFG_TP_CN' => config('tp.tp_release_codename'),
+ 'CFG_TP_VER' => config('tp.tp_version'),
));
if (!empty(config('page.show_torhelp.' . BB_SCRIPT)) && !empty($userdata['torhelp'])) {
@@ -250,6 +288,6 @@ $template->pparse('page_header');
define('PAGE_HEADER_SENT', true);
-if (!$bb_cfg['gzip_compress']) {
+if (!config('tp.gzip_compress')) {
flush();
}
diff --git a/library/includes/sessions.php b/library/includes/sessions.php
index ae50a7cb4..bf625b997 100644
--- a/library/includes/sessions.php
+++ b/library/includes/sessions.php
@@ -39,14 +39,12 @@ function cache_get_userdata($id)
function cache_set_userdata($userdata, $force = false)
{
- global $bb_cfg;
-
if (!$userdata || (ignore_cached_userdata() && !$force)) {
return false;
}
$id = ($userdata['user_id'] == GUEST_UID) ? $userdata['session_ip'] : $userdata['session_id'];
- return OLD_CACHE('session_cache')->set($id, $userdata, $bb_cfg['session_update_intrv']);
+ return OLD_CACHE('session_cache')->set($id, $userdata, config('tp.session_update_intrv'));
}
function cache_rm_userdata($userdata)
diff --git a/library/includes/torrent_show_dl_list.php b/library/includes/torrent_show_dl_list.php
index 0855110a3..57d2192d1 100644
--- a/library/includes/torrent_show_dl_list.php
+++ b/library/includes/torrent_show_dl_list.php
@@ -21,11 +21,11 @@ $dl_users_div_style_overflow = "padding: 6px; height: $dl_users_overflow_div_hei
$template->assign_vars(array('DL_BUTTONS' => false));
-$count_mode = ($bb_cfg['bt_dl_list_only_count'] && !(@$_GET['dl'] === 'names'));
+$count_mode = (config('tp.bt_dl_list_only_count') && !(@$_GET['dl'] === 'names'));
-$dl_topic = ($t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL && !($bb_cfg['bt_dl_list_only_1st_page'] && $start));
-$show_dl_list = ($dl_topic && ($bb_cfg['bt_show_dl_list'] || ($bb_cfg['allow_dl_list_names_mode'] && @$_GET['dl'] === 'names')));
-$show_dl_buttons = ($dl_topic && $bb_cfg['bt_show_dl_list_buttons']);
+$dl_topic = ($t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL && !(config('tp.bt_dl_list_only_1st_page') && $start));
+$show_dl_list = ($dl_topic && (config('tp.bt_show_dl_list') || (config('tp.allow_dl_list_names_mode') && @$_GET['dl'] === 'names')));
+$show_dl_buttons = ($dl_topic && config('tp.bt_show_dl_list_buttons'));
// link to clear DL-List
$template->assign_vars(array('S_DL_DELETE' => false));
@@ -106,10 +106,10 @@ if ($show_dl_list) {
if ($show_dl_buttons) {
$template->assign_vars(array(
'DL_BUTTONS' => true,
- 'DL_BUT_WILL' => $bb_cfg['bt_show_dl_but_will'],
- 'DL_BUT_DOWN' => $bb_cfg['bt_show_dl_but_down'],
- 'DL_BUT_COMPL' => $bb_cfg['bt_show_dl_but_compl'],
- 'DL_BUT_CANCEL' => $bb_cfg['bt_show_dl_but_cancel'],
+ 'DL_BUT_WILL' => config('tp.bt_show_dl_but_will'),
+ 'DL_BUT_DOWN' => config('tp.bt_show_dl_but_down'),
+ 'DL_BUT_COMPL' => config('tp.bt_show_dl_but_compl'),
+ 'DL_BUT_CANCEL' => config('tp.bt_show_dl_but_cancel'),
));
$dl_hidden_fields = '
diff --git a/library/includes/ucp/bonus.php b/library/includes/ucp/bonus.php
index 6c99c8db3..3634fee40 100644
--- a/library/includes/ucp/bonus.php
+++ b/library/includes/ucp/bonus.php
@@ -14,9 +14,9 @@ if (!defined('BB_ROOT')) {
$user_id = $userdata['user_id'];
$user_points = $userdata['user_points'];
-if ($bb_cfg['seed_bonus_enabled'] && $bb_cfg['bonus_upload'] && $bb_cfg['bonus_upload_price']) {
- $upload_row = unserialize($bb_cfg['bonus_upload']);
- $price_row = unserialize($bb_cfg['bonus_upload_price']);
+if (config('tp.seed_bonus_enabled') && config('tp.bonus_upload') && config('tp.bonus_upload_price')) {
+ $upload_row = unserialize(config('tp.bonus_upload'));
+ $price_row = unserialize(config('tp.bonus_upload_price'));
} else {
bb_die($lang['EXCHANGE_NOT']);
}
diff --git a/library/includes/ucp/email.php b/library/includes/ucp/email.php
index a9b562500..e999b0c86 100644
--- a/library/includes/ucp/email.php
+++ b/library/includes/ucp/email.php
@@ -12,8 +12,8 @@ if (!defined('BB_ROOT')) {
}
// Is send through board enabled? No, return to index
-if (!$bb_cfg['board_email_form']) {
- redirectToUrl("index.php");
+if (!config('tp.board_email_form')) {
+ redirectToUrl('index.php');
}
set_die_append_msg();
@@ -62,7 +62,7 @@ if ($row = OLD_DB()->fetch_row($sql)) {
$emailer->set_template('profile_send_email', $user_lang);
$emailer->assign_vars(array(
- 'SITENAME' => $bb_cfg['sitename'],
+ 'SITENAME' => config('tp.sitename'),
'FROM_USERNAME' => $userdata['username'],
'TO_USERNAME' => $username,
'MESSAGE' => $message,
diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 2d724f1c4..b3f856351 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -16,7 +16,7 @@ array_deep($_POST, 'trim');
set_die_append_msg();
if (IS_ADMIN) {
- $bb_cfg['reg_email_activation'] = false;
+ config(['tp.reg_email_activation' => false]);
$new_user = (int)request_var('admin', '');
if ($new_user) {
@@ -54,16 +54,16 @@ switch ($mode) {
if (!IS_ADMIN) {
// Ограничение по ip
- if ($bb_cfg['unique_ip']) {
+ if (config('tp.unique_ip')) {
if ($users = OLD_DB()->fetch_row("SELECT user_id, username FROM " . BB_USERS . " WHERE user_reg_ip = '" . USER_IP . "' LIMIT 1")) {
- bb_die(sprintf($lang['ALREADY_REG_IP'], '' . $users['username'] . ' ' . $users['username'] . ' ' . $profiledata['user_email'] . ' ';
} else {
$email = '';
@@ -61,7 +61,7 @@ if (bf($profiledata['user_opt'], 'user_opt', 'user_viewemail') || $profiledata['
$profile_user_id = ($profiledata['user_id'] == $userdata['user_id']);
-$signature = ($bb_cfg['allow_sig'] && $profiledata['user_sig']) ? $profiledata['user_sig'] : '';
+$signature = (config('tp.allow_sig') && $profiledata['user_sig']) ? $profiledata['user_sig'] : '';
if (bf($profiledata['user_opt'], 'user_opt', 'dis_sig')) {
if ($profile_user_id) {
@@ -97,9 +97,9 @@ $template->assign_vars(array(
'SKYPE' => $profiledata['user_skype'],
'TWITTER' => $profiledata['user_twitter'],
'USER_POINTS' => $profiledata['user_points'],
- 'GENDER' => ($bb_cfg['gender']) ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '',
- 'BIRTHDAY' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '',
- 'AGE' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '',
+ 'GENDER' => config('tp.gender') ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '',
+ 'BIRTHDAY' => (config('tp.birthday_enabled') && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '',
+ 'AGE' => (config('tp.birthday_enabled') && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '',
'L_VIEWING_PROFILE' => sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']),
'L_MY_PROFILE' => sprintf($lang['VIEWING_MY_PROFILE'], 'profile.php?mode=editprofile'),
diff --git a/library/language/en/html/advert.html b/library/language/en/html/advert.html
index 6a85d2fe2..64c85175d 100644
--- a/library/language/en/html/advert.html
+++ b/library/language/en/html/advert.html
@@ -1,4 +1,4 @@
Advertising on our site
-
For advertising please contact:
+
For advertising please contact:
diff --git a/library/language/en/html/copyright_holders.html b/library/language/en/html/copyright_holders.html
index 4a37337dc..430812d9c 100644
--- a/library/language/en/html/copyright_holders.html
+++ b/library/language/en/html/copyright_holders.html
@@ -22,11 +22,11 @@ which indicated to us the following information:
After that in 48 hours, we will remove interesting you links from the site.
-Our email:
+Our email:
WARNING!
-a) We reserve the right to publish on the site of any information sent to us by mail
+a) We reserve the right to publish on the site of any information sent to us by mail
b) We have no control over the actions of users who may be re-post links to information, which is the object of your copyright. Any information the forum, place automatically, without any control from any quarter whatsoever, which corresponds to the generally accepted international practice of placing information on the Internet. However, in any case, we consider all your queries regarding the reference to the information that violates your rights.
diff --git a/library/language/en/main.php b/library/language/en/main.php
index bf33a9a7c..8dc92960a 100644
--- a/library/language/en/main.php
+++ b/library/language/en/main.php
@@ -2276,7 +2276,7 @@ $lang['TRACKER_CFG_TITLE'] = 'Tracker';
$lang['FORUM_CFG_TITLE'] = 'Forum settings';
$lang['TRACKER_SETTINGS'] = 'Tracker settings';
-$lang['CHANGES_DISABLED'] = 'Changes disabled (see $bb_cfg[\'tracker\'] in config.php)';
+$lang['CHANGES_DISABLED'] = 'Changes disabled (see config/tracker.php )';
$lang['OFF_TRACKER'] = 'Disable tracker';
$lang['OFF_REASON'] = 'Disable reason';
diff --git a/library/language/source/html/advert.html b/library/language/source/html/advert.html
index 6a85d2fe2..64c85175d 100644
--- a/library/language/source/html/advert.html
+++ b/library/language/source/html/advert.html
@@ -1,4 +1,4 @@
Advertising on our site
-
For advertising please contact:
+
For advertising please contact:
diff --git a/library/language/source/html/copyright_holders.html b/library/language/source/html/copyright_holders.html
index 4a37337dc..430812d9c 100644
--- a/library/language/source/html/copyright_holders.html
+++ b/library/language/source/html/copyright_holders.html
@@ -22,11 +22,11 @@ which indicated to us the following information:
After that in 48 hours, we will remove interesting you links from the site.
-Our email:
+Our email:
WARNING!
-a) We reserve the right to publish on the site of any information sent to us by mail
+a) We reserve the right to publish on the site of any information sent to us by mail
b) We have no control over the actions of users who may be re-post links to information, which is the object of your copyright. Any information the forum, place automatically, without any control from any quarter whatsoever, which corresponds to the generally accepted international practice of placing information on the Internet. However, in any case, we consider all your queries regarding the reference to the information that violates your rights.
diff --git a/library/language/source/main.php b/library/language/source/main.php
index df76e2f76..a75d7400b 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -2260,7 +2260,7 @@ $lang['TRACKER_CFG_TITLE'] = 'Tracker';
$lang['FORUM_CFG_TITLE'] = 'Forum settings';
$lang['TRACKER_SETTINGS'] = 'Tracker settings';
-$lang['CHANGES_DISABLED'] = 'Changes disabled (see $bb_cfg[\'tracker\'] in config.php)';
+$lang['CHANGES_DISABLED'] = 'Changes disabled (see config/tracker.php )';
$lang['OFF_TRACKER'] = 'Disable tracker';
$lang['OFF_REASON'] = 'Disable reason';
diff --git a/login.php b/login.php
index 7093071f2..a7fbe24df 100644
--- a/login.php
+++ b/login.php
@@ -63,7 +63,7 @@ $login_password = $_POST['login_password'] ?? '';
$need_captcha = false;
if (!$mod_admin_login) {
$need_captcha = OLD_CACHE('bb_login_err')->get('l_err_' . USER_IP);
- if ($need_captcha < $bb_cfg['invalid_logins']) {
+ if ($need_captcha < config('tp.invalid_logins')) {
$need_captcha = false;
}
}
@@ -80,13 +80,13 @@ if (isset($_POST['login'])) {
}
// Captcha
- if ($need_captcha && !bb_captcha('check') && !$bb_cfg['captcha']['disabled']) {
+ if ($need_captcha && !bb_captcha('check') && !config('tp.captcha.disabled')) {
$login_errors[] = $lang['CAPTCHA_WRONG'];
}
if (!$login_errors) {
if ($user->login($_POST, $mod_admin_login)) {
- $redirect_url = (defined('FIRST_LOGON')) ? $bb_cfg['first_logon_redirect_url'] : $redirect_url;
+ $redirect_url = defined('FIRST_LOGON') ? config('tp.first_logon_redirect_url') : $redirect_url;
// Обнуление при введении правильно комбинации логин/пароль
OLD_CACHE('bb_login_err')->set('l_err_' . USER_IP, 0, 3600);
@@ -100,7 +100,7 @@ if (isset($_POST['login'])) {
if (!$mod_admin_login) {
$login_err = OLD_CACHE('bb_login_err')->get('l_err_' . USER_IP);
- if ($login_err > $bb_cfg['invalid_logins']) {
+ if ($login_err > config('tp.invalid_logins')) {
$need_captcha = true;
}
OLD_CACHE('bb_login_err')->set('l_err_' . USER_IP, ($login_err + 1), 3600);
@@ -118,7 +118,7 @@ if (IS_GUEST || $mod_admin_login) {
'ERROR_MESSAGE' => implode('' . $lang['SEND_PM_TXTB'] . ' ';
if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || IS_ADMIN) {
- $email_uri = $bb_cfg['board_email_form'] ? ("profile.php?mode=email&" . POST_USERS_URL . "=$user_id") : 'mailto:' . $row['user_email'];
+ $email_uri = config('tp.board_email_form') ? ('profile.php?mode=email&' . POST_USERS_URL . "=$user_id") : 'mailto:' . $row['user_email'];
$email = '' . $row['user_email'] . ' ';
} else {
$email = '';
@@ -199,7 +199,7 @@ $paginationurl = "memberlist.php?mode=$mode&order=$sort_order&letter=$by
if ($paginationusername) {
$paginationurl .= "&username=$paginationusername";
}
-if ($mode != 'topten' || $bb_cfg['topics_per_page'] < 10) {
+if ($mode != 'topten' || config('tp.topics_per_page') < 10) {
$sql = "SELECT COUNT(*) AS total FROM " . BB_USERS;
$sql .= ($letter_sql) ? " WHERE $letter_sql" : " WHERE user_id NOT IN(". EXCLUDED_USERS .")";
if (!$result = OLD_DB()->sql_query($sql)) {
@@ -207,7 +207,7 @@ if ($mode != 'topten' || $bb_cfg['topics_per_page'] < 10) {
}
if ($total = OLD_DB()->sql_fetchrow($result)) {
$total_members = $total['total'];
- generate_pagination($paginationurl, $total_members, $bb_cfg['topics_per_page'], $start);
+ generate_pagination($paginationurl, $total_members, config('tp.topics_per_page'), $start);
}
OLD_DB()->sql_freeresult($result);
}
diff --git a/modcp.php b/modcp.php
index 39119a67d..6e3d568ca 100644
--- a/modcp.php
+++ b/modcp.php
@@ -225,14 +225,14 @@ switch ($mode) {
$result = topic_delete($req_topics, $forum_id);
//Обновление кеша новостей на главной
- $news_forums = array_flip(explode(',', $bb_cfg['latest_news_forum_id']));
- if (isset($news_forums[$forum_id]) && $bb_cfg['show_latest_news'] && $result) {
+ $news_forums = array_flip(explode(',', config('tp.latest_news_forum_id')));
+ if (isset($news_forums[$forum_id]) && config('tp.show_latest_news') && $result) {
$datastore->enqueue('latest_news');
$datastore->update('latest_news');
}
- $net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id']));
- if (isset($net_forums[$forum_id]) && $bb_cfg['show_network_news'] && $result) {
+ $net_forums = array_flip(explode(',', config('tp.network_news_forum_id')));
+ if (isset($net_forums[$forum_id]) && config('tp.show_network_news') && $result) {
$datastore->enqueue('network_news');
$datastore->update('network_news');
}
@@ -256,14 +256,14 @@ switch ($mode) {
$result = topic_move($req_topics, $new_forum_id, $forum_id, isset($_POST['move_leave_shadow']), isset($_POST['insert_bot_msg']));
//Обновление кеша новостей на главной
- $news_forums = array_flip(explode(',', $bb_cfg['latest_news_forum_id']));
- if ((isset($news_forums[$forum_id]) || isset($news_forums[$new_forum_id])) && $bb_cfg['show_latest_news'] && $result) {
+ $news_forums = array_flip(explode(',', config('tp.latest_news_forum_id')));
+ if ((isset($news_forums[$forum_id]) || isset($news_forums[$new_forum_id])) && config('tp.show_latest_news') && $result) {
$datastore->enqueue('latest_news');
$datastore->update('latest_news');
}
- $net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id']));
- if ((isset($net_forums[$forum_id]) || isset($net_forums[$new_forum_id])) && $bb_cfg['show_network_news'] && $result) {
+ $net_forums = array_flip(explode(',', config('tp.network_news_forum_id')));
+ if ((isset($net_forums[$forum_id]) || isset($net_forums[$new_forum_id])) && config('tp.show_network_news') && $result) {
$datastore->enqueue('network_news');
$datastore->update('network_news');
}
diff --git a/poll.php b/poll.php
index b6fcb7c04..3248e56b3 100644
--- a/poll.php
+++ b/poll.php
@@ -43,8 +43,8 @@ if ($mode != 'poll_vote') {
// проверка на возможность вносить изменения
if ($mode == 'poll_delete') {
- if ($t_data['topic_time'] < TIMENOW - $bb_cfg['poll_max_days'] * 86400) {
- bb_die(sprintf($lang['NEW_POLL_DAYS'], $bb_cfg['poll_max_days']));
+ if ($t_data['topic_time'] < TIMENOW - config('tp.poll_max_days') * 86400) {
+ bb_die(sprintf($lang['NEW_POLL_DAYS'], config('tp.poll_max_days')));
}
if (!IS_ADMIN && ($t_data['topic_vote'] != POLL_FINISHED)) {
bb_die($lang['CANNOT_DELETE_POLL']);
diff --git a/posting.php b/posting.php
index 6edc543fe..437b37164 100644
--- a/posting.php
+++ b/posting.php
@@ -225,7 +225,7 @@ if (!$is_auth[$is_auth_type]) {
}
if ($mode == 'new_rel') {
- if ($tor_status = implode(',', $bb_cfg['tor_cannot_new'])) {
+ if ($tor_status = implode(',', config('tp.tor_cannot_new'))) {
$sql = OLD_DB()->fetch_rowset("SELECT t.topic_title, t.topic_id, tor.tor_status
FROM " . BB_BT_TORRENTS . " tor, " . BB_TOPICS . " t
WHERE poster_id = {$userdata['user_id']}
@@ -236,7 +236,7 @@ if ($mode == 'new_rel') {
$topics = '';
foreach ($sql as $row) {
- $topics .= $bb_cfg['tor_icons'][$row['tor_status']] . '' . $row['topic_title'] . '
';
+ $topics .= config('tp.tor_icons.' . $row['tor_status']) . '' . $row['topic_title'] . '
';
}
if ($topics) {
bb_die($topics . $lang['UNEXECUTED_RELEASE']);
@@ -273,7 +273,7 @@ if (!IS_GUEST && $mode != 'newtopic' && ($submit || $preview || $mode == 'quote'
AND pt.post_id = p.post_id
AND p.post_time > $topic_last_read
ORDER BY p.post_time
- LIMIT " . $bb_cfg['posts_per_page'];
+ LIMIT " . config('tp.posts_per_page');
if ($rowset = OLD_DB()->fetch_rowset($sql)) {
$topic_has_new_posts = true;
@@ -283,7 +283,7 @@ if (!IS_GUEST && $mode != 'newtopic' && ($submit || $preview || $mode == 'quote'
'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
'POSTER' => profile_url($row),
'POSTER_NAME_JS' => addslashes($row['username']),
- 'POST_DATE' => bb_date($row['post_time'], $bb_cfg['post_date_format']),
+ 'POST_DATE' => bb_date($row['post_time'], config('tp.post_date_format')),
'MESSAGE' => get_parsed_post($row),
));
}
@@ -365,10 +365,10 @@ if (($delete || $mode == 'delete') && !$confirm) {
set_tracks(COOKIE_TOPIC, $tracking_topics, $topic_id);
}
- if (defined('TORRENT_ATTACH_ID') && $bb_cfg['bt_newtopic_auto_reg'] && !$error_msg) {
+ if (defined('TORRENT_ATTACH_ID') && config('tp.bt_newtopic_auto_reg') && !$error_msg) {
include INC_DIR . '/functions_torrent.php';
if (!OLD_DB()->fetch_row("SELECT attach_id FROM " . BB_BT_TORRENTS . " WHERE attach_id = " . TORRENT_ATTACH_ID)) {
- if ($bb_cfg['premod']) {
+ if (config('tp.premod')) {
// Получение списка id форумов начиная с parent
$forum_parent = $forum_id;
if ($post_info['forum_parent']) {
diff --git a/privmsg.php b/privmsg.php
index 8df644ad9..fc648c108 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -24,7 +24,7 @@ $page_cfg['load_tpl_vars'] = array(
//
// Is PM disabled?
//
-if ($bb_cfg['privmsg_disable']) {
+if (config('tp.privmsg_disable')) {
bb_die('PM_DISABLED');
}
@@ -32,14 +32,14 @@ if ($bb_cfg['privmsg_disable']) {
// Parameters
//
$submit = (bool)request_var('post', false);
-$submit_search = (isset($_POST['usersubmit'])) ? true : 0;
-$submit_msgdays = (isset($_POST['submit_msgdays'])) ? true : 0;
-$cancel = (isset($_POST['cancel'])) ? true : 0;
-$preview = (isset($_POST['preview'])) ? true : 0;
-$confirmed = (isset($_POST['confirm'])) ? true : 0;
-$delete = (isset($_POST['delete'])) ? true : 0;
-$delete_all = (isset($_POST['deleteall'])) ? true : 0;
-$save = (isset($_POST['save'])) ? true : 0;
+$submit_search = isset($_POST['usersubmit']) ? true : 0;
+$submit_msgdays = isset($_POST['submit_msgdays']) ? true : 0;
+$cancel = isset($_POST['cancel']) ? true : 0;
+$preview = isset($_POST['preview']) ? true : 0;
+$confirmed = isset($_POST['confirm']) ? true : 0;
+$delete = isset($_POST['delete']) ? true : 0;
+$delete_all = isset($_POST['deleteall']) ? true : 0;
+$save = isset($_POST['save']) ? true : 0;
$mode = isset($_REQUEST['mode']) ? (string)$_REQUEST['mode'] : '';
$refresh = $preview || $submit_search;
@@ -59,7 +59,7 @@ $user->session_start(array('req_login' => true));
$template->assign_vars(array(
'IN_PM' => true,
- 'QUICK_REPLY' => $bb_cfg['show_quick_reply'] && $folder == 'inbox' && $mode == 'read',
+ 'QUICK_REPLY' => config('tp.show_quick_reply') && $folder == 'inbox' && $mode == 'read',
));
//
@@ -200,7 +200,7 @@ if ($mode == 'read') {
}
if ($sent_info = OLD_DB()->sql_fetchrow($result)) {
- if ($bb_cfg['max_sentbox_privmsgs'] && $sent_info['sent_items'] >= $bb_cfg['max_sentbox_privmsgs']) {
+ if (config('tp.max_sentbox_privmsgs') && $sent_info['sent_items'] >= config('tp.max_sentbox_privmsgs')) {
$sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . "
AND privmsgs_date = " . $sent_info['oldest_post_time'] . "
@@ -609,7 +609,7 @@ if ($mode == 'read') {
}
if ($saved_info = OLD_DB()->sql_fetchrow($result)) {
- if ($bb_cfg['max_savebox_privmsgs'] && $saved_info['savebox_items'] >= $bb_cfg['max_savebox_privmsgs']) {
+ if (config('tp.max_savebox_privmsgs') && $saved_info['savebox_items'] >= config('tp.max_savebox_privmsgs')) {
$sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . "
AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
@@ -754,7 +754,7 @@ if ($mode == 'read') {
$last_post_time = $db_row['last_post_time'];
$current_time = TIMENOW;
- if (($current_time - $last_post_time) < $bb_cfg['flood_interval']) {
+ if (($current_time - $last_post_time) < config('tp.flood_interval')) {
bb_die($lang['FLOOD_ERROR']);
}
}
@@ -832,7 +832,7 @@ if ($mode == 'read') {
}
if ($inbox_info = OLD_DB()->sql_fetchrow($result)) {
- if ($bb_cfg['max_inbox_privmsgs'] && $inbox_info['inbox_items'] >= $bb_cfg['max_inbox_privmsgs']) {
+ if (config('tp.max_inbox_privmsgs') && $inbox_info['inbox_items'] >= config('tp.max_inbox_privmsgs')) {
$sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
OR privmsgs_type = " . PRIVMSGS_READ_MAIL . "
@@ -900,11 +900,11 @@ if ($mode == 'read') {
cache_rm_user_sessions($to_userdata['user_id']);
- if (bf($to_userdata['user_opt'], 'user_opt', 'user_notify_pm') && $to_userdata['user_active'] && $bb_cfg['pm_notify_enabled']) {
+ if (bf($to_userdata['user_opt'], 'user_opt', 'user_notify_pm') && $to_userdata['user_active'] && config('tp.pm_notify_enabled')) {
/** @var TorrentPier\Legacy\Emailer() $emailer */
$emailer = new TorrentPier\Legacy\Emailer();
- $emailer->set_from([$bb_cfg['board_email'] => $bb_cfg['sitename']]);
+ $emailer->set_from([config('tp.board_email') => config('tp.sitename')]);
$emailer->set_to([$to_userdata['user_email'] => $to_userdata['username']]);
$emailer->set_subject($lang['EMAILER_SUBJECT']['PRIVMSG_NOTIFY']);
@@ -913,7 +913,7 @@ if ($mode == 'read') {
'USERNAME' => html_entity_decode($to_username),
'NAME_FROM' => $userdata['username'],
'MSG_SUBJECT' => html_entity_decode($privmsg_subject),
- 'SITENAME' => $bb_cfg['sitename'],
+ 'SITENAME' => config('tp.sitename'),
'U_INBOX' => make_url(PM_URL . "?folder=inbox&mode=read&p=$privmsg_sent_id"),
));
@@ -1262,7 +1262,7 @@ if ($mode == 'read') {
$msg_days = 0;
}
- $sql .= $limit_msg_time . " ORDER BY pm.privmsgs_date DESC LIMIT $start, " . $bb_cfg['topics_per_page'];
+ $sql .= $limit_msg_time . " ORDER BY pm.privmsgs_date DESC LIMIT $start, " . config('tp.topics_per_page');
$sql_all_tot = $sql_tot;
$sql_tot .= $limit_msg_time_total;
@@ -1318,11 +1318,11 @@ if ($mode == 'read') {
// Output data for inbox status
//
$box_limit_img_length = $box_limit_percent = $l_box_size_status = '';
- $max_pm = ($folder != 'outbox') ? $bb_cfg["max_{$folder}_privmsgs"] : null;
+ $max_pm = ($folder != 'outbox') ? config('tp.max_' . $folder . '_privmsgs') : null;
if ($max_pm) {
$box_limit_percent = min(round(($pm_all_total / $max_pm) * 100), 100);
- $box_limit_img_length = min(round(($pm_all_total / $max_pm) * $bb_cfg['privmsg_graphic_length']), $bb_cfg['privmsg_graphic_length']);
+ $box_limit_img_length = min(round(($pm_all_total / $max_pm) * config('tp.privmsg_graphic_length')), config('tp.privmsg_graphic_length'));
$box_limit_remain = max(($max_pm - $pm_all_total), 0);
$template->assign_var('PM_BOX_SIZE_INFO');
@@ -1427,7 +1427,7 @@ if ($mode == 'read') {
));
} while ($row = OLD_DB()->sql_fetchrow($result));
- generate_pagination(PM_URL . "?folder=$folder", $pm_total, $bb_cfg['topics_per_page'], $start);
+ generate_pagination(PM_URL . "?folder=$folder", $pm_total, config('tp.topics_per_page'), $start);
} else {
$template->assign_block_vars("switch_no_messages", array());
}
diff --git a/search.php b/search.php
index a726ade2f..af02db455 100644
--- a/search.php
+++ b/search.php
@@ -19,7 +19,7 @@ $page_cfg['load_tpl_vars'] = array(
'topic_icons',
);
-$user->session_start(array('req_login' => $bb_cfg['disable_search_for_guest']));
+$user->session_start(array('req_login' => config('tp.disable_search_for_guest')));
set_die_append_msg();
@@ -294,7 +294,7 @@ if (empty($_GET) && empty($_POST)) {
'MY_TOPICS_ID' => 'my_topics',
'MY_TOPICS_CHBOX' => build_checkbox($my_topics_key, $lang['SEARCH_MY_TOPICS'], $my_topics_val, true, null, 'my_topics'),
- 'TITLE_ONLY_CHBOX' => build_checkbox($title_only_key, $lang['SEARCH_TITLES_ONLY'], true, $bb_cfg['disable_ft_search_in_posts']),
+ 'TITLE_ONLY_CHBOX' => build_checkbox($title_only_key, $lang['SEARCH_TITLES_ONLY'], true, config('tp.disable_ft_search_in_posts')),
'ALL_WORDS_CHBOX' => build_checkbox($all_words_key, $lang['SEARCH_ALL_WORDS'], true),
'DL_CANCEL_CHBOX' => build_checkbox($dl_cancel_key, $lang['SEARCH_DL_CANCEL'], $dl_cancel_val, IS_GUEST, 'dlCancel'),
'DL_COMPL_CHBOX' => build_checkbox($dl_compl_key, $lang['SEARCH_DL_COMPLETE'], $dl_compl_val, IS_GUEST, 'dlComplete'),
@@ -426,7 +426,7 @@ $prev_days = ($time_val != $search_all);
$new_topics = (!IS_GUEST && ($new_topics_val || isset($_GET['newposts'])));
$my_topics = ($poster_id_val && $my_topics_val);
$my_posts = ($poster_id_val && !$my_topics_val);
-$title_match = ($text_match_sql && ($title_only_val || $bb_cfg['disable_ft_search_in_posts']));
+$title_match = ($text_match_sql && ($title_only_val || config('tp.disable_ft_search_in_posts')));
// "Display as" mode (posts or topics)
$post_mode = (!$dl_search && ($display_as_val == $as_posts || isset($_GET['search_author'])));
@@ -438,7 +438,7 @@ $SQL = OLD_DB()->get_empty_sql_array();
if ($post_mode) {
$order = $order_opt[$order_val]['sql'];
$sort = $sort_opt[$sort_val]['sql'];
- $per_page = $bb_cfg['posts_per_page'];
+ $per_page = config('tp.posts_per_page');
$display_as_val = $as_posts;
// Run initial search for post_ids
@@ -601,7 +601,7 @@ if ($post_mode) {
'POSTER_ID' => $post['poster_id'],
'POSTER' => profile_url($post),
'POST_ID' => $post['post_id'],
- 'POST_DATE' => bb_date($post['post_time'], $bb_cfg['post_date_format']),
+ 'POST_DATE' => bb_date($post['post_time'], config('tp.post_date_format')),
'IS_UNREAD' => is_unread($post['post_time'], $topic_id, $forum_id),
'MESSAGE' => $message,
'POSTED_AFTER' => '',
@@ -620,7 +620,7 @@ if ($post_mode) {
else {
$order = $order_opt[$order_val]['sql'];
$sort = $sort_opt[$sort_val]['sql'];
- $per_page = $bb_cfg['topics_per_page'];
+ $per_page = config('tp.topics_per_page');
$display_as_val = $as_topics;
// Run initial search for topic_ids
@@ -741,7 +741,7 @@ else {
// Build SQL for displaying topics
$SQL = OLD_DB()->get_empty_sql_array();
- $join_dl = ($bb_cfg['show_dl_status_in_search'] && !IS_GUEST);
+ $join_dl = (config('tp.show_dl_status_in_search') && !IS_GUEST);
$SQL['SELECT'][] = "
t.*, t.topic_poster AS first_user_id, u1.user_rank AS first_user_rank,
@@ -798,7 +798,7 @@ else {
'TOPIC_TITLE' => wbr($topic['topic_title']),
'IS_UNREAD' => $is_unread,
'TOPIC_ICON' => get_topic_icon($topic, $is_unread),
- 'PAGINATION' => ($moved) ? '' : build_topic_pagination(TOPIC_URL . $topic_id, $topic['topic_replies'], $bb_cfg['posts_per_page']),
+ 'PAGINATION' => $moved ? '' : build_topic_pagination(TOPIC_URL . $topic_id, $topic['topic_replies'], config('tp.posts_per_page')),
'REPLIES' => $topic['topic_replies'],
'ATTACH' => $topic['topic_attachment'],
'STATUS' => $topic['topic_status'],
@@ -895,16 +895,13 @@ function fetch_search_ids($sql, $search_type = SEARCH_TYPE_POST)
function prevent_huge_searches($SQL)
{
- global $bb_cfg;
-
- if ($bb_cfg['limit_max_search_results']) {
+ if (config('tp.limit_max_search_results')) {
$SQL['select_options'][] = 'SQL_CALC_FOUND_ROWS';
$SQL['ORDER BY'] = array();
$SQL['LIMIT'] = array('0');
if (OLD_DB()->query($SQL) and $row = OLD_DB()->fetch_row("SELECT FOUND_ROWS() AS rows_count")) {
- if ($row['rows_count'] > $bb_cfg['limit_max_search_results']) {
- # bb_log(str_compact(OLD_DB()->build_sql($SQL)) ." [{$row['rows_count']} rows]". LOG_LF, 'sql_huge_search');
+ if ($row['rows_count'] > config('tp.limit_max_search_results')) {
bb_die('Too_many_search_results');
}
}
diff --git a/styles/templates/admin/admin_bt_tracker_cfg.tpl b/styles/templates/admin/admin_bt_tracker_cfg.tpl
index e64cc0758..7c2136d86 100644
--- a/styles/templates/admin/admin_bt_tracker_cfg.tpl
+++ b/styles/templates/admin/admin_bt_tracker_cfg.tpl
@@ -44,12 +44,12 @@
{L_YES}
- {L_AUTH_KEY_NAME} $bb_cfg['passkey_key'] {L_AUTH_KEY_NAME_EXPL} {L_AUTH_KEY_NAME} $cfg['passkey_key'] {L_AUTH_KEY_NAME_EXPL} {PASSKEY_KEY}
{L_ALLOW_GUEST_DL} {L_ALLOW_GUEST_DL_EXPL} {L_NO}{L_YES}
+ {L_NO}{L_YES}
{L_LIMIT_ACTIVE_TOR_HEAD}
@@ -91,7 +91,7 @@
{L_ANNOUNCE_INTERVAL_HEAD}
- {L_ANNOUNCE_INTERVAL} $bb_cfg['announce_interval'] {L_ANNOUNCE_INTERVAL_EXPL} {L_ANNOUNCE_INTERVAL} $cfg['announce_interval'] {L_ANNOUNCE_INTERVAL_EXPL} {ANNOUNCE_INTERVAL} seconds
@@ -114,7 +114,7 @@
- {L_IGNORE_GIVEN_IP} $bb_cfg['ignore_reported_ip'] {L_IGNOR_GIVEN_IP_EXPL} {L_IGNORE_GIVEN_IP} $cfg['ignore_reported_ip'] {L_IGNOR_GIVEN_IP_EXPL} {L_YES}{L_NO}
diff --git a/styles/templates/admin/index.tpl b/styles/templates/admin/index.tpl
index 94db04210..8cb33d813 100644
--- a/styles/templates/admin/index.tpl
+++ b/styles/templates/admin/index.tpl
@@ -117,7 +117,7 @@
{L_UPDATE}:
{L_USER_LEVELS}
- ,
+ ,
{L_INDEXER}
@@ -151,11 +151,11 @@
{L_TP_VERSION}:
- {$bb_cfg['tp_release_codename']} ({$bb_cfg['tp_version']}) {CFG_TP_CN} ({CFG_TP_VER})
{L_TP_RELEASE_DATE}:
- {$bb_cfg['tp_release_date']} {CFG_TP_RD}
 . config('tp.avatars.no_avatar') . '){kind=avatar}
';
break;
default:
$this->ajax_die('Invalid mode');
diff --git a/library/ajax/change_tor_status.php b/library/ajax/change_tor_status.php
index c02c92f69..09fa5983b 100644
--- a/library/ajax/change_tor_status.php
+++ b/library/ajax/change_tor_status.php
@@ -11,7 +11,7 @@ if (!defined('IN_AJAX')) {
die(basename(__FILE__));
}
-global $userdata, $bb_cfg, $lang;
+global $userdata, $lang;
if (!isset($this->request['attach_id'])) {
$this->ajax_die($lang['EMPTY_ATTACH_ID']);
@@ -20,7 +20,7 @@ if (!isset($this->request['attach_id'])) {
$attach_id = (int)$this->request['attach_id'];
$mode = (string)$this->request['mode'];
-if ($bb_cfg['tor_comment']) {
+if (config('tp.tor_comment')) {
$comment = (string)$this->request['comment'];
}
@@ -85,12 +85,12 @@ switch ($mode) {
change_tor_status($attach_id, $new_status);
- $this->response['status'] = $bb_cfg['tor_icons'][$new_status] . ' ' . $lang['TOR_STATUS_NAME'][$new_status] . ' · ' . profile_url($userdata) . ' · ' . delta_time(TIMENOW) . $lang['TOR_BACK'] . '';
+ $this->response['status'] = config('tp.tor_icons.' . $new_status) . ' ' . $lang['TOR_STATUS_NAME'][$new_status] . ' · ' . profile_url($userdata) . ' · ' . delta_time(TIMENOW) . $lang['TOR_BACK'] . '';
- if ($bb_cfg['tor_comment'] && (($comment && $comment != $lang['COMMENT']) || in_array($new_status, $bb_cfg['tor_reply']))) {
+ if (config('tp.tor_comment') && (($comment && $comment != $lang['COMMENT']) || in_array($new_status, config('tp.tor_reply')))) {
if ($tor['poster_id'] > 0) {
$subject = sprintf($lang['TOR_MOD_TITLE'], $tor['topic_title']);
- $message = sprintf($lang['TOR_MOD_MSG'], get_username($tor['poster_id']), make_url(TOPIC_URL . $tor['topic_id']), $bb_cfg['tor_icons'][$new_status] . ' ' . $lang['TOR_STATUS_NAME'][$new_status]);
+ $message = sprintf($lang['TOR_MOD_MSG'], get_username($tor['poster_id']), make_url(TOPIC_URL . $tor['topic_id']), config('tp.tor_icons.' . $new_status) . ' ' . $lang['TOR_STATUS_NAME'][$new_status]);
if ($comment && $comment != $lang['COMMENT']) {
$message .= "\n\n[b]" . $lang['COMMENT'] . '[/b]: ' . $comment;
@@ -103,7 +103,7 @@ switch ($mode) {
break;
case 'status_reply':
- if (!$bb_cfg['tor_comment']) {
+ if (!config('tp.tor_comment')) {
$this->ajax_die($lang['MODULE_OFF']);
}
diff --git a/library/ajax/change_torrent.php b/library/ajax/change_torrent.php
index f366313da..c4d768fba 100644
--- a/library/ajax/change_torrent.php
+++ b/library/ajax/change_torrent.php
@@ -11,7 +11,7 @@ if (!defined('IN_AJAX')) {
die(basename(__FILE__));
}
-global $userdata, $bb_cfg, $lang;
+global $userdata, $lang;
if (!isset($this->request['attach_id'])) {
$this->ajax_die($lang['EMPTY_ATTACH_ID']);
diff --git a/library/ajax/edit_group_profile.php b/library/ajax/edit_group_profile.php
index 0d2684377..0e4951bcc 100644
--- a/library/ajax/edit_group_profile.php
+++ b/library/ajax/edit_group_profile.php
@@ -11,7 +11,7 @@ if (!defined('IN_AJAX')) {
die(basename(__FILE__));
}
-global $bb_cfg, $userdata, $lang;
+global $userdata, $lang;
if (!$group_id = (int)$this->request['group_id'] or !$group_info = get_group_data($group_id)) {
$this->ajax_die($lang['NO_GROUP_ID_SPECIFIED']);
diff --git a/library/ajax/edit_user_profile.php b/library/ajax/edit_user_profile.php
index 7d9396035..01362d530 100644
--- a/library/ajax/edit_user_profile.php
+++ b/library/ajax/edit_user_profile.php
@@ -11,7 +11,7 @@ if (!defined('IN_AJAX')) {
die(basename(__FILE__));
}
-global $bb_cfg, $lang;
+global $lang;
if (!$user_id = (int)$this->request['user_id'] or !$profiledata = get_userdata($user_id)) {
$this->ajax_die($lang['NO_USER_ID_SPECIFIED']);
@@ -51,7 +51,7 @@ switch ($field) {
break;
case 'user_gender':
- if (!$bb_cfg['gender']) {
+ if (!config('tp.gender')) {
$this->ajax_die($lang['MODULE_OFF']);
}
if (!isset($lang['GENDER_SELECT'][$value])) {
@@ -62,7 +62,7 @@ switch ($field) {
break;
case 'user_birthday':
- if (!$bb_cfg['birthday_enabled']) {
+ if (!config('tp.birthday_enabled')) {
$this->ajax_die($lang['MODULE_OFF']);
}
$birthday_date = date_parse($value);
@@ -70,10 +70,10 @@ switch ($field) {
if (!empty($birthday_date['year'])) {
if (strtotime($value) >= TIMENOW) {
$this->ajax_die($lang['WRONG_BIRTHDAY_FORMAT']);
- } elseif (bb_date(TIMENOW, 'Y', 'false') - $birthday_date['year'] > $bb_cfg['birthday_max_age']) {
- $this->ajax_die(sprintf($lang['BIRTHDAY_TO_HIGH'], $bb_cfg['birthday_max_age']));
- } elseif (bb_date(TIMENOW, 'Y', 'false') - $birthday_date['year'] < $bb_cfg['birthday_min_age']) {
- $this->ajax_die(sprintf($lang['BIRTHDAY_TO_LOW'], $bb_cfg['birthday_min_age']));
+ } elseif (bb_date(TIMENOW, 'Y', 'false') - $birthday_date['year'] > config('tp.birthday_max_age')) {
+ $this->ajax_die(sprintf($lang['BIRTHDAY_TO_HIGH'], config('tp.birthday_max_age')));
+ } elseif (bb_date(TIMENOW, 'Y', 'false') - $birthday_date['year'] < config('tp.birthday_min_age')) {
+ $this->ajax_die(sprintf($lang['BIRTHDAY_TO_LOW'], config('tp.birthday_min_age')));
}
}
@@ -110,8 +110,8 @@ switch ($field) {
case 'user_regdate':
case 'user_lastvisit':
- $tz = TIMENOW + (3600 * $bb_cfg['board_timezone']);
- if (($value = strtotime($value, $tz)) < $bb_cfg['board_startdate'] or $value > TIMENOW) {
+ $tz = TIMENOW + (3600 * config('tp.board_timezone'));
+ if (($value = strtotime($value, $tz)) < config('tp.board_startdate') || $value > TIMENOW) {
$this->ajax_die($lang['INVALID_DATE'] . $this->request['value']);
}
$this->response['new_value'] = bb_date($value, 'Y-m-d H:i', false);
diff --git a/library/ajax/index_data.php b/library/ajax/index_data.php
index 7f61aba55..6c8a817ed 100644
--- a/library/ajax/index_data.php
+++ b/library/ajax/index_data.php
@@ -11,7 +11,7 @@ if (!defined('IN_AJAX')) {
die(basename(__FILE__));
}
-global $bb_cfg, $lang, $userdata, $datastore;
+global $lang, $userdata, $datastore;
$mode = (string)$this->request['mode'];
$html = '';
@@ -27,9 +27,9 @@ switch ($mode) {
foreach ($stats['birthday_week_list'] as $week) {
$html[] = profile_url($week) . ' (' . birthday_age($week['user_birthday']) . ')';
}
- $html = sprintf($lang['BIRTHDAY_WEEK'], $bb_cfg['birthday_check_day'], implode(', ', $html));
+ $html = sprintf($lang['BIRTHDAY_WEEK'], config('tp.birthday_check_day'), implode(', ', $html));
} else {
- $html = sprintf($lang['NOBIRTHDAY_WEEK'], $bb_cfg['birthday_check_day']);
+ $html = sprintf($lang['NOBIRTHDAY_WEEK'], config('tp.birthday_check_day'));
}
break;
@@ -86,10 +86,10 @@ switch ($mode) {
if ($tz > 13) {
$tz = 13;
}
- if ($tz != $bb_cfg['board_timezone']) {
+ if ($tz != config('tp.board_timezone')) {
// Set current user timezone
OLD_DB()->query("UPDATE " . BB_USERS . " SET user_timezone = $tz WHERE user_id = " . $userdata['user_id']);
- $bb_cfg['board_timezone'] = $tz;
+ config(['tp.board_timezone' => $tz]);
cache_rm_user_sessions($userdata['user_id']);
}
break;
@@ -110,7 +110,7 @@ switch ($mode) {
 . config('tp.avatars.no_avatar')) . '){kind=avatar}
';
- if ($user_id == BOT_UID && $bb_cfg['avatars']['bot_avatar']) {
- $user_avatar = ' . config('tp.avatars.bot_avatar')) . '){kind=avatar}
';
} elseif ($allow_avatar && $ext_id) {
if (file_exists(get_avatar_path($user_id, $ext_id))) {
- $user_avatar = ')) . '){kind=avatar}
';
}
}
@@ -2033,9 +2012,9 @@ function get_avatar($user_id, $ext_id, $allow_avatar = true, $size = true, $heig
function gender_image($gender)
{
- global $bb_cfg, $lang, $images;
+ global $lang, $images;
- if (!$bb_cfg['gender']) {
+ if (!config('tp.gender')) {
$user_gender = '';
return $user_gender;
}
@@ -2057,9 +2036,9 @@ function gender_image($gender)
function is_gold($type)
{
- global $lang, $bb_cfg;
+ global $lang;
- if (!$bb_cfg['tracker']['gold_silver_enabled']) {
+ if (!config('tracker.gold_silver_enabled')) {
$is_gold = '';
return $is_gold;
}
@@ -2124,11 +2103,11 @@ function hash_search($hash)
*/
function bb_captcha($mode, $callback = '')
{
- global $bb_cfg, $lang;
+ global $lang;
- $secret = $bb_cfg['captcha']['secret_key'];
- $public = $bb_cfg['captcha']['public_key'];
- $cp_theme = $bb_cfg['captcha']['theme'];
+ $secret = config('tp.captcha.secret_key');
+ $public = config('tp.captcha.public_key');
+ $cp_theme = config('tp.captcha.theme');
if (!$public && !$secret) {
bb_die($lang['CAPTCHA_SETTINGS']);
diff --git a/library/includes/functions_admin.php b/library/includes/functions_admin.php
index fe6653637..4494ba320 100644
--- a/library/includes/functions_admin.php
+++ b/library/includes/functions_admin.php
@@ -646,7 +646,7 @@ function post_delete($mode_or_post_id, $user_id = null, $exclude_first = true)
function user_delete($user_id, $delete_posts = false)
{
- global $bb_cfg, $log_action;
+ global $log_action;
if (!$user_csv = get_id_csv($user_id)) {
return false;
@@ -728,7 +728,7 @@ function user_delete($user_id, $delete_posts = false)
// Delete user feed
foreach (explode(',', $user_csv) as $user_id) {
- $file_path = $bb_cfg['atom']['path'] . '/u/' . floor($user_id / 5000) . '/' . ($user_id % 100) . '/' . $user_id . '.atom';
+ $file_path = config('tp.atom.path') . '/u/' . floor($user_id / 5000) . '/' . ($user_id % 100) . '/' . $user_id . '.atom';
@unlink($file_path);
}
}
diff --git a/library/includes/functions_admin_cron.php b/library/includes/functions_admin_cron.php
index 39bf1eb78..a5c6c787b 100644
--- a/library/includes/functions_admin_cron.php
+++ b/library/includes/functions_admin_cron.php
@@ -9,7 +9,7 @@
function run_jobs($jobs)
{
- global $bb_cfg, $datastore;
+ global $datastore;
define('IN_CRON', true);
diff --git a/library/includes/functions_atom.php b/library/includes/functions_atom.php
index 7a17b185d..b8829415c 100644
--- a/library/includes/functions_atom.php
+++ b/library/includes/functions_atom.php
@@ -16,8 +16,7 @@ if (!defined('BB_ROOT')) {
function update_forum_feed($forum_id, $forum_data)
{
- global $bb_cfg;
- $file_path = $bb_cfg['atom']['path'] . '/f/' . $forum_id . '.atom';
+ $file_path = config('tp.atom.path') . '/f/' . $forum_id . '.atom';
$select_tor_sql = $join_tor_sql = '';
if ($forum_id == 0) {
$forum_data['forum_name'] = 'Общая по всем разделам';
@@ -69,7 +68,7 @@ function update_forum_feed($forum_id, $forum_data)
}
}
if (isset($topic['tor_status'])) {
- if (isset($bb_cfg['tor_frozen'][$topic['tor_status']])) {
+ if (null !== config('tp.tor_frozen.' . $topic['tor_status'])) {
continue;
}
}
@@ -88,8 +87,7 @@ function update_forum_feed($forum_id, $forum_data)
function update_user_feed($user_id, $username)
{
- global $bb_cfg;
- $file_path = $bb_cfg['atom']['path'] . '/u/' . floor($user_id / 5000) . '/' . ($user_id % 100) . '/' . $user_id . '.atom';
+ $file_path = config('tp.atom.path') . '/u/' . floor($user_id / 5000) . '/' . ($user_id % 100) . '/' . $user_id . '.atom';
$sql = "
SELECT
t.topic_id, t.topic_title, t.topic_status,
@@ -115,7 +113,7 @@ function update_user_feed($user_id, $username)
}
}
if (isset($topic['tor_status'])) {
- if (isset($bb_cfg['tor_frozen'][$topic['tor_status']])) {
+ if (null !== config('tp.tor_frozen.' . $topic['tor_status'])) {
continue;
}
}
@@ -134,7 +132,6 @@ function update_user_feed($user_id, $username)
function create_atom($file_path, $mode, $id, $title, $topics)
{
- global $bb_cfg;
$dir = dirname($file_path);
if (!file_exists($dir)) {
if (!bb_mkdir($dir)) {
@@ -152,11 +149,11 @@ function create_atom($file_path, $mode, $id, $title, $topics)
}
$atom = "";
$atom .= "\n";
- $atom .= "