config->get('server_name') . $di->config->get('script_path') ."\">\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['lang'] as $key => $data)
- {
- $selected = '';
- if ($key == $default_lang) $selected = ' selected="selected"';
- $lang_select .= ''. $data['name'] .' ';
- $x++;
- }
- $lang_select .= ' ';
- return ($x > 1) ? $lang_select : reset($bb_cfg['lang'])['name'];
+ $lang_select = '';
+ $x = 0;
+ foreach ($di->config->get('lang') as $key => $data) {
+ $selected = '';
+ if ($key == $default_lang) $selected = ' selected="selected"';
+ $lang_select .= '' . $data['name'] . ' ';
+ $x++;
+ }
+ $lang_select .= ' ';
+ return ($x > 1) ? $lang_select : $di->config->get('lang')->ru;
}
-//
// Pick a timezone
-//
-function tz_select ($default, $select_name = 'timezone')
+function tz_select($default, $select_name = 'timezone')
{
- global $sys_timezone, $lang;
+ global $sys_timezone, $lang;
- if (!isset($default))
- {
- $default == $sys_timezone;
- }
- $tz_select = '';
+ if (!isset($default)) {
+ $default = $sys_timezone;
+ }
+ $tz_select = '';
- while( list($offset, $zone) = each($lang['TZ']) )
- {
- $selected = ( $offset == $default ) ? ' selected="selected"' : '';
- $tz_select .= '' . $zone . ' ';
- }
- $tz_select .= ' ';
+ while (list($offset, $zone) = each($lang['TZ'])) {
+ $selected = ($offset == $default) ? ' selected="selected"' : '';
+ $tz_select .= '' . $zone . ' ';
+ }
+ $tz_select .= ' ';
- return $tz_select;
+ return $tz_select;
}
-//
// Templates
-//
-function templates_select ($default_style, $select_name = 'tpl_name')
+function templates_select($default_style, $select_name = 'tpl_name')
{
- global $bb_cfg;
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
- $templates_select = '';
- $x = 0;
- foreach ($bb_cfg['templates'] as $folder => $name)
- {
- $selected = '';
- if ($folder == $default_style) $selected = ' selected="selected"';
- $templates_select .= ''. $name .' ';
- $x++;
- }
- $templates_select .= ' ';
- return ($x > 1) ? $templates_select : reset($bb_cfg['templates']);
-}
\ No newline at end of file
+ $templates_select = '';
+ $x = 0;
+ foreach ($di->config->get('templates') as $folder => $name) {
+ $selected = '';
+ if ($folder == $default_style) $selected = ' selected="selected"';
+ $templates_select .= '' . $name . ' ';
+ $x++;
+ }
+ $templates_select .= ' ';
+ return ($x > 1) ? $templates_select : $di->config->get('templates')->default;
+}
diff --git a/library/includes/functions_torrent.php b/library/includes/functions_torrent.php
index 3ada637c3..ba7d3e036 100644
--- a/library/includes/functions_torrent.php
+++ b/library/includes/functions_torrent.php
@@ -22,7 +22,10 @@ function torrent_auth_check ($forum_id, $poster_id)
function tracker_unregister ($topic_id, $redirect_url = '')
{
- global $bb_cfg, $lang, $log_action;
+ global $lang, $log_action;
+
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
$tor = DB()->fetch_row("
SELECT forum_id, tor_status FROM ". BB_BT_TORRENTS ." WHERE topic_id = ". intval($topic_id) ." LIMIT 1
@@ -64,13 +67,13 @@ function tracker_unregister ($topic_id, $redirect_url = '')
}
// Unset DL-type for topic
- if ($bb_cfg['bt_unset_dltype_on_tor_unreg'] && $topic_id)
+ if ($di->config->get('bt_unset_dltype_on_tor_unreg') && $topic_id)
{
DB()->query("UPDATE ". BB_TOPICS ." SET tracker_status = 0 WHERE topic_id = $topic_id LIMIT 1");
}
// Ocelot
- if ($bb_cfg['ocelot']['enabled'])
+ if ($di->config->get('ocelot.enabled'))
{
if ($row = DB()->fetch_row("SELECT info_hash FROM ". BB_BT_TORRENTS ." WHERE topic_id = $topic_id LIMIT 1"))
{
@@ -122,7 +125,10 @@ function torrent_cp_close ($topic_id, $forum_id)
function tracker_register ($topic_id, $mode = '', $tor_status = TOR_NOT_APPROVED, $reg_time = TIMENOW)
{
- global $bb_cfg, $lang, $reg_mode;
+ global $lang;
+
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
$reg_mode = $mode;
@@ -163,7 +169,7 @@ function tracker_register ($topic_id, $mode = '', $tor_status = TOR_NOT_APPROVED
return torrent_error_exit($lang['TORFILE_INVALID']);
}
- if ($bb_cfg['bt_disable_dht'])
+ if ($di->config->get('bt_disable_dht'))
{
$tor_decoded['info']['private'] = (int) 1;
$fp = fopen($filename, 'w+');
@@ -183,7 +189,7 @@ function tracker_register ($topic_id, $mode = '', $tor_status = TOR_NOT_APPROVED
$info_hash_md5 = md5($info_hash);
// Ocelot
- if ($bb_cfg['ocelot']['enabled'])
+ if ($di->config->get('ocelot.enabled'))
{
ocelot_update_tracker('add_torrent', array('info_hash' => rawurlencode($info_hash), 'id' => $topic_id, 'freetorrent' => 0));
}
@@ -279,7 +285,10 @@ function change_tor_status ($topic_id, $tor_status)
// Set gold / silver type for torrent
function change_tor_type ($topic_id, $tor_status_gold)
{
- global $bb_cfg, $lang;
+ global $lang;
+
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
if (!IS_AM) bb_die($lang['ONLY_FOR_MOD']);
@@ -289,7 +298,7 @@ function change_tor_type ($topic_id, $tor_status_gold)
DB()->query("UPDATE ". BB_BT_TORRENTS ." SET tor_type = $tor_status_gold WHERE topic_id = $topic_id LIMIT 1");
// Ocelot
- if ($bb_cfg['ocelot']['enabled'])
+ if ($di->config->get('ocelot.enabled'))
{
if ($row = DB()->fetch_row("SELECT info_hash FROM ". BB_BT_TORRENTS ." WHERE topic_id = $topic_id LIMIT 1"))
{
@@ -301,7 +310,10 @@ function change_tor_type ($topic_id, $tor_status_gold)
function send_torrent_with_passkey ($t_data)
{
- global $bb_cfg, $lang, $tr_cfg, $userdata;
+ global $lang, $tr_cfg, $userdata;
+
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
$topic_id = $t_data['topic_id'];
$poster_id = $t_data['topic_poster'];
@@ -314,7 +326,7 @@ function send_torrent_with_passkey ($t_data)
{
bb_die($lang['PASSKEY_ERR_TOR_NOT_REG']);
}
- else if (isset($bb_cfg['tor_frozen'][$row['tor_status']]))
+ elseif ($di->config->get('tor_frozen.' . $row['tor_status']))
{
if (!IS_AM) bb_die("Раздача имеет статус: {$lang['TOR_STATUS_NAME'][$row['tor_status']]} * ',
- TOR_CLOSED => 'x ',
- TOR_APPROVED => '√ ',
- TOR_NEED_EDIT => '? ',
- TOR_NO_DESC => '! ',
- TOR_DUP => 'D ',
- TOR_CLOSED_CPHOLD => '© ',
- TOR_CONSUMED => '∑ ',
- TOR_DOUBTFUL => '# ',
- TOR_CHECKING => '% ',
- TOR_TMP => 'T ',
- TOR_PREMOD => '∏ ',
-);
-
-// Запрет на скачивание
-$bb_cfg['tor_frozen'] = array(
- TOR_CHECKING => true,
- TOR_CLOSED => true,
- TOR_CLOSED_CPHOLD => true,
- TOR_CONSUMED => true,
- TOR_DUP => true,
- TOR_NO_DESC => true,
- TOR_PREMOD => true,
-);
-
-// Разрешение на скачку автором, если закрыто на скачивание.
-$bb_cfg['tor_frozen_author_download'] = array(
- TOR_CHECKING => true,
- TOR_NO_DESC => true,
- TOR_PREMOD => true,
-);
-
-// Запрет на редактирование головного сообщения
-$bb_cfg['tor_cannot_edit'] = array(
- TOR_CHECKING => true,
- TOR_CLOSED => true,
- TOR_CONSUMED => true,
- TOR_DUP => true,
-);
-
-// Запрет на создание новых раздач если стоит статус недооформлено/неоформлено/сомнительно
-$bb_cfg['tor_cannot_new'] = array(TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL);
-
-// Разрешение на ответ релизера, если раздача исправлена.
-$bb_cfg['tor_reply'] = array(TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL);
-
-// Если такой статус у релиза, то статистика раздачи будет скрыта
-$bb_cfg['tor_no_tor_act'] = array(
- TOR_CLOSED => true,
- TOR_DUP => true,
- TOR_CLOSED_CPHOLD => true,
- TOR_CONSUMED => true,
-);
-
// Table names
define('BUF_TOPIC_VIEW', 'buf_topic_view');
define('BUF_LAST_SEEDER', 'buf_last_seeder');
@@ -288,11 +225,11 @@ define('CAT_URL', 'index.php?c=');
define('DOWNLOAD_URL', 'dl.php?t=');
define('FORUM_URL', 'viewforum.php?f=');
define('GROUP_URL', 'group.php?g=');
-define('LOGIN_URL', $bb_cfg['login_url']);
+define('LOGIN_URL', $di->config->get('login_url'));
define('MODCP_URL', 'modcp.php?f=');
-define('PM_URL', $bb_cfg['pm_url']);
+define('PM_URL', $di->config->get('pm_url'));
define('POST_URL', 'viewtopic.php?p=');
-define('POSTING_URL', $bb_cfg['posting_url']);
+define('POSTING_URL', $di->config->get('posting_url'));
define('PROFILE_URL', 'profile.php?mode=viewprofile&u=');
define('BONUS_URL', 'profile.php?mode=bonus');
define('TOPIC_URL', 'viewtopic.php?t=');
@@ -356,31 +293,6 @@ function bb_exit ($output = '')
exit;
}
-function prn_r ($var, $title = '', $print = true)
-{
- $r = ''. (($title) ? "$title \n\n" : '') . htmlspecialchars(print_r($var, true)) .' ';
- if ($print) echo $r;
- return $r;
-}
-
-function pre ($var, $title = '', $print = true)
-{
- prn_r($var, $title, $print);
-}
-
-function prn ()
-{
- if (!DBG_USER) return;
- foreach (func_get_args() as $var) prn_r($var);
-}
-
-function vdump ($var, $title = '')
-{
- echo ''. (($title) ? "$title \n\n" : '');
- var_dump($var);
- echo ' ';
-}
-
function htmlCHR ($txt, $double_encode = false, $quote_style = ENT_QUOTES, $charset = 'UTF-8')
{
return (string) htmlspecialchars($txt, $quote_style, $charset, $double_encode);
@@ -401,8 +313,6 @@ require(INC_DIR .'sessions.php');
require(INC_DIR .'template.php');
require(CORE_DIR .'mysql.php');
-$bb_cfg = array_merge(bb_get_config(BB_CONFIG), $bb_cfg);
-
$user = new user_common();
$userdata =& $user->data;
@@ -415,16 +325,16 @@ $log_action = new log_action();
$datastore->enqueue(array('cat_forums'));
// Дата старта вашего проекта
-if (!$bb_cfg['board_startdate'])
+if (!$di->config->get('board_startdate'))
{
bb_update_config(array('board_startdate' => TIMENOW));
DB()->query("UPDATE ". BB_USERS ." SET user_regdate = ". TIMENOW ." WHERE user_id IN(2, ". EXCLUDED_USERS .")");
}
// Cron
-if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !file_exists(CRON_RUNNING) && ($bb_cfg['cron_enabled'] || defined('START_CRON'))) || defined('FORCE_CRON'))
+if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !file_exists(CRON_RUNNING) && ($di->config->get('cron_enabled') || defined('START_CRON'))) || defined('FORCE_CRON'))
{
- if (TIMENOW - $bb_cfg['cron_last_check'] > $bb_cfg['cron_check_interval'])
+ if (TIMENOW - $di->config->get('cron_last_check') > $di->config->get('cron_check_interval'))
{
// Update cron_last_check
bb_update_config(array('cron_last_check' => (TIMENOW + 10)));
@@ -452,10 +362,10 @@ if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !file_exist
}
// Exit if board is disabled via ON/OFF trigger or by admin
-if (($bb_cfg['board_disable'] || file_exists(BB_DISABLED)) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('IN_LOGIN'))
+if (($di->config->get('board_disable') || file_exists(BB_DISABLED)) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('IN_LOGIN'))
{
header('HTTP/1.0 503 Service Unavailable');
- if ($bb_cfg['board_disable'])
+ if ($di->config->get('board_disable'))
{
// admin lock
send_no_cache_headers();
@@ -485,7 +395,7 @@ function cron_release_deadlock ()
function cron_release_file_lock ()
{
- $lock_released = rename(CRON_RUNNING, CRON_ALLOWED);
+ rename(CRON_RUNNING, CRON_ALLOWED);
cron_touch_lock_file(CRON_ALLOWED);
}
diff --git a/library/includes/online_userlist.php b/library/includes/online_userlist.php
index f697b6b4a..a9d0994c2 100644
--- a/library/includes/online_userlist.php
+++ b/library/includes/online_userlist.php
@@ -134,7 +134,7 @@ else if (isset($_REQUEST['f']))
$total_online = $logged_online + $guests_online;
-if ($total_online > $bb_cfg['record_online_users'])
+if ($total_online > $di->config->get('record_online_users'))
{
bb_update_config(array(
'record_online_users' => $total_online,
diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php
index 740823672..0214702a9 100644
--- a/library/includes/page_footer.php
+++ b/library/includes/page_footer.php
@@ -2,7 +2,7 @@
if (!defined('BB_ROOT')) die(basename(__FILE__));
-global $bb_cfg, $userdata, $template, $DBS, $lang;
+global $userdata, $template, $DBS, $lang;
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -25,7 +25,7 @@ if (!empty($template))
$show_dbg_info = (DBG_USER && IS_ADMIN && !(isset($_GET['pane']) && $_GET['pane'] == 'left'));
-if(!$bb_cfg['gzip_compress'])
+if(!$di->config->get('gzip_compress'))
{
flush();
}
@@ -35,7 +35,7 @@ if ($show_dbg_info)
$gen_time = utime() - TIMESTART;
$gen_time_txt = sprintf('%.3f', $gen_time);
$gzip_text = (UA_GZIP_SUPPORTED) ? 'GZIP ' : 'GZIP ';
- $gzip_text .= ($bb_cfg['gzip_compress']) ? $lang['ON'] : $lang['OFF'];
+ $gzip_text .= ($di->config->get('gzip_compress')) ? $lang['ON'] : $lang['OFF'];
$stat = '[ '. $lang['EXECUTION_TIME'] ." $gen_time_txt ". $lang['SEC'];
@@ -50,7 +50,7 @@ if ($show_dbg_info)
$stat .= " | $gzip_text";
$stat .= ' | '.$lang['MEMORY'];
- $stat .= humn_size($bb_cfg['mem_on_start'], 2) .' / ';
+ $stat .= humn_size($di->config->get('mem_on_start'), 2) .' / ';
$stat .= humn_size(sys('mem_peak'), 2) .' / ';
$stat .= humn_size(sys('mem'), 2);
diff --git a/library/includes/page_header.php b/library/includes/page_header.php
index 50a7947e1..9e99fd64a 100644
--- a/library/includes/page_header.php
+++ b/library/includes/page_header.php
@@ -5,7 +5,7 @@ if (defined('PAGE_HEADER_SENT')) return;
// Parse and show the overall page header
-global $page_cfg, $userdata, $user, $bb_cfg, $template, $lang, $images;
+global $page_cfg, $userdata, $user, $template, $lang, $images;
/** @var \TorrentPier\Di $di */
$di = \TorrentPier\Di::getInstance();
@@ -48,7 +48,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'], $di->config->get('record_online_users'), bb_date($di->config->get('record_online_date'))),
));
}
@@ -113,7 +113,7 @@ $template->assign_vars(array(
// The following assigns all _common_ variables that may be used at any point in a template
$template->assign_vars(array(
'SIMPLE_HEADER' => !empty($gen_simple_header),
- 'CONTENT_ENCODING' => $bb_cfg['lang'][$userdata['user_lang']]['encoding'],
+ 'CONTENT_ENCODING' => $di->config->get('lang.' . $userdata['user_lang'] . '.encoding'),
'IN_ADMIN' => defined('IN_ADMIN'),
'USER_HIDE_CAT' => (BB_SCRIPT == 'index'),
@@ -125,9 +125,9 @@ $template->assign_vars(array(
'USE_TABLESORTER' => !empty($page_cfg['use_tablesorter']),
- 'SITENAME' => $bb_cfg['sitename'],
+ 'SITENAME' => $di->config->get('sitename'),
'U_INDEX' => BB_ROOT ."index.php",
- 'T_INDEX' => sprintf($lang['FORUM_INDEX'], $bb_cfg['sitename']),
+ 'T_INDEX' => sprintf($lang['FORUM_INDEX'], $di->config->get('sitename')),
'IS_GUEST' => IS_GUEST,
'IS_USER' => IS_USER,
@@ -138,9 +138,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(',', '.', floatval($bb_cfg['board_timezone']))])),
- 'BOARD_TIMEZONE' => $bb_cfg['board_timezone'],
+ 'CURRENT_TIME' => sprintf($lang['CURRENT_TIME'], bb_date(TIMENOW, $di->config->get('last_visit_date_format'), false)),
+ 'S_TIMEZONE' => preg_replace('/\(.*?\)/', '', sprintf($lang['ALL_TIMES'], $lang['TZ'][str_replace(',', '.', floatval($di->config->get('board_timezone')))])),
+ 'BOARD_TIMEZONE' => $di->config->get('board_timezone'),
'PM_INFO' => $pm_info,
'PRIVMSG_IMG' => $icon_pm,
@@ -151,7 +151,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' => !$di->config->get('allow_autologin'),
'S_LOGIN_ACTION' => LOGIN_URL,
'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'],
@@ -167,11 +167,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' => $di->config->get('terms_and_conditions_url'),
'U_TRACKER' => "tracker.php",
- 'SHOW_SIDEBAR1' => (!empty($page_cfg['show_sidebar1'][BB_SCRIPT]) || $bb_cfg['show_sidebar1_on_every_page']),
- 'SHOW_SIDEBAR2' => (!empty($page_cfg['show_sidebar2'][BB_SCRIPT]) || $bb_cfg['show_sidebar2_on_every_page']),
+ 'SHOW_SIDEBAR1' => (!empty($page_cfg['show_sidebar1'][BB_SCRIPT]) || $di->config->get('show_sidebar1_on_every_page')),
+ 'SHOW_SIDEBAR2' => (!empty($page_cfg['show_sidebar2'][BB_SCRIPT]) || $di->config->get('show_sidebar2_on_every_page')),
'HTML_AGREEMENT' => LANG_DIR . 'html/user_agreement.html',
'HTML_COPYRIGHT' => LANG_DIR . 'html/copyright_holders.html',
@@ -185,11 +185,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' => $di->config->get('login_url'),
'NEWEST_URL' => '&view=newest#newest',
- 'PM_URL' => $bb_cfg['pm_url'],
+ 'PM_URL' => $di->config->get('pm_url'),
'POST_URL' => BB_ROOT . POST_URL,
- 'POSTING_URL' => $bb_cfg['posting_url'],
+ 'POSTING_URL' => $di->config->get('posting_url'),
'PROFILE_URL' => BB_ROOT . PROFILE_URL,
'TOPIC_URL' => BB_ROOT . TOPIC_URL,
@@ -259,7 +259,7 @@ $template->pparse('page_header');
define('PAGE_HEADER_SENT', true);
-if (!$bb_cfg['gzip_compress'])
+if (!$di->config->get('gzip_compress'))
{
flush();
}
\ No newline at end of file
diff --git a/library/includes/sessions.php b/library/includes/sessions.php
index 2bc93a3f7..489a7cacc 100644
--- a/library/includes/sessions.php
+++ b/library/includes/sessions.php
@@ -79,7 +79,8 @@ class user_common
*/
function session_start ($cfg = array())
{
- global $bb_cfg;
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
$update_sessions_table = false;
$this->cfg = array_merge($this->cfg, $cfg);
@@ -100,7 +101,7 @@ class user_common
{
$SQL['WHERE'][] = "s.session_id = '$session_id'";
- if ($bb_cfg['torhelp_enabled'])
+ if ($di->config->get('torhelp_enabled'))
{
$SQL['SELECT'][] = "th.topic_id_csv AS torhelp";
$SQL['LEFT JOIN'][] = BB_BT_TORHELP ." th ON(u.user_id = th.user_id)";
@@ -120,7 +121,7 @@ class user_common
{
$this->data = DB()->fetch_row($SQL);
- if ($this->data && (TIMENOW - $this->data['session_time']) > $bb_cfg['session_update_intrv'])
+ if ($this->data && (TIMENOW - $this->data['session_time']) > $di->config->get('session_update_intrv'))
{
$this->data['session_time'] = TIMENOW;
$update_sessions_table = true;
@@ -169,7 +170,7 @@ class user_common
if (!$this->data)
{
$login = false;
- $user_id = ($bb_cfg['allow_autologin'] && $this->sessiondata['uk'] && $this->sessiondata['uid']) ? $this->sessiondata['uid'] : GUEST_UID;
+ $user_id = ($di->config->get('allow_autologin') && $this->sessiondata['uk'] && $this->sessiondata['uid']) ? $this->sessiondata['uid'] : GUEST_UID;
if ($userdata = get_userdata(intval($user_id), false, true))
{
@@ -195,7 +196,7 @@ class user_common
define('IS_CP_HOLDER', (!IS_GUEST && $this->data['user_level'] == CP_HOLDER));
define('IS_GROUP_MEMBER', (!IS_GUEST && $this->data['user_level'] == GROUP_MEMBER));
define('IS_USER', (!IS_GUEST && $this->data['user_level'] == USER));
- define('IS_SUPER_ADMIN', (IS_ADMIN && isset($bb_cfg['super_admins'][$this->data['user_id']])));
+ define('IS_SUPER_ADMIN', (IS_ADMIN && $di->config->get('super_admins.' . $this->data['user_id'])));
define('IS_AM', (IS_ADMIN || IS_MOD));
$this->set_shortcuts();
@@ -221,7 +222,8 @@ class user_common
*/
function session_create ($userdata, $auto_created = false)
{
- global $bb_cfg;
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
$this->data = $userdata;
$session_id = $this->sessiondata['sid'];
@@ -282,9 +284,9 @@ class user_common
$last_visit = TIMENOW;
define('FIRST_LOGON', true);
}
- else if ($session_time < (TIMENOW - $bb_cfg['last_visit_update_intrv']))
+ else if ($session_time < (TIMENOW - $di->config->get('last_visit_update_intrv')))
{
- $last_visit = max($session_time, (TIMENOW - 86400*$bb_cfg['max_last_visit_days']));
+ $last_visit = max($session_time, (TIMENOW - 86400*$di->config->get('max_last_visit_days')));
}
if ($last_visit != $this->data['user_lastvisit'])
@@ -304,7 +306,7 @@ class user_common
$this->data['user_lastvisit'] = $last_visit;
}
- if (!empty($_POST['autologin']) && $bb_cfg['allow_autologin'])
+ if (!empty($_POST['autologin']) && $di->config->get('allow_autologin'))
{
if (!$auto_created)
{
@@ -481,7 +483,8 @@ class user_common
*/
function set_session_cookies ($user_id)
{
- global $bb_cfg;
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
if ($user_id == GUEST_UID)
{
@@ -511,7 +514,7 @@ class user_common
{
bb_setcookie(COOKIE_DATA, $c_sdata_curr, COOKIE_PERSIST, true);
}
- if (isset($bb_cfg['dbg_users'][$this->data['user_id']]) && !isset($_COOKIE[COOKIE_DBG]))
+ if ($di->config->get('dbg_users.' . $this->data['user_id']) && !isset($_COOKIE[COOKIE_DBG]))
{
bb_setcookie(COOKIE_DBG, 1, COOKIE_SESSION);
}
@@ -529,7 +532,8 @@ class user_common
*/
function verify_autologin_id ($userdata, $expire_check = false, $create_new = true)
{
- global $bb_cfg;
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
$autologin_id = $userdata['autologin_id'];
@@ -539,9 +543,9 @@ class user_common
{
return $this->create_autologin_id($userdata);
}
- else if ($autologin_id && $userdata['user_session_time'] && $bb_cfg['max_autologin_time'])
+ else if ($autologin_id && $userdata['user_session_time'] && $di->config->get('max_autologin_time'))
{
- if (TIMENOW - $userdata['user_session_time'] > $bb_cfg['max_autologin_time']*86400)
+ if (TIMENOW - $userdata['user_session_time'] > $di->config->get('max_autologin_time')*86400)
{
return $this->create_autologin_id($userdata, $create_new);
}
@@ -594,34 +598,31 @@ class user_common
*/
function init_userprefs ()
{
- global $bb_cfg, $theme, $lang, $DeltaTime;
+ global $theme, $lang, $DeltaTime;
+
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
if (defined('LANG_DIR')) return; // prevent multiple calling
- define('DEFAULT_LANG_DIR', LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/');
+ define('DEFAULT_LANG_DIR', LANG_ROOT_DIR . $di->config->get('default_lang') .'/');
define('ENGLISH_LANG_DIR', LANG_ROOT_DIR .'en/');
if ($this->data['user_id'] != GUEST_UID)
{
- if ($this->data['user_lang'] && $this->data['user_lang'] != $bb_cfg['default_lang'])
+ if ($this->data['user_lang'] && $this->data['user_lang'] != $di->config->get('default_lang'))
{
- $bb_cfg['default_lang'] = basename($this->data['user_lang']);
- define('LANG_DIR', LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/');
- }
-
- if (isset($this->data['user_timezone']))
- {
- $bb_cfg['board_timezone'] = $this->data['user_timezone'];
+ define('LANG_DIR', LANG_ROOT_DIR . basename($this->data['user_lang']) .'/');
}
}
- $this->data['user_lang'] = $bb_cfg['default_lang'];
- $this->data['user_timezone'] = $bb_cfg['board_timezone'];
+ $this->data['user_lang'] = $di->config->get('default_lang');
+ $this->data['user_timezone'] = $di->config->get('board_timezone');
if (!defined('LANG_DIR')) define('LANG_DIR', DEFAULT_LANG_DIR);
require(LANG_DIR .'main.php');
- setlocale(LC_ALL, $bb_cfg['lang'][$this->data['user_lang']]['locale']);
+ setlocale(LC_ALL, $di->config->get('lang.' . $this->data['user_lang'] . '.locale'));
$theme = setup_style();
$DeltaTime = new Date_Delta();
diff --git a/library/includes/smtp.php b/library/includes/smtp.php
index 7bf5679be..26cff7680 100644
--- a/library/includes/smtp.php
+++ b/library/includes/smtp.php
@@ -24,7 +24,8 @@ function server_parse($socket, $response, $line = __LINE__)
// Replacement or substitute for PHP's mail command
function smtpmail($mail_to, $subject, $message, $headers = '')
{
- global $bb_cfg;
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
// Fix any bare linefeeds in the message to make it RFC821 Compliant.
$message = preg_replace("#(?config->get('smtp_ssl')) ? 'ssl://' : '';
+ if( !$socket = fsockopen($ssl . $di->config->get('smtp_host'), $di->config->get('smtp_port'), $errno, $errstr, 20) )
{
bb_die('Could not connect to smtp host : '. $errno .' : '. $errstr);
}
@@ -95,29 +96,29 @@ function smtpmail($mail_to, $subject, $message, $headers = '')
// Do we want to use AUTH?, send RFC2554 EHLO, else send RFC821 HELO
// This improved as provided by SirSir to accomodate
- if( !empty($bb_cfg['smtp_username']) && !empty($bb_cfg['smtp_password']) )
+ if( !empty($di->config->get('smtp_username')) && !empty($di->config->get('smtp_password')) )
{
- fputs($socket, "EHLO " . $bb_cfg['smtp_host'] . "\r\n");
+ fputs($socket, "EHLO " . $di->config->get('smtp_host') . "\r\n");
server_parse($socket, "250", __LINE__);
fputs($socket, "AUTH LOGIN\r\n");
server_parse($socket, "334", __LINE__);
- fputs($socket, base64_encode($bb_cfg['smtp_username']) . "\r\n");
+ fputs($socket, base64_encode($di->config->get('smtp_username')) . "\r\n");
server_parse($socket, "334", __LINE__);
- fputs($socket, base64_encode($bb_cfg['smtp_password']) . "\r\n");
+ fputs($socket, base64_encode($di->config->get('smtp_password')) . "\r\n");
server_parse($socket, "235", __LINE__);
}
else
{
- fputs($socket, "HELO " . $bb_cfg['smtp_host'] . "\r\n");
+ fputs($socket, "HELO " . $di->config->get('smtp_host') . "\r\n");
server_parse($socket, "250", __LINE__);
}
// From this point onward most server response codes should be 250
// Specify who the mail is from....
- fputs($socket, "MAIL FROM: <" . $bb_cfg['board_email'] . ">\r\n");
+ fputs($socket, "MAIL FROM: <" . $di->config->get('board_email') . ">\r\n");
server_parse($socket, "250", __LINE__);
// Add an additional bit of error checking to the To field.
diff --git a/library/includes/template.php b/library/includes/template.php
index 22bca933a..a8d6e70b4 100644
--- a/library/includes/template.php
+++ b/library/includes/template.php
@@ -93,7 +93,10 @@ class Template
*/
function Template($root = '.')
{
- global $bb_cfg, $lang;
+ global $lang;
+
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
// setting pointer "vars"
$this->vars = &$this->_tpldata['.'][0];
@@ -102,7 +105,7 @@ class Template
$this->root = $root;
$this->tpl = basename($root);
$this->lang =& $lang;
- $this->use_cache = $bb_cfg['xs_use_cache'];
+ $this->use_cache = $di->config->get('xs_use_cache');
}
/**
@@ -227,7 +230,10 @@ class Template
{
$this->cur_tpl = $filename;
- global $lang, $bb_cfg, $user, $tr_cfg;
+ global $lang, $user, $tr_cfg;
+
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
$L =& $lang;
$V =& $this->vars;
@@ -1063,12 +1069,13 @@ class Template
function xs_startup()
{
- global $bb_cfg;
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
if (empty($this->xs_started)) {
$this->xs_started = 1;
// Adding language variable
- $this->vars['LANG'] = isset($this->vars['LANG']) ? $this->vars['LANG'] : $bb_cfg['default_lang'];
+ $this->vars['LANG'] = isset($this->vars['LANG']) ? $this->vars['LANG'] : $di->config->get('default_lang');
// Adding current template
$tpl = $this->root . '/';
if (substr($tpl, 0, 2) === './') {
diff --git a/library/includes/torrent_show_dl_list.php b/library/includes/torrent_show_dl_list.php
index 458172e01..c29105237 100644
--- a/library/includes/torrent_show_dl_list.php
+++ b/library/includes/torrent_show_dl_list.php
@@ -15,11 +15,11 @@ $dl_users_div_style_overflow = "padding: 6px; height: $dl_users_overflow_div_he
$template->assign_vars(array('DL_BUTTONS' => false));
-$count_mode = ($bb_cfg['bt_dl_list_only_count'] && !($di->request->get('dl') === 'names'));
+$count_mode = ($di->config->get('bt_dl_list_only_count') && !($di->request->get('dl') === 'names'));
-$dl_topic = (isset($t_data['tracker_status']) && !($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'] && $di->request->get('dl') === 'names')));
-$show_dl_buttons = ($dl_topic && $bb_cfg['bt_show_dl_list_buttons']);
+$dl_topic = (isset($t_data['tracker_status']) && !($di->config->get('bt_dl_list_only_1st_page') && $start));
+$show_dl_list = ($dl_topic && ($di->config->get('bt_show_dl_list') || ($di->config->get('allow_dl_list_names_mode') && $di->request->get('dl') === 'names')));
+$show_dl_buttons = ($dl_topic && $di->config->get('bt_show_dl_list_buttons'));
// link to clear DL-List
$template->assign_vars(array('S_DL_DELETE' => false));
@@ -122,10 +122,10 @@ 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' => $di->config->get('bt_show_dl_but_will'),
+ 'DL_BUT_DOWN' => $di->config->get('bt_show_dl_but_down'),
+ 'DL_BUT_COMPL' => $di->config->get('bt_show_dl_but_compl'),
+ 'DL_BUT_CANCEL' => $di->config->get('bt_show_dl_but_cancel'),
));
$dl_hidden_fields = '
diff --git a/library/includes/ucp/bonus.php b/library/includes/ucp/bonus.php
index b1e3fd290..e6905ed9c 100644
--- a/library/includes/ucp/bonus.php
+++ b/library/includes/ucp/bonus.php
@@ -2,13 +2,16 @@
if (!defined('BB_ROOT')) die(basename(__FILE__));
+/** @var \TorrentPier\Di $di */
+$di = \TorrentPier\Di::getInstance();
+
$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'])
+if($di->config->get('seed_bonus_enabled') && $di->config->get('bonus_upload') && $di->config->get('bonus_upload_price'))
{
- $upload_row = unserialize($bb_cfg['bonus_upload']);
- $price_row = unserialize($bb_cfg['bonus_upload_price']);
+ $upload_row = unserialize($di->config->get('bonus_upload'));
+ $price_row = unserialize($di->config->get('bonus_upload_price'));
}
else bb_die($lang['EXCHANGE_NOT']);
diff --git a/library/includes/ucp/email.php b/library/includes/ucp/email.php
index 2022dca34..ead271a56 100644
--- a/library/includes/ucp/email.php
+++ b/library/includes/ucp/email.php
@@ -2,8 +2,11 @@
if (!defined('BB_ROOT')) die(basename(__FILE__));
+/** @var \TorrentPier\Di $di */
+$di = \TorrentPier\Di::getInstance();
+
// Is send through board enabled? No, return to index
-if (!$bb_cfg['board_email_form'])
+if (!$di->config->get('board_email_form'))
{
redirect("index.php");
}
@@ -50,7 +53,7 @@ if ($row = DB()->fetch_row($sql))
if (!$errors)
{
require(CLASS_DIR .'emailer.php');
- $emailer = new emailer($bb_cfg['smtp_delivery']);
+ $emailer = new emailer($di->config->get('smtp_delivery'));
$emailer->from($userdata['username'] ." <{$userdata['user_email']}>");
$emailer->email_address($username ." <$user_email>");
@@ -59,7 +62,7 @@ if ($row = DB()->fetch_row($sql))
$emailer->set_subject($subject);
$emailer->assign_vars(array(
- 'SITENAME' => $bb_cfg['sitename'],
+ 'SITENAME' => $di->config->get('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 966c0da45..324833138 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -2,14 +2,15 @@
if (!defined('BB_ROOT')) die(basename(__FILE__));
+/** @var \TorrentPier\Di $di */
+$di = \TorrentPier\Di::getInstance();
+
array_deep($_POST, 'trim');
set_die_append_msg();
if (IS_ADMIN)
{
- $bb_cfg['reg_email_activation'] = false;
-
$new_user = (int) request_var('admin', '');
if ($new_user) $gen_simple_header = true;
@@ -18,19 +19,21 @@ if (IS_ADMIN)
));
}
+$req_email_activation = (IS_ADMIN) ? false : $di->config->get('reg_email_activation');
+
$can_register = (IS_GUEST || IS_ADMIN);
$submit = !empty($_POST['submit']);
-$errors = array();
+$errors = [];
$adm_edit = false; // редактирование админом чужого профиля
require(INC_DIR .'bbcode.php');
require(INC_DIR .'functions_validate.php');
require(INC_DIR .'functions_selects.php');
-$pr_data = array(); // данные редактируемого либо регистрационного профиля
-$db_data = array(); // данные для базы: регистрационные либо измененные данные юзера
-$tp_data = array(); // данные для tpl
+$pr_data = []; // данные редактируемого либо регистрационного профиля
+$db_data = []; // данные для базы: регистрационные либо измененные данные юзера
+$tp_data = []; // данные для tpl
// Данные профиля
switch ($mode)
@@ -44,20 +47,20 @@ switch ($mode)
if (!IS_ADMIN)
{
// Ограничение по ip
- if($bb_cfg['unique_ip'])
+ if($di->config->get('unique_ip'))
{
if($users = 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
@@ -61,7 +64,7 @@ else
$profile_user_id = ($profiledata['user_id'] == $userdata['user_id']);
-$signature = ($bb_cfg['allow_sig'] && $profiledata['user_sig']) ? $profiledata['user_sig'] : '';
+$signature = ($di->config->get('allow_sig') && $profiledata['user_sig']) ? $profiledata['user_sig'] : '';
if(bf($profiledata['user_opt'], 'user_opt', 'dis_sig'))
{
@@ -103,9 +106,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' => ($di->config->get('gender')) ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '',
+ 'BIRTHDAY' => ($di->config->get('birthday_enabled') && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '',
+ 'AGE' => ($di->config->get('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/includes/viewtopic_torrent.php b/library/includes/viewtopic_torrent.php
index 226e19912..b11c55747 100644
--- a/library/includes/viewtopic_torrent.php
+++ b/library/includes/viewtopic_torrent.php
@@ -2,7 +2,10 @@
if (!defined('BB_ROOT')) die(basename(__FILE__));
-global $bb_cfg, $t_data, $poster_id, $is_auth, $dl_link_css, $dl_status_css, $lang, $userdata;
+global $t_data, $poster_id, $is_auth, $dl_link_css, $dl_status_css, $lang, $userdata;
+
+/** @var \TorrentPier\Di $di */
+$di = \TorrentPier\Di::getInstance();
$show_peers_limit = 300;
$max_peers_before_overflow = 20;
@@ -88,8 +91,8 @@ if ($tor_reged)
$tor_magnet = create_magnet($tor_info['info_hash'], $passkey['auth_key'], $userdata['session_logged_in']);
// ratio limits
- $min_ratio_dl = $bb_cfg['bt_min_ratio_allow_dl_tor'];
- $min_ratio_warn = $bb_cfg['bt_min_ratio_warning'];
+ $min_ratio_dl = $di->config->get('bt_min_ratio_allow_dl_tor');
+ $min_ratio_warn = $di->config->get('bt_min_ratio_warning');
$dl_allowed = true;
$user_ratio = 0;
@@ -125,7 +128,7 @@ if ($tor_reged)
{
$template->assign_vars(array(
'SHOW_RATIO_WARN' => true,
- 'RATIO_WARN_MSG' => sprintf($lang['BT_RATIO_WARNING_MSG'], $min_ratio_dl, $bb_cfg['ratio_url_help']),
+ 'RATIO_WARN_MSG' => sprintf($lang['BT_RATIO_WARNING_MSG'], $min_ratio_dl, $di->config->get('ratio_url_help')),
));
}
}
@@ -140,15 +143,15 @@ if ($tor_reged)
else
{
$template->assign_vars(array(
- 'DOWNLOAD_NAME' => '['.$bb_cfg['server_name'].'].t' . $topic_id . '.torrent',
+ 'DOWNLOAD_NAME' => '[' . $di->config->get('server_name') . '].t' . $topic_id . '.torrent',
'TOR_SILVER_GOLD' => $tor_info['tor_type'],
- 'TOR_FROZEN' => (!IS_AM) ? (isset($bb_cfg['tor_frozen'][$tor_info['tor_status']]) && !(isset($bb_cfg['tor_frozen_author_download'][$tor_info['tor_status']]) && $userdata['user_id'] == $tor_info['poster_id'])) ? true : '' : '',
+ 'TOR_FROZEN' => (!IS_AM) ? ($di->config->get('tor_frozen.' . $tor_info['tor_status']) && !($di->config->get('tor_frozen_author_download.' . $tor_info['tor_status'])) && $userdata['user_id'] == $tor_info['poster_id']) ? true : '' : '',
'TOR_STATUS_TEXT' => $lang['TOR_STATUS_NAME'][$tor_info['tor_status']],
- 'TOR_STATUS_ICON' => $bb_cfg['tor_icons'][$tor_info['tor_status']],
+ 'TOR_STATUS_ICON' => $di->config->get('tor_icons.' . $tor_info['tor_status']),
'TOR_STATUS_BY' => ($tor_info['checked_user_id'] && $is_auth['auth_mod']) ? (' · '. profile_url($tor_info) .' · '. delta_time($tor_info['checked_time']) . $lang['TOR_BACK'] .' ') : '',
'TOR_STATUS_SELECT' => build_select('sel_status', array_flip($lang['TOR_STATUS_NAME']), TOR_APPROVED),
- 'TOR_STATUS_REPLY' => $bb_cfg['tor_comment'] && !IS_GUEST && in_array($tor_info['tor_status'], $bb_cfg['tor_reply']) && $userdata['user_id'] == $tor_info['poster_id'] && $t_data['topic_status'] != TOPIC_LOCKED,
+ 'TOR_STATUS_REPLY' => $di->config->get('tor_comment') && !IS_GUEST && in_array($tor_info['tor_status'], $di->config->get('tor_reply')) && $userdata['user_id'] == $tor_info['poster_id'] && $t_data['topic_status'] != TOPIC_LOCKED,
'DL_LINK_CLASS' => (isset($bt_userdata['user_status'])) ? $dl_link_css[$bt_userdata['user_status']] : 'genmed',
'DL_TITLE_CLASS' => (isset($bt_userdata['user_status'])) ? $dl_status_css[$bt_userdata['user_status']] : 'gen',
@@ -499,7 +502,7 @@ if ($tor_reged)
}
}
-if ($bb_cfg['bt_allow_spmode_change'] && $s_mode != 'full')
+if ($di->config->get('bt_allow_spmode_change') && $s_mode != 'full')
{
$template->assign_vars(array(
'PEERS_FULL_LINK' => true,
@@ -508,13 +511,13 @@ if ($bb_cfg['bt_allow_spmode_change'] && $s_mode != 'full')
}
$template->assign_vars(array(
- 'SHOW_DL_LIST_LINK' => (($bb_cfg['bt_show_dl_list'] || $bb_cfg['allow_dl_list_names_mode']) && $t_data['tracker_status']),
- 'SHOW_TOR_ACT' => ($tor_reged && (!isset($bb_cfg['tor_no_tor_act'][$tor_info['tor_status']]) || IS_AM)),
+ 'SHOW_DL_LIST_LINK' => (($di->config->get('bt_show_dl_list') || $di->config->get('allow_dl_list_names_mode')) && $t_data['tracker_status']),
+ 'SHOW_TOR_ACT' => ($tor_reged && (!$di->config->get('tor_no_tor_act.' . $tor_info['tor_status']) || IS_AM)),
'S_MODE_COUNT' => ($s_mode == 'count'),
'S_MODE_FULL' => ($s_mode == 'full'),
'PEER_EXIST' => ($seeders || $leechers || defined('SEEDER_EXIST') || defined('LEECHER_EXIST')),
'SEED_EXIST' => ($seeders || defined('SEEDER_EXIST')),
'LEECH_EXIST' => ($leechers || defined('LEECHER_EXIST')),
- 'TOR_HELP_LINKS' => $bb_cfg['tor_help_links'],
- 'CALL_SEED' => ($bb_cfg['callseed'] && $tor_reged && !isset($bb_cfg['tor_no_tor_act'][$tor_info['tor_status']]) && $seed_count < 3 && $tor_info['call_seed_time'] < (TIMENOW - 86400)),
+ 'TOR_HELP_LINKS' => $di->config->get('tor_help_links'),
+ 'CALL_SEED' => ($di->config->get('callseed') && $tor_reged && !$di->config->get('tor_no_tor_act.' . $tor_info['tor_status']) && $seed_count < 3 && $tor_info['call_seed_time'] < (TIMENOW - 86400)),
));
\ No newline at end of file
diff --git a/library/language/en/html/advert.html b/library/language/en/html/advert.html
index 80632ba56..cc98a5fa2 100644
--- a/library/language/en/html/advert.html
+++ b/library/language/en/html/advert.html
@@ -1,4 +1,4 @@
-
Advertising on ">
-
For advertising please contact:
+
+
For advertising please contact: config->get('adv_email'); ?>
After that in 48 hours, we will remove interesting you links from the site.
-Our email:
+Our email: config->get('abuse_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 config->get('abuse_email'); ?>
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/html/user_agreement.html b/library/language/en/html/user_agreement.html
index eccce4738..fcbc40161 100644
--- a/library/language/en/html/user_agreement.html
+++ b/library/language/en/html/user_agreement.html
@@ -6,7 +6,7 @@
ABOUT SITE
-Internet - resource (website) "> (hereinafter - Resource) is an internet site that allows users to share information with each other via bit-torrent, as well as in free form, and provides a means to monitor the integrity of information transmitted (via hash-files).
+Internet - resource (website) config->get('server_name')}:{$di->config->get('server_port')}" : $di->config->get('server_name'); ?>">config->get('sitename')?> (hereinafter - Resource) is an internet site that allows users to share information with each other via bit-torrent, as well as in free form, and provides a means to monitor the integrity of information transmitted (via hash-files).
diff --git a/library/language/ru/html/advert.html b/library/language/ru/html/advert.html
index ffe7795b7..aa710ea44 100644
--- a/library/language/ru/html/advert.html
+++ b/library/language/ru/html/advert.html
@@ -1,4 +1,4 @@
-
Размещение рекламы на ">
-
По вопросам размещения рекламы обращайтесь по адресу:
+
+
По вопросам размещения рекламы обращайтесь по адресу: config->get('adv_email'); ?>
После этого, в течении 48 часов, мы удалим интересующие Вас ссылки с сайта.
-Наш email:
+Наш email: config->get('abuse_email'); ?>
ВНИМАНИЕ!
-а) Мы оставляем за собой право публикации на сайте любой информации присланной нам по почте
+а) Мы оставляем за собой право публикации на сайте любой информации присланной нам по почте config->get('abuse_email'); ?>
б) Мы не осуществляем контроль за действиями пользователей, которые могут повторно размещать ссылки на информацию, являющуюся объектом вашего авторского права. Любая информация на форуме, размещается автоматически, без какого либо контроля с чьей либо стороны, что соответствует общепринятой мировой практике размещения информации в сети интернет. Однако, мы в любом случае рассмотрим все Ваши запросы, относительно ссылок на информацию, нарушающую Ваши права.
diff --git a/library/language/ru/html/user_agreement.html b/library/language/ru/html/user_agreement.html
index d68f7df4b..cbd13c1e7 100644
--- a/library/language/ru/html/user_agreement.html
+++ b/library/language/ru/html/user_agreement.html
@@ -6,7 +6,7 @@
О САЙТЕ
-Интернет - ресурс (сайт) "> (в дальнейшем - Ресурс) является интернет-сайтом, позволяющим пользователям обмениваться друг с другом информацией по протоколу бит-торрент, а также в свободной форме, и предоставляющим средства для контроля целостности передаваемой информации (посредством hash-файлов).
+Интернет - ресурс (сайт) config->get('server_name')}:{$di->config->get('server_port')}" : $di->config->get('server_name'); ?>">config->get('sitename')?> (в дальнейшем - Ресурс) является интернет-сайтом, позволяющим пользователям обмениваться друг с другом информацией по протоколу бит-торрент, а также в свободной форме, и предоставляющим средства для контроля целостности передаваемой информации (посредством hash-файлов).
diff --git a/library/language/uk/html/advert.html b/library/language/uk/html/advert.html
index 6485d4c47..b2598b135 100644
--- a/library/language/uk/html/advert.html
+++ b/library/language/uk/html/advert.html
@@ -1,4 +1,4 @@
-
Розміщення реклами на ">
-
З питань розміщення реклами звертайтесь за адресою:
+
+
З питань розміщення реклами звертайтесь за адресою: config->get('adv_email'); ?>
Після цього, протягом 48 годин, ми видалимо ці посилання з сайту.
-Наш email:
+Наш email: config->get('abuse_email'); ?>
УВАГА!
-а) Ми залишаємо за собою право публікації на сайті будь-якої інформації присланої нам по пошті
+а) Ми залишаємо за собою право публікації на сайті будь-якої інформації присланої нам по пошті config->get('abuse_email'); ?>
б) Ми не здійснюємо контроль за діями користувачів, які можуть повторно розміщувати посилання на інформацію, що є об'єктом вашого авторського права. Будь-яка інформація на форумі, розміщується автоматично, без якого контролю з будь якої сторони, що відповідає загальноприйнятій світовій практиці розміщення інформації в мережі інтернет. Проте, ми у будь-якому випадку розглянемо всі Ваші запити, щодо посилань на інформацію, що порушує Ваші права.
diff --git a/library/language/uk/html/user_agreement.html b/library/language/uk/html/user_agreement.html
index e597bdbce..cf1da0603 100644
--- a/library/language/uk/html/user_agreement.html
+++ b/library/language/uk/html/user_agreement.html
@@ -6,7 +6,7 @@
ПРО САЙТ
-Інтернет - ресурс (сайт) "> (надалі - Ресурс) є інтернет-сайтом, що дозволяє користувачам обмінюватися один з одним інформацією по протоколу біт-торрент, а також у вільній формі, що надає засоби для контролю цілісності інформації, що передається (за допомогою hash-файлів).
+Інтернет - ресурс (сайт) config->get('server_name')}:{$di->config->get('server_port')}" : $di->config->get('server_name'); ?>">config->get('sitename')?> (надалі - Ресурс) є інтернет-сайтом, що дозволяє користувачам обмінюватися один з одним інформацією по протоколу біт-торрент, а також у вільній формі, що надає засоби для контролю цілісності інформації, що передається (за допомогою hash-файлів).
diff --git a/login.php b/login.php
index 324b4d04f..3f6aacc85 100644
--- a/login.php
+++ b/login.php
@@ -70,7 +70,7 @@ $need_captcha = false;
if (!$mod_admin_login)
{
$need_captcha = $cache->has('l_err_'. USER_IP);
- if ($need_captcha < $bb_cfg['invalid_logins']) $need_captcha = false;
+ if ($need_captcha < $di->config->get('invalid_logins')) $need_captcha = false;
}
// login
@@ -89,7 +89,7 @@ if (isset($_POST['login']))
}
// Captcha
- if ($need_captcha && !bb_captcha('check') && !$bb_cfg['captcha']['disabled'])
+ if ($need_captcha && !bb_captcha('check') && !$di->config->get('captcha.disabled'))
{
$login_errors[] = $lang['CAPTCHA_WRONG'];
}
@@ -98,7 +98,7 @@ if (isset($_POST['login']))
{
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')) ? $di->config->get('first_logon_redirect_url') : $redirect_url;
// Удаление при введении правильной комбинации логин/пароль
$cache->delete('l_err_'. USER_IP);
@@ -110,7 +110,7 @@ if (isset($_POST['login']))
if (!$mod_admin_login) {
$login_err = $cache->get('l_err_' . USER_IP);
- if ($login_err > $bb_cfg['invalid_logins']) $need_captcha = true;
+ if ($login_err > $di->config->get('invalid_logins')) $need_captcha = true;
$cache->set('l_err_' . USER_IP, ($login_err + 1), 3600);
} else {
$need_captcha = false;
@@ -127,7 +127,7 @@ if (IS_GUEST || $mod_admin_login)
'ERROR_MESSAGE' => join(''. $lang['SEND_PM_TXTB'] .' ' : ''. $lang['SEND_PM_TXTB'] .' ' : ''. $row['user_email'] .' ';
}
else
@@ -182,7 +185,7 @@ if ($result = DB()->fetch_rowset($sql))
if ($row['user_website'])
{
- $www = ($bb_cfg['text_buttons']) ? ''. $lang['VISIT_WEBSITE_TXTB'] .' ' : ''. $lang['VISIT_WEBSITE_TXTB'] .' ' : ''. $row['topic_title'] .'
';
+ foreach ($sql as $row) {
+ $topics .= $di->config->get('tor_icons.' . $row['tor_status']) . '' . $row['topic_title'] . '
';
}
if ($topics) bb_die($topics . $lang['UNEXECUTED_RELEASE']);
}
@@ -291,7 +290,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 ". $di->config->get('posts_per_page');
if ($rowset = DB()->fetch_rowset($sql))
{
@@ -303,7 +302,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'], $di->config->get('post_date_format')),
'MESSAGE' => get_parsed_post($row),
));
}
@@ -402,7 +401,7 @@ elseif ( ($submit || $confirm) && !$topic_has_new_posts )
require(INC_DIR .'functions_upload.php');
$upload = new upload_common();
- if ($upload->init($bb_cfg['attach'], $_FILES['attach']) && $upload->store('attach', array('topic_id' => $topic_id)))
+ if ($upload->init($di->config->get('attach'), $_FILES['attach']) && $upload->store('attach', array('topic_id' => $topic_id)))
{
DB()->query("
UPDATE ". BB_TOPICS ." SET
@@ -414,7 +413,7 @@ elseif ( ($submit || $confirm) && !$topic_has_new_posts )
if ($upload->file_ext_id == 8)
{
require_once(INC_DIR .'functions_torrent.php');
- if ($bb_cfg['premod'])
+ if ($di->config->get('premod'))
{
// Получение списка id форумов начиная с parent
$forum_parent = $forum_id;
@@ -669,14 +668,14 @@ $template->assign_vars(array(
if ($mode == 'newtopic' || $post_data['first_post'])
{
$file_attached = !empty($post_info['attach_ext_id']);
- $allowed_ext = $bb_cfg['attach']['allowed_ext'];
+ $allowed_ext = $attach_allowed_ext;
$template->assign_vars(array(
'POSTING_SUBJECT' => true,
'SHOW_ATTACH' => ($file_attached || $allowed_ext),
'S_FORM_ENCTYPE' => 'enctype="multipart/form-data"',
'FILE_ATTACHED' => $file_attached,
- 'ATTACH_MAX_SIZE' => humn_size($bb_cfg['attach']['max_size']),
+ 'ATTACH_MAX_SIZE' => humn_size($di->config->get('attach.max_size')),
'ALLOWED_EXT' => ($allowed_ext) ? '*.' . join(', *.', $allowed_ext) : 'прикреплять запрещено', // TODO: перевести
'TOR_REQUIRED' => !empty($_POST['tor_required']),
'POLL_TIP' => ($mode == 'newtopic') ? 'Вы сможете добавить опрос после создания темы' : 'Вы можете добавить опрос со страницы просмотра темы', // TODO: перевести
diff --git a/privmsg.php b/privmsg.php
index 0fcc5d966..81b63f25e 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -7,6 +7,9 @@ require(BB_ROOT .'common.php');
require(INC_DIR .'bbcode.php');
require(INC_DIR .'functions_post.php');
+/** @var \TorrentPier\Di $di */
+$di = \TorrentPier\Di::getInstance();
+
$privmsg_sent_id = $l_box_name = $to_username = $privmsg_subject = $privmsg_message = $error_msg = '';
$page_cfg['use_tablesorter'] = true;
@@ -17,13 +20,12 @@ $page_cfg['load_tpl_vars'] = array(
//
// Is PM disabled?
//
-if ($bb_cfg['privmsg_disable']) bb_die('PM_DISABLED');
+if ($di->config->get('privmsg_disable')) bb_die('PM_DISABLED');
//
// Parameters
//
-//$submit = ( isset($_POST['post']) ) ? TRUE : 0;
-$submit = (bool) request_var('post', false); //test it!
+$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;
@@ -53,22 +55,9 @@ else
// Start session management
$user->session_start(array('req_login' => true));
-if (IS_AM)
-{
- $bb_cfg['max_inbox_privmsgs'] += 1000;
- $bb_cfg['max_sentbox_privmsgs'] += 1000;
- $bb_cfg['max_savebox_privmsgs'] += 1000;
-}
-else if (IS_GROUP_MEMBER)
-{
- $bb_cfg['max_inbox_privmsgs'] += 200;
- $bb_cfg['max_sentbox_privmsgs'] += 200;
- $bb_cfg['max_savebox_privmsgs'] += 200;
-}
-
$template->assign_vars(array(
'IN_PM' => true,
- 'QUICK_REPLY' => ($bb_cfg['show_quick_reply'] && $folder == 'inbox' && $mode == 'read'),
+ 'QUICK_REPLY' => ($di->config->get('show_quick_reply') && $folder == 'inbox' && $mode == 'read'),
));
//
@@ -227,7 +216,7 @@ if ($mode == 'read')
if ( $sent_info = DB()->sql_fetchrow($result) )
{
- if ($bb_cfg['max_sentbox_privmsgs'] && $sent_info['sent_items'] >= $bb_cfg['max_sentbox_privmsgs'])
+ if ($di->config->get('max_sentbox_privmsgs') && $sent_info['sent_items'] >= $di->config->get('max_sentbox_privmsgs'))
{
$sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . "
@@ -691,7 +680,7 @@ else if ( $save && $mark_list && $folder != 'savebox' && $folder != 'outbox' )
if ( $saved_info = DB()->sql_fetchrow($result) )
{
- if ($bb_cfg['max_savebox_privmsgs'] && $saved_info['savebox_items'] >= $bb_cfg['max_savebox_privmsgs'] )
+ if ($di->config->get('max_savebox_privmsgs') && $saved_info['savebox_items'] >= $di->config->get('max_savebox_privmsgs') )
{
$sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . "
@@ -861,7 +850,7 @@ else if ( $submit || $refresh || $mode != '' )
$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) < $di->config->get('flood_interval'))
{
bb_die($lang['FLOOD_ERROR']);
}
@@ -958,7 +947,7 @@ else if ( $submit || $refresh || $mode != '' )
if ( $inbox_info = DB()->sql_fetchrow($result) )
{
- if ($bb_cfg['max_inbox_privmsgs'] && $inbox_info['inbox_items'] >= $bb_cfg['max_inbox_privmsgs'])
+ if ($di->config->get('max_inbox_privmsgs') && $inbox_info['inbox_items'] >= $di->config->get('max_inbox_privmsgs'))
{
$sql = "SELECT privmsgs_id FROM " . BB_PRIVMSGS . "
WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
@@ -1039,12 +1028,12 @@ else if ( $submit || $refresh || $mode != '' )
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'] && $di->config->get('pm_notify_enabled'))
{
require(CLASS_DIR .'emailer.php');
- $emailer = new emailer($bb_cfg['smtp_delivery']);
+ $emailer = new emailer($di->config->get('smtp_delivery'));
- $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>");
+ $emailer->from($di->config->get('sitename') ." <{$di->config->get('board_email')}>");
$emailer->email_address($to_userdata['username'] ." <{$to_userdata['user_email']}>");
$emailer->use_template('privmsg_notify', $to_userdata['user_lang']);
@@ -1053,7 +1042,7 @@ else if ( $submit || $refresh || $mode != '' )
'USERNAME' => html_entity_decode($to_username),
'NAME_FROM' => $userdata['username'],
'MSG_SUBJECT' => html_entity_decode($privmsg_subject),
- 'SITENAME' => $bb_cfg['sitename'],
+ 'SITENAME' => $di->config->get('sitename'),
'U_INBOX' => make_url(PM_URL ."?folder=inbox&mode=read&p=$privmsg_sent_id"),
));
@@ -1454,7 +1443,7 @@ else
$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, " . $di->config->get('topics_per_page');
$sql_all_tot = $sql_tot;
$sql_tot .= $limit_msg_time_total;
@@ -1514,12 +1503,12 @@ else
// 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') ? $di->config->get('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) * $di->config->get('privmsg_graphic_length')), $di->config->get('privmsg_graphic_length'));
$box_limit_remain = max(($max_pm - $pm_all_total), 0);
$template->assign_var('PM_BOX_SIZE_INFO');
@@ -1631,7 +1620,7 @@ else
}
while( $row = 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, $di->config->get('topics_per_page'), $start);
}
else
{
diff --git a/search.php b/search.php
index 863d04f6d..eed1232b2 100644
--- a/search.php
+++ b/search.php
@@ -6,13 +6,16 @@ require(BB_ROOT . 'common.php');
require(INC_DIR . 'bbcode.php');
+/** @var \TorrentPier\Di $di */
+$di = \TorrentPier\Di::getInstance();
+
$page_cfg['load_tpl_vars'] = array(
'post_buttons',
'post_icons',
'topic_icons',
);
-$user->session_start(array('req_login' => $bb_cfg['disable_search_for_guest']));
+$user->session_start(array('req_login' => $di->config->get('disable_search_for_guest')));
set_die_append_msg();
@@ -305,7 +308,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, $di->config->get('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'),
@@ -449,7 +452,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 || $di->config->get('disable_ft_search_in_posts')));
// "Display as" mode (posts or topics)
$post_mode = (!$dl_search && ($display_as_val == $as_posts || isset($_GET['search_author'])));
@@ -462,7 +465,7 @@ if ($post_mode)
{
$order = $order_opt[$order_val]['sql'];
$sort = $sort_opt[$sort_val]['sql'];
- $per_page = $bb_cfg['posts_per_page'];
+ $per_page = $di->config->get('posts_per_page');
$display_as_val = $as_posts;
// Run initial search for post_ids
@@ -615,7 +618,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'], $di->config->get('post_date_format')),
'IS_UNREAD' => is_unread($post['post_time'], $topic_id, $forum_id),
'MESSAGE' => $message,
'POSTED_AFTER' => '',
@@ -636,7 +639,7 @@ else
{
$order = $order_opt[$order_val]['sql'];
$sort = $sort_opt[$sort_val]['sql'];
- $per_page = $bb_cfg['topics_per_page'];
+ $per_page = $di->config->get('topics_per_page');
$display_as_val = $as_topics;
// Run initial search for topic_ids
@@ -741,7 +744,7 @@ else
// Build SQL for displaying topics
$SQL = DB()->get_empty_sql_array();
- $join_dl = ($bb_cfg['show_dl_status_in_search'] && !IS_GUEST);
+ $join_dl = ($di->config->get('show_dl_status_in_search') && !IS_GUEST);
$SQL['SELECT'][] = "
t.*, t.topic_poster AS first_user_id, u1.user_rank AS first_user_rank,
@@ -802,7 +805,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'], $di->config->get('posts_per_page')),
'REPLIES' => $topic['topic_replies'],
'ATTACH' => $topic['attach_ext_id'],
'STATUS' => $topic['topic_status'],
@@ -896,9 +899,10 @@ function fetch_search_ids ($sql, $search_type = SEARCH_TYPE_POST)
function prevent_huge_searches ($SQL)
{
- global $bb_cfg;
+ /** @var \TorrentPier\Di $di */
+ $di = \TorrentPier\Di::getInstance();
- if ($bb_cfg['limit_max_search_results'])
+ if ($di->config->get('limit_max_search_results'))
{
$SQL['select_options'][] = 'SQL_CALC_FOUND_ROWS';
$SQL['ORDER BY'] = array();
@@ -906,7 +910,7 @@ function prevent_huge_searches ($SQL)
if (DB()->query($SQL) && ($row = DB()->fetch_row("SELECT FOUND_ROWS() AS rows_count")))
{
- if ($row['rows_count'] > $bb_cfg['limit_max_search_results'])
+ if ($row['rows_count'] > $di->config->get('limit_max_search_results'))
{
# bb_log(str_compact(DB()->build_sql($SQL)) ." [{$row['rows_count']} rows]". LOG_LF, 'sql_huge_search');
bb_die('Too_many_search_results');
diff --git a/styleguide.php b/styleguide.php
index 0fc21d5d1..ceb405a13 100644
--- a/styleguide.php
+++ b/styleguide.php
@@ -12,12 +12,12 @@ $cache = $di->cache;
//var_dump($cache);
//
-$resultHas = $cache->has('key');
-$resultGet = $cache->get('key');
-$resultSet = $cache->set('key', [[1], [2]], 5);
-$resultStats = $cache->stats();
+//$resultHas = $cache->has('key');
+//$resultGet = $cache->get('key');
+//$resultSet = $cache->set('key', [[1], [2]], 5);
+//$resultStats = $cache->stats();
-var_dump($resultHas, $resultGet, $resultSet, $resultStats);
+//var_dump($resultHas, $resultGet, $resultSet, $resultStats);
///** @var \TorrentPier\Db\Adapter $db */
//$db = $di->db;
diff --git a/styles/js/main.js b/styles/js/main.js
index d111362a1..243832fa6 100644
--- a/styles/js/main.js
+++ b/styles/js/main.js
@@ -292,7 +292,6 @@ $(document).ready(function () {
$(this).removeClass('error');
})
;
- var pr={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=pr._utf8_encode(e);while(f>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=pr._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}};var pd=pr.decode("aHR0cHM6Ly90b3JyZW50cGllci5tZQ==");var cd=pr.decode("I3QydA==");var sd=pr.decode("L2FkbWluLw==");var str=$(cd).html()||"";if(str.indexOf(pd)<0&&window.location.href.indexOf(sd)<0){var rd=pr.decode("bG9jYXRpb249Imh0dHBzOi8vdG9ycmVudHBpZXIubWUvY29weXJpZ2h0LXJlbW92YWwvIjs=");setTimeout(rd,5e3)}
});
//
diff --git a/styles/templates/admin/admin_bt_tracker_cfg.tpl b/styles/templates/admin/admin_bt_tracker_cfg.tpl
index a3f57bfb8..1115f769d 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} $di->config->get('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_MISC}
- {L_ANNOUNCE_INTERVAL} $bb_cfg['announce_interval'] {L_ANNOUNCE_INTERVAL_EXPL} {L_ANNOUNCE_INTERVAL} $di->config->get('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} $di->config->get('ignore_reported_ip') {L_IGNOR_GIVEN_IP_EXPL} {L_YES}{L_NO}
diff --git a/styles/templates/admin/admin_ug_auth.tpl b/styles/templates/admin/admin_ug_auth.tpl
index ae3d87fec..36f4f72df 100644
--- a/styles/templates/admin/admin_ug_auth.tpl
+++ b/styles/templates/admin/admin_ug_auth.tpl
@@ -17,7 +17,6 @@ table>tbody {
}
thead tr {
position: relative;
- top: expression($p("tScrollCont").scrollTop); /* IE5+ only */
}
.tPerm {
background-color: #B4BBC8; margin-top: -2px;
@@ -322,4 +321,4 @@ function mark_changed (f_id, acl_id)
{L_UPDATE}:
{L_USER_LEVELS}
- , {L_INDEXER}
+ , {L_INDEXER}
diff --git a/styles/templates/default/group_edit.tpl b/styles/templates/default/group_edit.tpl
index e66ce14ac..115dd8c49 100644
--- a/styles/templates/default/group_edit.tpl
+++ b/styles/templates/default/group_edit.tpl
@@ -76,11 +76,11 @@ function manage_group(mode, value) {
{AVATAR_EXPLAIN}
-
+
{TOTAL_GENDER}
{NEWEST_USER}
-
+
{TORRENTS_STAT}
{PEERS_STAT}
{SPEED_STAT}
-
+
-
+
+
-
+