Для обновления до стабильной ревизии R600, вам необходимо воспользоваться инструкцией, опубликованной в данной теме на нашем форуме.
- Вы также можете заглянуть в исходный код этого скрипта, в нем опубликована схема изменений от ревизии 400,
- до ревизии 600. Не забывайте про бекап базы данных перед обновлением!
-');
-
-/*
-
-Схема изенений r400->r600 для написания конвертера.
-
-Изменения в базе:
-
-INSERT INTO `bb_config` VALUES ('tor_comment', '1'); // добавлено 407
-ALTER TABLE `bb_posts` ADD `post_mod_comment` TEXT NOT NULL DEFAULT ''; // добавлено 458
-ALTER TABLE `bb_posts` ADD `post_mod_comment_type` TINYINT( 1 ) NOT NULL DEFAULT '0'; // добавлено 458
-ALTER TABLE `bb_posts` ADD `post_mc_mod_id` mediumint(8) NOT NULL; // добавлено 458
-ALTER TABLE `bb_posts` ADD `post_mc_mod_name` varchar(25) NOT NULL DEFAULT ''; // добавлено 458
-
-// 496 - отдельный конвертер
-
-ALTER TABLE `bb_users` ADD `tpl_name` varchar(255) NOT NULL DEFAULT 'default'; // добавлено 507
-UPDATE `bb_config` SET `config_value` = '1' WHERE `config_name` = 'bt_unset_dltype_on_tor_unreg';
- // изменено 508 ↑
-ALTER TABLE `bb_users` DROP `ignore_srv_load`; // удалено 537
-UPDATE `bb_users` SET `username` = 'Guest' WHERE `user_id` = -1; // изменено 540
-DROP TABLE IF EXISTS `bb_bt_torrents_del`; // удалено 551
-DROP TABLE IF EXISTS `xbt_announce_log`; // удалено 551
-DROP TABLE IF EXISTS `xbt_config`; // удалено 551
-DROP TABLE IF EXISTS `xbt_deny_from_hosts`; // удалено 551
-DROP TABLE IF EXISTS `xbt_files_users`; // удалено 551
-DROP TABLE IF EXISTS `xbt_scrape_log`; // удалено 551
-ALTER TABLE `bb_bt_tracker` DROP `xbt_error`; // удалено 551
-DELETE FROM `bb_config` WHERE `config_name` = 'torrent_pass_private_key'; // удалено 551
-DELETE FROM `bb_config` WHERE `config_name` = 'board_email'; // удалено 552
-DELETE FROM `bb_config` WHERE `config_name` = 'board_email_form'; // удалено 552
-DELETE FROM `bb_config` WHERE `config_name` = 'board_email_sig'; // удалено 552
-DELETE FROM `bb_config` WHERE `config_name` = 'smtp_delivery'; // удалено 552
-DELETE FROM `bb_config` WHERE `config_name` = 'smtp_host'; // удалено 552
-DELETE FROM `bb_config` WHERE `config_name` = 'smtp_password'; // удалено 552
-DELETE FROM `bb_config` WHERE `config_name` = 'smtp_username'; // удалено 552
-DELETE FROM `bb_config` WHERE `config_name` = 'gallery_enabled'; // удалено 554
-DELETE FROM `bb_config` WHERE `config_name` = 'pic_dir'; // удалено 554
-DELETE FROM `bb_config` WHERE `config_name` = 'pic_max_size'; // удалено 554
-DELETE FROM `bb_config` WHERE `config_name` = 'auto_delete_posted_pics'; // удалено 554
-DELETE FROM `bb_config` WHERE `config_name` = 'allow_avatar_remote'; // удалено 555
-ALTER TABLE `bb_topics` DROP COLUMN `is_draft`; // удалено 558
-DELETE FROM `bb_config` WHERE `config_name` = 'bt_add_comment'; // удалено 565
-DELETE FROM `bb_config` WHERE `config_name` = 'bt_add_publisher'; // удалено 565
-DELETE FROM `bb_config` WHERE `config_name` = 'bt_gen_passkey_on_reg'; // удалено 565
-DROP TABLE IF EXISTS `sph_counter`; // удалено 571
-
-// 571 - отдельный конвертер
-
-DELETE FROM `bb_config` WHERE `config_name` = 'max_inbox_privmsgs'; // удалено 573
-DELETE FROM `bb_config` WHERE `config_name` = 'max_savebox_privmsgs'; // удалено 573
-DELETE FROM `bb_config` WHERE `config_name` = 'max_sentbox_privmsgs'; // удалено 573
-DELETE FROM `bb_config` WHERE `config_name` = 'privmsg_disable'; // удалено 573
-
-// 575 - отдельный конвертер
-
-DELETE FROM `bb_config` WHERE `config_name` = 'config_id'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'sendmail_fix'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'version'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'xs_add_comments'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'xs_auto_compile'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'xs_auto_recompile'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'xs_php'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'xs_shownav'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'xs_template_time'; // удалено 579
-DELETE FROM `bb_config` WHERE `config_name` = 'xs_version'; // удалено 579
-INSERT INTO `bb_cron` VALUES (22, 1, 'Attach maintenance', 'attach_maintenance.php', 'daily', NULL, '05:00:00', 40, '', '', NULL, 1, '', 0, 1, 0);
- // добавлено 582 ↑
-DELETE FROM `bb_config` WHERE `config_name` = 'allow_avatar_local'; // удалено 583
-DELETE FROM `bb_config` WHERE `config_name` = 'allow_avatar_upload'; // удалено 583
-DELETE FROM `bb_config` WHERE `config_name` = 'avatar_filesize'; // удалено 583
-DELETE FROM `bb_config` WHERE `config_name` = 'avatar_gallery_path'; // удалено 583
-DELETE FROM `bb_config` WHERE `config_name` = 'avatar_max_height'; // удалено 583
-DELETE FROM `bb_config` WHERE `config_name` = 'avatar_max_width'; // удалено 583
-DELETE FROM `bb_config` WHERE `config_name` = 'avatar_path'; // удалено 583
-DELETE FROM `bb_config` WHERE `config_name` = 'require_activation'; // удалено 583
-DELETE FROM `bb_config` WHERE `config_name` = 'no_avatar'; // удалено 583
-UPDATE `bb_config` SET `config_value` = '0' WHERE `config_name` = 'show_mod_index'; // изменено 583
-DELETE FROM `bb_cron` WHERE `cron_script` = 'avatars_cleanup.php'; // удалено 583
-UPDATE `bb_cron` SET `cron_id` = '3' WHERE `cron_script` = 'attach_maintenance.php'; // изменено 583
-
-// 583 - отдельный конвертер
-
-DROP TABLE IF EXISTS `bb_topic_templates`; // удалено 584
-ALTER TABLE `bb_forums` DROP `topic_tpl_id`; // удалено 584
-UPDATE `bb_config` SET `config_value` = 'http://ip-whois.net/ip_geos.php?ip=' WHERE `config_name` = 'whois_info';
- // обновлено 586 ↑
-UPDATE `bb_config` SET `config_value` = 'ru' WHERE `config_name` = 'default_lang'; // обновлено 588
-
-// 588 - отдельный конвертер
-
-ALTER TABLE `bb_users` DROP `user_next_birthday_greeting`; // удалено 589
-ALTER TABLE `bb_posts` CHANGE `post_mod_comment` `mc_comment` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
- // изменено 590 ↑
-ALTER TABLE `bb_posts` CHANGE `post_mod_comment_type` `mc_type` TINYINT(1) NOT NULL DEFAULT '0';
- // изменено 590 ↑
-ALTER TABLE `bb_posts` CHANGE `post_mc_mod_id` `mc_user_id` MEDIUMINT(8) NOT NULL DEFAULT '0';
- // изменено 590 ↑
-ALTER TABLE `bb_posts` DROP `post_mc_mod_name`; // удалено 590
-DELETE FROM `bb_attachments_config` WHERE `config_name` = 'allow_ftp_upload'; // удалено 592
-DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_server'; // удалено 592
-DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_path'; // удалено 592
-DELETE FROM `bb_attachments_config` WHERE `config_name` = 'download_path'; // удалено 592
-DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_user'; // удалено 592
-DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_pass'; // удалено 592
-DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_pasv_mode'; // удалено 592
-DELETE FROM `bb_extensions` WHERE `extension` = 'wma'; // удалено 592
-DELETE FROM `bb_extensions` WHERE `extension` = 'swf'; // удалено 592
-UPDATE `bb_extensions` SET `group_id` = '6' WHERE `extension` = 'torrent'; // изменено 592
-DELETE FROM `bb_extension_groups` WHERE `group_name` = 'Streams'; // удалено 592
-DELETE FROM `bb_extension_groups` WHERE `group_name` = 'Flash Files'; // удалено 592
-UPDATE `bb_extension_groups` SET `group_id` = '6' WHERE `group_id` = 8; // изменено 592
-INSERT INTO `bb_config` VALUES ('sitemap_time', ''); // добавлено 593
-INSERT INTO `bb_config` VALUES ('static_sitemap', ''); // добавлено 593
-INSERT INTO `bb_cron` VALUES (22, 1, 'Sitemap update', 'sitemap.php', 'daily', NULL, '06:00:00', 30, '', '', NULL, 0, '', 0, 0, 0);
- // добавлено 593 ↑
-INSERT INTO `bb_cron` VALUES (23, 1, 'Update forums atom', 'update_forums_atom.php', 'interval', NULL, NULL, 255, '', '', '00:15:00', 0, '', 0, 0, 0);
- // добавлено 595 ↑
-UPDATE `bb_attachments_config` SET `config_value` = 'old_files' WHERE `config_name` = 'upload_dir';
- // изменено 595 ↑
-DELETE FROM `bb_smilies` WHERE `code` = ':cd:'; // удалено 596
-ALTER TABLE `bb_groups` CHANGE `group_description` `group_description` text NOT NULL DEFAULT '';
- // изменено 598 ↑
-ALTER TABLE `bb_groups` ADD `avatar_ext_id` int(15) NOT NULL DEFAULT '0' AFTER `group_id`;
- // добавлено 598 ↑
-ALTER TABLE `bb_groups` ADD `mod_time` INT(11) NOT NULL DEFAULT '0' AFTER `group_time`;
- // добавлено 598 ↑
-ALTER TABLE `bb_groups` ADD `release_group` tinyint(4) NOT NULL DEFAULT '0' AFTER `group_type`;
- // добавлено 598 ↑
-ALTER TABLE `bb_groups` ADD `group_signature` text NOT NULL DEFAULT '' AFTER `group_description`;
- // добавлено 598 ↑
-ALTER TABLE `bb_posts` ADD `poster_rg_id` mediumint(8) NOT NULL DEFAULT '0' AFTER `poster_ip`;
- // добавлено 598 ↑
-ALTER TABLE `bb_posts` ADD `attach_rg_sig` tinyint(4) NOT NULL DEFAULT '0' AFTER `poster_rg_id`;
- // добавлено 598 ↑
-INSERT INTO `bb_config` VALUES ('terms', ''); // добавлено 599b
-
-Удаленные файлы/папки:
-
-admin/.htaccess
-admin/admin_topic_templates.php
-admin/admin_xs.php
-admin/xs_cache.php
-admin/xs_config.php
-admin/xs_frameset.php
-admin/xs_include.php
-admin/xs_index.php
-develop
-images/avatars/bot.gif
-images/logo/logo_big.png
-images/smiles/cd.gif
-images/smiles/smileys.pak
-images/icon_disk.gif
-images/icon_disk_gray.gif
-includes/cron/jobs/avatars_cleanup.php
-includes/topic_templates
-includes/ucp/torrent_userprofile.php
-includes/ucp/usercp_activate.php
-includes/ucp/usercp_attachcp.php
-includes/ucp/usercp_avatar.php
-includes/ucp/usercp_bonus.php
-includes/ucp/usercp_email.php
-includes/ucp/usercp_register.php
-includes/ucp/usercp_sendpasswd.php
-includes/ucp/usercp_viewprofile.php
-includes/sphinxapi.php
-includes/topic_templates.php
-language/lang_english
-language/lang_russian
-misc/html
-misc/.htaccess
-pictures
-templates/admin/admin_topic_templates.tpl
-templates/default/images/lang_english
-templates/default/images/lang_russian
-templates/default/images/index.html
-templates/default/topic_templates
-templates/default/agreement.tpl
-templates/default/donate.tpl
-templates/default/faq.tpl
-templates/default/gallery.tpl
-templates/default/posting_poll.tpl
-templates/default/posting_tpl.tpl
-templates/default/usercp_avatar_gallery.tpl
-templates/default/viewonline.tpl
-templates/xs_mod
-templates/board_disabled_exit.php
-templates/limit_load_exit.php
-templates/topic_tpl_overall_header.html
-templates/topic_tpl_rules_video.html
-donate.php
-download.php
-faq.php
-gallery.php
-viewonline.php
-
-Прочие изменения:
-
-Все файлы перекодированы для использования окончаний строк LF.
-
- */
diff --git a/library/attach_mod/attachment_mod.php b/library/attach_mod/attachment_mod.php
index d587b489f..62baa579b 100644
--- a/library/attach_mod/attachment_mod.php
+++ b/library/attach_mod/attachment_mod.php
@@ -23,8 +23,8 @@
* SOFTWARE.
*/
-if (!defined('IN_FORUM')) {
- die("Hacking attempt");
+if (!defined('BB_ROOT')) {
+ die(basename(__FILE__));
}
require ATTACH_DIR . '/includes/functions_includes.php';
diff --git a/library/attach_mod/displaying.php b/library/attach_mod/displaying.php
index 6d2b91f44..edbca80d1 100644
--- a/library/attach_mod/displaying.php
+++ b/library/attach_mod/displaying.php
@@ -23,8 +23,8 @@
* SOFTWARE.
*/
-if (!defined('IN_FORUM')) {
- die("Hacking attempt");
+if (!defined('BB_ROOT')) {
+ die(basename(__FILE__));
}
$allowed_extensions = array();
diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index 76884d1d2..062ee4835 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
-if (!defined('IN_FORUM')) {
+if (!defined('BB_ROOT')) {
die(basename(__FILE__));
}
diff --git a/library/attach_mod/includes/functions_thumbs.php b/library/attach_mod/includes/functions_thumbs.php
index fea9f9963..4c516d061 100644
--- a/library/attach_mod/includes/functions_thumbs.php
+++ b/library/attach_mod/includes/functions_thumbs.php
@@ -23,8 +23,8 @@
* SOFTWARE.
*/
-if (!defined('IN_FORUM')) {
- die("Hacking attempt");
+if (!defined('BB_ROOT')) {
+ die(basename(__FILE__));
}
$imagick = '';
diff --git a/library/attach_mod/posting_attachments.php b/library/attach_mod/posting_attachments.php
index 59f453323..86f65f50f 100644
--- a/library/attach_mod/posting_attachments.php
+++ b/library/attach_mod/posting_attachments.php
@@ -23,8 +23,8 @@
* SOFTWARE.
*/
-if (!defined('IN_FORUM')) {
- die('Hacking attempt');
+if (!defined('BB_ROOT')) {
+ die(basename(__FILE__));
}
define('FILENAME_PREFIX', false);
diff --git a/library/config.php b/library/config.php
index bb7feff3b..004e600b6 100644
--- a/library/config.php
+++ b/library/config.php
@@ -23,71 +23,11 @@
* SOFTWARE.
*/
-/**
- * Script versions
- * Domain name
- * Version info
- * Database
- * - Charset
- * - Config
- * - Aliases
- * Cache
- * - Config
- * - Datastore
- * Server
- * - Cloudflare
- * - GZip
- * Tracker
- * Ocelot
- * FAQ url
- * Torrents
- * - Ratio limits
- * - Seeding torrents limit
- * - DL-Status (days to keep)
- * - Tor-Stats (days to keep)
- * - Tor-Help
- * Path
- * URL's
- * Language
- * Templates
- * Cookie
- * Sessions
- * Registration
- * Email
- * Debug
- * Bugsnag error reporting
- * Special users (dbg_users, unlimited_users, super_admins)
- * Log options
- * Error reporting
- * Triggers
- * Date format
- * Subforums
- * Forums
- * Topics
- * Posts
- * Search
- * Posting
- * PM
- * Actions log
- * Users
- * Groups
- * Tidy
- * Misc
- * Extensions
- * Attachments
- * Avatars
- * Group avatars
- * Captcha
- * Atom feed
- * Nofollow
- * Local config
- **/
-
if (!defined('BB_ROOT')) {
die(basename(__FILE__));
}
-$bb_cfg = $tr_cfg = $page_cfg = array();
+$bb_cfg = $tr_cfg = $page_cfg = [];
// Increase number after changing js or css
$bb_cfg['js_ver'] = $bb_cfg['css_ver'] = 1;
@@ -98,8 +38,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Version info
$bb_cfg['tp_version'] = '2.1.6';
-$bb_cfg['tp_release_date'] = '01-07-2017';
-$bb_cfg['tp_release_state'] = 'STABLE';
+$bb_cfg['tp_release_date'] = '07-07-2017';
+$bb_cfg['tp_release_codename'] = 'Aurochs';
// Database
$charset = 'utf8';
@@ -108,25 +48,20 @@ $pconnect = false;
// Настройка баз данных ['db']['srv_name'] => (array) srv_cfg;
// порядок параметров srv_cfg (хост, название базы, пользователь, пароль, charset, pconnect);
$bb_cfg['db'] = array(
- 'db1' => array('localhost', 'tp_216', 'user', 'pass', $charset, $pconnect),
- //'db2' => array('localhost2', 'dbase2', 'user2', 'pass2', $charset, $pconnect),
- //'db3' => array('localhost3', 'dbase3', 'user2', 'pass3', $charset, $pconnect),
+ 'db' => array('localhost', 'tp_216', 'user', 'pass', $charset, $pconnect),
);
$bb_cfg['db_alias'] = array(
// 'alias' => 'srv_name'
-# db1
- 'log' => 'db1', // BB_LOG
- 'search' => 'db1', // BB_TOPIC_SEARCH
- 'sres' => 'db1', // BB_BT_USER_SETTINGS, BB_SEARCH_RESULTS
- 'u_ses' => 'db1', // BB_USER_SES, BB_USER_LASTVISIT
-# db2
- 'dls' => 'db1', // BB_BT_DLS_*
- 'ip' => 'db1', // BB_POSTS_IP
- 'ut' => 'db1', // BB_TOPICS_USER_POSTED
-# db3
- 'pm' => 'db1', // BB_PRIVMSGS, BB_PRIVMSGS_TEXT
- 'pt' => 'db1', // BB_POSTS_TEXT
+ 'log' => 'db', // BB_LOG
+ 'search' => 'db', // BB_TOPIC_SEARCH
+ 'sres' => 'db', // BB_BT_USER_SETTINGS, BB_SEARCH_RESULTS
+ 'u_ses' => 'db', // BB_USER_SES, BB_USER_LASTVISIT
+ 'dls' => 'db', // BB_BT_DLS_*
+ 'ip' => 'db', // BB_POSTS_IP
+ 'ut' => 'db', // BB_TOPICS_USER_POSTED
+ 'pm' => 'db', // BB_PRIVMSGS, BB_PRIVMSGS_TEXT
+ 'pt' => 'db', // BB_POSTS_TEXT
);
// Cache
@@ -165,11 +100,6 @@ $bb_cfg['server_name'] = $domain_name;
$bb_cfg['server_port'] = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : 80; // The port your server is running on
$bb_cfg['script_path'] = '/'; // The path where FORUM is located relative to the domain name
-// Cloudflare
-if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])) {
- $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP'];
-}
-
// GZip
$bb_cfg['gzip_compress'] = true; // compress output
@@ -237,15 +167,15 @@ $bb_cfg['tor_help_links'] = 'terms.php';
$bb_cfg['seeder_last_seen_days_keep'] = 0; // сколько дней назад был сид последний раз
$bb_cfg['seeder_never_seen_days_keep'] = 0; // сколько дней имеется статус "Сида не было никогда"
-// Ratio limits
-define('TR_RATING_LIMITS', true); // ON/OFF
-define('MIN_DL_FOR_RATIO', 10737418240); // 10 GB in bytes, 0 - disable
-
-// Don't change the order of ratios (from 0 to 1)
-// rating < 0.4 -- allow only 1 torrent for leeching
-// rating < 0.5 -- only 2
-// rating < 0.6 -- only 3
-// rating > 0.6 -- depend on your tracker config limits (in "ACP - Tracker Config - Limits")
+/**
+ * Ratio limits
+ *
+ * Don't change the order of ratios (from 0 to 1):
+ * rating < 0.4 -- allow only 1 torrent for leeching
+ * rating < 0.5 -- only 2
+ * rating < 0.6 -- only 3
+ * rating > 0.6 -- depend on your tracker config limits (in "ACP - Tracker Config - Limits")
+ */
$rating_limits = array(
'0.4' => 1,
'0.5' => 2,
@@ -270,25 +200,6 @@ $page_cfg['show_torhelp'] = array(
'tracker' => true,
);
-// Path (trailing slash '/' at the end: XX_PATH - without, XX_DIR - with)
-define('BB_PATH', dirname(__DIR__));
-define('ADMIN_DIR', BB_PATH . '/admin');
-define('DATA_DIR', BB_PATH . '/data');
-define('INT_DATA_DIR', BB_PATH . '/internal_data');
-define('AJAX_HTML_DIR', BB_PATH . '/internal_data/ajax_html');
-define('CACHE_DIR', BB_PATH . '/internal_data/cache');
-define('LOG_DIR', BB_PATH . '/internal_data/log');
-define('SITEMAP_DIR', BB_PATH . '/internal_data/sitemap');
-define('TRIGGERS_DIR', BB_PATH . '/internal_data/triggers');
-define('AJAX_DIR', BB_PATH . '/library/ajax');
-define('ATTACH_DIR', BB_PATH . '/library/attach_mod');
-define('CFG_DIR', BB_PATH . '/library/config');
-define('INC_DIR', BB_PATH . '/library/includes');
-define('UCP_DIR', BB_PATH . '/library/includes/ucp');
-define('LANG_ROOT_DIR', BB_PATH . '/library/language');
-define('IMAGES_DIR', BB_PATH . '/styles/images');
-define('TEMPLATES_DIR', BB_PATH . '/styles/templates');
-
// URL's
$bb_cfg['ajax_url'] = 'ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php"
$bb_cfg['login_url'] = 'login.php'; # "http://{$domain_name}/login.php"
@@ -335,8 +246,6 @@ $bb_cfg['lang'] = array(
);
// Templates
-define('ADMIN_TPL_DIR', TEMPLATES_DIR . '/admin/');
-
$bb_cfg['templates'] = array(
// 'folder' => 'Name',
'default' => 'Стандартный',
@@ -406,17 +315,6 @@ $bb_cfg['tech_admin_email'] = "admin@$domain_name"; // email for sending error r
$bb_cfg['abuse_email'] = "abuse@$domain_name";
$bb_cfg['adv_email'] = "adv@$domain_name";
-// Debug
-define('DBG_LOG', false); // enable forum debug (off on production)
-define('DBG_TRACKER', false); // enable tracker debug (off on production)
-define('COOKIE_DBG', 'bb_dbg'); // debug cookie name
-define('SQL_DEBUG', true); // enable forum sql & cache debug
-define('SQL_LOG_ERRORS', true); // all SQL_xxx options enabled only if SQL_DEBUG == TRUE
-define('SQL_CALC_QUERY_TIME', true); // for stats
-define('SQL_LOG_SLOW_QUERIES', true); // log sql slow queries
-define('SQL_SLOW_QUERY_TIME', 10); // slow query in seconds
-define('SQL_PREPEND_SRC_COMM', false); // prepend source file comment to sql query
-
// Bugsnag error reporting
$bb_cfg['bugsnag'] = [
'enabled' => false,
@@ -439,18 +337,6 @@ $bb_cfg['super_admins'] = array(
2 => 'admin',
);
-// Log options
-define('LOG_EXT', 'log');
-define('LOG_SEPR', ' | ');
-define('LOG_LF', "\n");
-define('LOG_MAX_SIZE', 1048576); // bytes
-
-// Error reporting
-ini_set('error_reporting', E_ALL);
-ini_set('display_errors', 0);
-ini_set('log_errors', 1);
-ini_set('error_log', LOG_DIR . '/php_err.log');
-
// Check some variable
// Magic quotes
if (get_magic_quotes_gpc()) {
@@ -461,12 +347,6 @@ if (!function_exists('json_encode')) {
die('Json_encode not installed');
}
-// Triggers
-define('BB_ENABLED', TRIGGERS_DIR . '/$on');
-define('BB_DISABLED', TRIGGERS_DIR . '/$off');
-define('CRON_ALLOWED', TRIGGERS_DIR . '/cron_allowed');
-define('CRON_RUNNING', TRIGGERS_DIR . '/cron_running');
-
// Date format
$bb_cfg['date_format'] = 'Y-m-d';
@@ -542,8 +422,6 @@ $bb_cfg['group_members_per_page'] = 50;
$bb_cfg['tidy_post'] = (!in_array('tidy', get_loaded_extensions(), true)) ? false : true;
// Misc
-define('MEM_USAGE', function_exists('memory_get_usage'));
-
$bb_cfg['mem_on_start'] = MEM_USAGE ? memory_get_usage() : 0;
$bb_cfg['translate_dates'] = true; // in displaying time
@@ -558,8 +436,6 @@ $bb_cfg['allow_change'] = array(
'dateformat' => true,
);
-define('GZIP_OUTPUT_ALLOWED', extension_loaded('zlib') && !ini_get('zlib.output_compression'));
-
$banned_user_agents = array(
// Download Master
# 'download',
diff --git a/library/defines.php b/library/defines.php
new file mode 100644
index 000000000..52d467f94
--- /dev/null
+++ b/library/defines.php
@@ -0,0 +1,115 @@
+ '*',
TOR_CLOSED => 'x',
TOR_APPROVED => '√',
@@ -232,10 +227,10 @@ $bb_cfg['tor_icons'] = array(
TOR_CHECKING => '%',
TOR_TMP => 'T',
TOR_PREMOD => '∏',
-);
+];
// Запрет на скачивание
-$bb_cfg['tor_frozen'] = array(
+$bb_cfg['tor_frozen'] = [
TOR_CHECKING => true,
TOR_CLOSED => true,
TOR_CLOSED_CPHOLD => true,
@@ -243,36 +238,52 @@ $bb_cfg['tor_frozen'] = array(
TOR_DUP => true,
TOR_NO_DESC => true,
TOR_PREMOD => true,
-);
+];
// Разрешение на скачку автором, если закрыто на скачивание.
-$bb_cfg['tor_frozen_author_download'] = array(
+$bb_cfg['tor_frozen_author_download'] = [
TOR_CHECKING => true,
TOR_NO_DESC => true,
TOR_PREMOD => true,
-);
+];
// Запрет на редактирование головного сообщения
-$bb_cfg['tor_cannot_edit'] = array(
+$bb_cfg['tor_cannot_edit'] = [
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_cannot_new'] = [TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL];
// Разрешение на ответ релизера, если раздача исправлена.
-$bb_cfg['tor_reply'] = array(TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL);
+$bb_cfg['tor_reply'] = [TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL];
// Если такой статус у релиза, то статистика раздачи будет скрыта
-$bb_cfg['tor_no_tor_act'] = array(
+$bb_cfg['tor_no_tor_act'] = [
TOR_CLOSED => true,
TOR_DUP => true,
TOR_CLOSED_CPHOLD => true,
TOR_CONSUMED => true,
-);
+];
+
+$dl_link_css = [
+ DL_STATUS_RELEASER => 'genmed',
+ DL_STATUS_WILL => 'dlWill',
+ DL_STATUS_DOWN => 'leechmed',
+ DL_STATUS_COMPLETE => 'seedmed',
+ DL_STATUS_CANCEL => 'dlCancel',
+];
+
+$dl_status_css = [
+ DL_STATUS_RELEASER => 'genmed',
+ DL_STATUS_WILL => 'dlWill',
+ DL_STATUS_DOWN => 'dlDown',
+ DL_STATUS_COMPLETE => 'dlComplete',
+ DL_STATUS_CANCEL => 'dlCancel',
+];
// Table names
define('BUF_TOPIC_VIEW', 'buf_topic_view');
@@ -397,6 +408,9 @@ function send_no_cache_headers()
header('Pragma: no-cache');
}
+/**
+ * @param string $output
+ */
function bb_exit($output = '')
{
if ($output) {
@@ -405,47 +419,48 @@ function bb_exit($output = '')
exit;
}
+/**
+ * @param $var
+ * @param string $title
+ * @param bool $print
+ * @return string
+ */
function prn_r($var, $title = '', $print = true)
{
- $r = '
';
-}
-
+/**
+ * @param $txt
+ * @param bool $double_encode
+ * @param int $quote_style
+ * @param string $charset
+ * @return string
+ */
function htmlCHR($txt, $double_encode = false, $quote_style = ENT_QUOTES, $charset = 'UTF-8')
{
return (string)htmlspecialchars($txt, $quote_style, $charset, $double_encode);
}
+/**
+ * @param $txt
+ * @param int $quote_style
+ * @param string $charset
+ * @return string
+ */
function html_ent_decode($txt, $quote_style = ENT_QUOTES, $charset = 'UTF-8')
{
return (string)html_entity_decode($txt, $quote_style, $charset);
}
+/**
+ * @param string $path
+ * @return string
+ */
function make_url($path = '')
{
return FULL_URL . preg_replace('#^\/?(.*?)\/?$#', '\1', $path);
@@ -453,9 +468,6 @@ function make_url($path = '')
require INC_DIR . '/functions.php';
require INC_DIR . '/sessions.php';
-require INC_DIR . '/template.php';
-
-define('SQL_LAYER', 'mysql');
$bb_cfg = array_merge(bb_get_config(BB_CONFIG), $bb_cfg);
@@ -505,22 +517,6 @@ if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !file_exist
}
}
-$dl_link_css = array(
- DL_STATUS_RELEASER => 'genmed',
- DL_STATUS_WILL => 'dlWill',
- DL_STATUS_DOWN => 'leechmed',
- DL_STATUS_COMPLETE => 'seedmed',
- DL_STATUS_CANCEL => 'dlCancel',
-);
-
-$dl_status_css = array(
- DL_STATUS_RELEASER => 'genmed',
- DL_STATUS_WILL => 'dlWill',
- DL_STATUS_DOWN => 'dlDown',
- DL_STATUS_COMPLETE => 'dlComplete',
- DL_STATUS_CANCEL => 'dlCancel',
-);
-
// 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')) {
header('HTTP/1.0 503 Service Unavailable');
@@ -536,7 +532,9 @@ if (($bb_cfg['board_disable'] || file_exists(BB_DISABLED)) && !defined('IN_ADMIN
}
}
-// Cron functions
+/**
+ * Снятие блокировки крона
+ */
function cron_release_deadlock()
{
if (file_exists(CRON_RUNNING)) {
@@ -547,23 +545,39 @@ 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);
}
+/**
+ * @param $lock_file
+ */
function cron_touch_lock_file($lock_file)
{
file_write(make_rand_str(20), $lock_file, 0, true, true);
}
+/**
+ * Включение форума (при блокировке крона)
+ */
function cron_enable_board()
{
- @rename(BB_DISABLED, BB_ENABLED);
+ if (file_exists(BB_DISABLED)) {
+ rename(BB_DISABLED, BB_ENABLED);
+ }
}
+/**
+ * Отключение форума (при блокировке крона)
+ */
function cron_disable_board()
{
- @rename(BB_ENABLED, BB_DISABLED);
+ if (file_exists(BB_ENABLED)) {
+ rename(BB_ENABLED, BB_DISABLED);
+ }
}
diff --git a/library/includes/template.php b/library/includes/template.php
deleted file mode 100644
index 4d1540874..000000000
--- a/library/includes/template.php
+++ /dev/null
@@ -1,56 +0,0 @@
-execute() scope!)
- * "#" - constant, {#CON} is eq to CON
- *
- */
-
-if (!defined('BB_ROOT')) {
- die(basename(__FILE__));
-}
-
-define('XS_SEPARATOR', '.');
-define('XS_USE_ISSET', '1');
-
-// cache filenames prefix
-define('XS_TPL_PREFIX', 'tpl_');
-define('XS_TPL_PREFIX2', 'tpl2_');
-
-// internal xs mod definitions. do not edit.
-define('XS_TAG_NONE', 0);
-define('XS_TAG_PHP', 1);
-define('XS_TAG_BEGIN', 2);
-define('XS_TAG_END', 3);
-define('XS_TAG_INCLUDE', 4);
-define('XS_TAG_IF', 5);
-define('XS_TAG_ELSE', 6);
-define('XS_TAG_ELSEIF', 7);
-define('XS_TAG_ENDIF', 8);
-define('XS_TAG_BEGINELSE', 11);
diff --git a/library/includes/ucp/activate.php b/library/includes/ucp/activate.php
index 588571dd7..a282d93ca 100644
--- a/library/includes/ucp/activate.php
+++ b/library/includes/ucp/activate.php
@@ -23,8 +23,8 @@
* SOFTWARE.
*/
-if (!defined('IN_FORUM')) {
- die('Hacking attempt');
+if (!defined('BB_ROOT')) {
+ die(basename(__FILE__));
}
if (empty($_GET['u']) || empty($_GET['act_key'])) {
diff --git a/library/includes/ucp/email.php b/library/includes/ucp/email.php
index 55b12eb56..ccd798619 100644
--- a/library/includes/ucp/email.php
+++ b/library/includes/ucp/email.php
@@ -23,8 +23,8 @@
* SOFTWARE.
*/
-if (!defined('IN_FORUM')) {
- die("Hacking attempt");
+if (!defined('BB_ROOT')) {
+ die(basename(__FILE__));
}
// Is send through board enabled? No, return to index
diff --git a/library/includes/ucp/sendpasswd.php b/library/includes/ucp/sendpasswd.php
index 895c45da4..12ecdb8cd 100644
--- a/library/includes/ucp/sendpasswd.php
+++ b/library/includes/ucp/sendpasswd.php
@@ -23,8 +23,8 @@
* SOFTWARE.
*/
-if (!defined('IN_FORUM')) {
- die("Hacking attempt");
+if (!defined('BB_ROOT')) {
+ die(basename(__FILE__));
}
set_die_append_msg();
diff --git a/library/language/source/main.php b/library/language/source/main.php
index ce85bdf40..421b1635e 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -1546,7 +1546,7 @@ $lang['DL_UL_SPEED'] = 'UL speed';
$lang['DL_DL_SPEED'] = 'DL speed';
$lang['DL_PORT'] = 'Port';
$lang['DL_FORMULA'] = 'Formula: Uploaded/TorrentSize';
-$lang['DL_ULR'] = 'ULR';
+$lang['DL_ULR'] = 'URL';
$lang['DL_STOPPED'] = 'stopped';
$lang['DL_UPD'] = 'upd: ';
$lang['DL_INFO'] = 'shows data only for the current session';
@@ -1738,7 +1738,7 @@ $lang['CLICK_RETURN_FORUMAUTH'] = 'Click %sHere%s to return to Forum Permissions
// Banning
$lang['BAN_CONTROL'] = 'Ban Control';
-$lang['BAN_EXPLAIN'] = 'Here you can control the banning of users. You can achieve this by banning either or both of a specific user or an individual or range of IP addresses or hostnames. These methods prevent a user from even reaching the index page of your board. To prevent a user from registering under a different username you can also specify a banned email address. Please note that banning an email address alone will not prevent that user from being able to log on or post to your board. You should use one of the first two methods to achieve this.';
+$lang['BAN_EXPLAIN'] = 'Here you can control the banning of users. You can achieve this by banning either or both of a specific user or an individual or range of IP addresses. These methods prevent a user from even reaching the index page of your board. To prevent a user from registering under a different username you can also specify a banned email address. Please note that banning an email address alone will not prevent that user from being able to log on or post to your board. You should use one of the first two methods to achieve this.';
$lang['BAN_EXPLAIN_WARN'] = 'Please note that entering a range of IP addresses results in all the addresses between the start and end being added to the banlist. Attempts will be made to minimise the number of addresses added to the database by introducing wildcards automatically where appropriate. If you really must enter a range, try to keep it small or better yet state specific addresses.';
$lang['SELECT_IP'] = 'Select an IP address';
@@ -1747,9 +1747,9 @@ $lang['SELECT_EMAIL'] = 'Select an Email address';
$lang['BAN_USERNAME'] = 'Ban one or more specific users';
$lang['BAN_USERNAME_EXPLAIN'] = 'You can ban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser';
-$lang['BAN_IP'] = 'Ban one or more IP addresses or hostnames';
-$lang['IP_HOSTNAME'] = 'IP addresses or hostnames';
-$lang['BAN_IP_EXPLAIN'] = 'To specify several different IP addresses or hostnames separate them with commas. To specify a range of IP addresses, separate the start and end with a hyphen (-); to specify a wildcard, use an asterisk (*).';
+$lang['BAN_IP'] = 'Ban one or more IP addresses';
+$lang['IP_HOSTNAME'] = 'IP addresses';
+$lang['BAN_IP_EXPLAIN'] = 'To specify several different IP addresses separate them with commas.';
$lang['BAN_EMAIL'] = 'Ban one or more email addresses';
$lang['BAN_EMAIL_EXPLAIN'] = 'To specify more than one email address, separate them with commas. To specify a wildcard username, use * like *@hotmail.com';
@@ -2661,7 +2661,7 @@ $lang['SEARCH_USERS_ADVANCED'] = 'Advanced User Search';
$lang['SEARCH_USERS_EXPLAIN'] = 'This Module allows you to perform advanced searches for users on a wide range of criteria. Please read the descriptions under each field to understand each search option completely.';
$lang['SEARCH_USERNAME_EXPLAIN'] = 'Here you can perform a case insensitive search for usernames. If you would like to match part of the username, use * (an asterix) as a wildcard.';
$lang['SEARCH_EMAIL_EXPLAIN'] = 'Enter an expression to match a user\'s email address. This is case insensitive. If you want to do a partial match, use * (an asterix) as a wildcard.';
-$lang['SEARCH_IP_EXPLAIN'] = 'Search for users by a specific IP address (xxx.xxx.xxx.xxx), wildcard (xxx.xxx.xxx.*) or range (xxx.xxx.xxx.xxx-yyy.yyy.yyy.yyy). Note: the last quad .255 is considered the range of all the IPs in that quad. If you enter 10.0.0.255, it is just like entering 10.0.0.* (No IP is assigned .255 for that matter, it is reserved). Where you may encounter this is in ranges, 10.0.0.5-10.0.0.255 is the same as "10.0.0.*" . You should really enter 10.0.0.5-10.0.0.254 .';
+$lang['SEARCH_IP_EXPLAIN'] = 'Search for users by a specific IP address (xxx.xxx.xxx.xxx).';
$lang['SEARCH_USERS_JOINED'] = 'Users that joined';
$lang['SEARCH_USERS_LASTVISITED'] = 'Users whom have visited';
$lang['IN_THE_LAST'] = 'in the last';
diff --git a/login.php b/login.php
index f5222e9ca..a4b9771ca 100644
--- a/login.php
+++ b/login.php
@@ -23,7 +23,6 @@
* SOFTWARE.
*/
-define('IN_FORUM', true);
define('BB_SCRIPT', 'login');
define('IN_LOGIN', true);
define('BB_ROOT', './');
diff --git a/memberlist.php b/memberlist.php
index f1f17f4a4..34d73498b 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -23,7 +23,6 @@
* SOFTWARE.
*/
-define('IN_FORUM', true);
define('BB_SCRIPT', 'memberlist');
define('BB_ROOT', './');
require __DIR__ . '/common.php';
diff --git a/modcp.php b/modcp.php
index f37468b8f..a56feb8f7 100644
--- a/modcp.php
+++ b/modcp.php
@@ -23,7 +23,6 @@
* SOFTWARE.
*/
-define('IN_FORUM', true);
define('BB_SCRIPT', 'modcp');
define('BB_ROOT', './');
require __DIR__ . '/common.php';
diff --git a/posting.php b/posting.php
index 61e36ec14..cca42ee34 100644
--- a/posting.php
+++ b/posting.php
@@ -23,7 +23,6 @@
* SOFTWARE.
*/
-define('IN_FORUM', true);
define('BB_SCRIPT', 'posting');
define('BB_ROOT', './');
require __DIR__ . '/common.php';
diff --git a/privmsg.php b/privmsg.php
index 985eda4e3..985952e28 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -23,7 +23,6 @@
* SOFTWARE.
*/
-define('IN_FORUM', true);
define('BB_SCRIPT', 'pm');
define('IN_PM', true);
define('BB_ROOT', './');
diff --git a/src/Legacy/Common/Html.php b/src/Legacy/Common/Html.php
index 4d9368ff7..f6b1184dc 100644
--- a/src/Legacy/Common/Html.php
+++ b/src/Legacy/Common/Html.php
@@ -66,8 +66,8 @@ class Html
$this->_build_select_rec($params);
- $select_params = ($js) ? " $js" : '';
- $select_params .= ($multiple_size) ? ' multiple="multiple" size="' . $multiple_size . '"' : '';
+ $select_params = $js ? " $js" : '';
+ $select_params .= $multiple_size ? ' multiple size="' . $multiple_size . '"' : '';
$select_params .= ' name="' . htmlCHR($name) . '"';
$select_params .= ' id="' . htmlCHR($name) . '"';
diff --git a/src/Legacy/Common/User.php b/src/Legacy/Common/User.php
index e4ed7cff7..89c3685a8 100644
--- a/src/Legacy/Common/User.php
+++ b/src/Legacy/Common/User.php
@@ -34,17 +34,21 @@ use TorrentPier\Legacy\DateDelta;
class User
{
/**
- * Config
+ * Config
+ *
+ * @var array
*/
- public $cfg = array(
+ public $cfg = [
'req_login' => false, // requires user to be logged in
'req_session_admin' => false, // requires active admin session (for moderation or admin actions)
- );
+ ];
/**
- * PHP-JS exchangeable options (JSON'ized as {USER_OPTIONS_JS} in TPL)
+ * PHP-JS exchangeable options (JSON'ized as {USER_OPTIONS_JS} in TPL)
+ *
+ * @var array
*/
- public $opt_js = array(
+ public $opt_js = [
'only_new' => 0, // show ony new posts or topics
'h_av' => 0, // hide avatar
'h_rnk_i' => 0, // hide rank images
@@ -57,39 +61,47 @@ class User
'hl_tr' => 1, // show cursor in tracker.php
'i_aft_l' => 0, // show images only after full loading
'h_tsp' => 0, // show released title {...}
- );
+ ];
/**
- * Defaults options for guests
+ * Defaults options for guests
+ *
+ * @var array
*/
- public $opt_js_guest = array(
+ public $opt_js_guest = [
'h_av' => 1, // hide avatar
'h_rnk_i' => 1, // hide rank images
'h_smile' => 1, // hide smilies
'h_sig' => 1, // hide signatures
- );
+ ];
/**
- * Sessiondata
+ * Sessiondata
+ *
+ * @var array
*/
- public $sessiondata = array(
+ public $sessiondata = [
'uk' => null,
'uid' => null,
'sid' => '',
- );
+ ];
/**
- * Old $userdata
+ * Old $userdata
+ *
+ * @var array
*/
- public $data = array();
+ public $data = [];
/**
- * Shortcuts
+ * Shortcuts
+ *
+ * @var
*/
public $id;
/**
- * Constructor
+ * User constructor
*/
public function __construct()
{
@@ -97,9 +109,13 @@ class User
}
/**
- * Start session (restore existent session or create new)
+ * Start session (restore existent session or create new)
+ *
+ * @param array $cfg
+ *
+ * @return array|bool
*/
- public function session_start(array $cfg = array())
+ public function session_start(array $cfg = [])
{
global $bb_cfg;
@@ -170,7 +186,7 @@ class User
}
$this->set_session_cookies($this->data['user_id']);
} else {
- $this->data = array();
+ $this->data = [];
}
}
// If we reach here then no (valid) session exists. So we'll create a new one,
@@ -186,20 +202,20 @@ class User
}
}
}
- if (!$userdata || ($userdata['user_id'] != GUEST_UID && !$login)) {
+ if (!$userdata || ((int)$userdata['user_id'] !== GUEST_UID && !$login)) {
$userdata = get_userdata(GUEST_UID, false, true);
}
$this->session_create($userdata, true);
}
- define('IS_GUEST', (!$this->data['session_logged_in']));
- define('IS_ADMIN', (!IS_GUEST && $this->data['user_level'] == ADMIN));
- define('IS_MOD', (!IS_GUEST && $this->data['user_level'] == MOD));
- 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_AM', (IS_ADMIN || IS_MOD));
+ define('IS_GUEST', !$this->data['session_logged_in']);
+ define('IS_ADMIN', !IS_GUEST && (int)$this->data['user_level'] === ADMIN);
+ define('IS_MOD', !IS_GUEST && (int)$this->data['user_level'] === MOD);
+ define('IS_GROUP_MEMBER', !IS_GUEST && (int)$this->data['user_level'] === GROUP_MEMBER);
+ define('IS_USER', !IS_GUEST && (int)$this->data['user_level'] === USER);
+ define('IS_SUPER_ADMIN', IS_ADMIN && isset($bb_cfg['super_admins'][$this->data['user_id']]));
+ define('IS_AM', IS_ADMIN || IS_MOD);
$this->set_shortcuts();
@@ -214,7 +230,12 @@ class User
}
/**
- * Create new session for the given user
+ * Create new session for the given user
+ *
+ * @param $userdata
+ * @param bool $auto_created
+ *
+ * @return array
*/
public function session_create($userdata, $auto_created = false)
{
@@ -223,17 +244,15 @@ class User
$this->data = $userdata;
$session_id = $this->sessiondata['sid'];
- $login = (int)($this->data['user_id'] != GUEST_UID);
- $is_user = ($this->data['user_level'] != ADMIN);
+ $login = ((int)$this->data['user_id'] !== GUEST_UID);
+ $is_user = ((int)$this->data['user_level'] !== ADMIN);
$user_id = (int)$this->data['user_id'];
- $mod_admin_session = ($this->data['user_level'] == ADMIN || $this->data['user_level'] == MOD);
+ $mod_admin_session = ((int)$this->data['user_level'] === ADMIN || (int)$this->data['user_level'] === MOD);
// Initial ban check against user_id or IP address
if ($is_user) {
- preg_match('#(..)(..)(..)(..)#', USER_IP, $ip);
-
- $where_sql = "ban_ip IN('" . USER_IP . "', '$ip[1]$ip[2]$ip[3]ff', '$ip[1]$ip[2]ffff', '$ip[1]ffffff')";
- $where_sql .= ($login) ? " OR ban_userid = $user_id" : '';
+ $where_sql = 'ban_ip = ' . USER_IP;
+ $where_sql .= $login ? " OR ban_userid = $user_id" : '';
$sql = "SELECT ban_id FROM " . BB_BANLIST . " WHERE $where_sql LIMIT 1";
@@ -246,7 +265,7 @@ class User
for ($i = 0, $max_try = 5; $i <= $max_try; $i++) {
$session_id = make_rand_str(SID_LENGTH);
- $args = DB()->build_array('INSERT', array(
+ $args = DB()->build_array('INSERT', [
'session_id' => (string)$session_id,
'session_user_id' => (int)$user_id,
'session_start' => (int)TIMENOW,
@@ -254,10 +273,10 @@ class User
'session_ip' => (string)USER_IP,
'session_logged_in' => (int)$login,
'session_admin' => (int)$mod_admin_session,
- ));
+ ]);
$sql = "INSERT INTO " . BB_SESSIONS . $args;
- if (@DB()->query($sql)) {
+ if (DB()->query($sql)) {
break;
}
if ($i == $max_try) {
@@ -320,7 +339,10 @@ class User
}
/**
- * Initialize sessiondata stored in cookies
+ * Initialize sessiondata stored in cookies
+ *
+ * @param bool $update_lastvisit
+ * @param bool $set_cookie
*/
public function session_end($update_lastvisit = false, $set_cookie = true)
{
@@ -358,7 +380,12 @@ class User
}
/**
- * Login
+ * Login
+ *
+ * @param $args
+ * @param bool $mod_admin_login
+ *
+ * @return array
*/
public function login($args, $mod_admin_login = false)
{
@@ -411,15 +438,15 @@ class User
}
}
- return array();
+ return [];
}
/**
- * Initialize sessiondata stored in cookies
+ * Initialize sessiondata stored in cookies
*/
public function get_sessiondata()
{
- $sd_resv = !empty($_COOKIE[COOKIE_DATA]) ? @unserialize($_COOKIE[COOKIE_DATA]) : array();
+ $sd_resv = !empty($_COOKIE[COOKIE_DATA]) ? @unserialize($_COOKIE[COOKIE_DATA]) : [];
// autologin_id
if (!empty($sd_resv['uk']) && verify_id($sd_resv['uk'], LOGIN_KEY_LENGTH)) {
@@ -436,21 +463,23 @@ class User
}
/**
- * Store sessiondata in cookies
+ * Store sessiondata in cookies
+ *
+ * @param $user_id
*/
public function set_session_cookies($user_id)
{
global $bb_cfg;
if ($user_id == GUEST_UID) {
- $delete_cookies = array(
+ $delete_cookies = [
COOKIE_DATA,
COOKIE_DBG,
'torhelp',
'explain',
'sql_log',
'sql_log_full',
- );
+ ];
foreach ($delete_cookies as $cookie) {
if (isset($_COOKIE[$cookie])) {
@@ -471,7 +500,13 @@ class User
}
/**
- * Verify autologin_id
+ * Verify autologin_id
+ *
+ * @param $userdata
+ * @param bool $expire_check
+ * @param bool $create_new
+ *
+ * @return bool|string
*/
public function verify_autologin_id($userdata, $expire_check = false, $create_new = true)
{
@@ -495,7 +530,12 @@ class User
}
/**
- * Create autologin_id
+ * Create autologin_id
+ *
+ * @param $userdata
+ * @param bool $create_new
+ *
+ * @return bool|string
*/
public function create_autologin_id($userdata, $create_new = true)
{
@@ -512,7 +552,7 @@ class User
}
/**
- * Set shortcuts
+ * Set shortcuts
*/
public function set_shortcuts()
{
@@ -523,12 +563,11 @@ class User
$this->regdate =& $this->data['user_regdate'];
$this->level =& $this->data['user_level'];
$this->opt =& $this->data['user_opt'];
-
$this->ip = CLIENT_IP;
}
/**
- * Initialise user settings
+ * Initialise user settings
*/
public function init_userprefs()
{
@@ -575,7 +614,9 @@ class User
}
/**
- * Mark read
+ * Mark read
+ *
+ * @param $type
*/
public function mark_read($type)
{
@@ -593,10 +634,10 @@ class User
$this->data['user_lastvisit'] = TIMENOW;
// Update lastvisit
- db_update_userdata($this->data, array(
+ db_update_userdata($this->data, [
'user_session_time' => $this->data['session_time'],
'user_lastvisit' => $this->data['user_lastvisit'],
- ));
+ ]);
// Delete cookies
bb_setcookie(COOKIE_TOPIC, '');
@@ -606,7 +647,7 @@ class User
}
/**
- * Load misc options
+ * Load misc options
*/
public function load_opt_js()
{
@@ -622,7 +663,11 @@ class User
}
/**
- * Get not auth forums
+ * Get not auth forums
+ *
+ * @param $auth_type
+ *
+ * @return string
*/
public function get_not_auth_forums($auth_type)
{
@@ -648,7 +693,7 @@ class User
}
}
- $auth_field_match = array(
+ $auth_field_match = [
AUTH_VIEW => 'auth_view',
AUTH_READ => 'auth_read',
AUTH_POST => 'auth_post',
@@ -661,9 +706,9 @@ class User
AUTH_POLLCREATE => 'auth_pollcreate',
AUTH_ATTACH => 'auth_attachments',
AUTH_DOWNLOAD => 'auth_download',
- );
+ ];
- $not_auth_forums = array();
+ $not_auth_forums = [];
$auth_field = $auth_field_match[$auth_type];
$is_auth_ary = auth($auth_type, AUTH_LIST_ALL, $this->data);
@@ -677,11 +722,16 @@ class User
}
/**
- * Get excluded forums
+ * Get excluded forums
+ *
+ * @param $auth_type
+ * @param string $return_as
+ *
+ * @return array|bool|string
*/
public function get_excluded_forums($auth_type, $return_as = 'csv')
{
- $excluded = array();
+ $excluded = [];
if ($not_auth = $this->get_not_auth_forums($auth_type)) {
$excluded[] = $not_auth;
diff --git a/src/Legacy/Dbs.php b/src/Legacy/Dbs.php
index 63a4c438d..87cdc9ccd 100644
--- a/src/Legacy/Dbs.php
+++ b/src/Legacy/Dbs.php
@@ -31,9 +31,9 @@ namespace TorrentPier\Legacy;
*/
class Dbs
{
- public $cfg = []; // $srv_name => $srv_cfg
- public $srv = []; // $srv_name => $db_obj
- public $alias = []; // $srv_alias => $srv_name
+ public $cfg = [];
+ public $srv = [];
+ public $alias = [];
public $log_file = 'sql_queries';
public $log_counter = 0;
@@ -41,6 +41,11 @@ class Dbs
public $sql_inittime = 0;
public $sql_timetotal = 0;
+ /**
+ * Dbs constructor
+ *
+ * @param $cfg
+ */
public function __construct($cfg)
{
$this->cfg = $cfg['db'];
@@ -51,8 +56,14 @@ class Dbs
}
}
- // получение/инициализация класса для сервера $srv_name
- public function get_db_obj($srv_name_or_alias = 'db1')
+ /**
+ * Получение / инициализация класса сервера $srv_name
+ *
+ * @param string $srv_name_or_alias
+ *
+ * @return mixed
+ */
+ public function get_db_obj($srv_name_or_alias = 'db')
{
$srv_name = $this->get_srv_name($srv_name_or_alias);
@@ -63,16 +74,23 @@ class Dbs
return $this->srv[$srv_name];
}
- // определение имени сервера
+ /**
+ * Определение имени сервера
+ *
+ * @param $name
+ *
+ * @return mixed|string
+ */
public function get_srv_name($name)
{
+ $srv_name = 'db';
+
if (isset($this->alias[$name])) {
$srv_name = $this->alias[$name];
} elseif (isset($this->cfg[$name])) {
$srv_name = $name;
- } else {
- $srv_name = 'db1';
}
+
return $srv_name;
}
}
diff --git a/src/Legacy/Template.php b/src/Legacy/Template.php
index 93286a89c..bdf5060f8 100644
--- a/src/Legacy/Template.php
+++ b/src/Legacy/Template.php
@@ -31,82 +31,87 @@ namespace TorrentPier\Legacy;
*/
class Template
{
- // variable that holds all the data we'll be substituting into
- // the compiled templates.
- // ...
- // This will end up being a multi-dimensional array like this:
- // $this->_tpldata[block.][iteration#][child.][iteration#][child2.][iteration#][variablename] == value
- // if it's a root-level variable, it'll be like this:
- // $this->vars[varname] == value or $this->_tpldata['.'][0][varname] == value
- // array "vars" is added for easier access to data
- public $_tpldata = array('.' => array(0 => array()));
+ /**
+ * Variable that holds all the data we'll be substituting into the compiled templates.
+ * This will end up being a multi-dimensional array like this:
+ * $this->_tpldata[block.][iteration#][child.][iteration#][child2.][iteration#][variablename] == value
+ * if it's a root-level variable, it'll be like this:
+ * $this->vars[varname] == value or $this->_tpldata['.'][0][varname] == value
+ *
+ * @var array
+ */
+ public $_tpldata = [
+ '.' => [
+ 0 => []
+ ]
+ ];
+
+ /** @var array added for easier access to data */
public $vars;
- // Hash of filenames for each template handle.
- public $files = array();
- public $files_cache = array(); // array of cache files that exists
- public $files_cache2 = array(); // array of cache files (exists or not exists)
+ /** @var array hash of filenames for each template handle */
+ public $files = [];
- // Root template directory.
+ /** @var array cache files that exists */
+ public $files_cache = [];
+
+ /** @var array cache files (exists or not exists) */
+ public $files_cache2 = [];
+
+ /** @var string root template directory */
public $root = '';
- // Cache directory
+ /** @var string cache directory */
public $cachedir = CACHE_DIR . '/';
- // Template root directory
+ /** @var string template root directory */
public $tpldir = '';
- // Default template directory.
- // If file for default template isn't found file from this template is used.
+ /** @var string default template directory */
public $tpldef = 'default';
- // this will hash handle names to the compiled code for that handle.
- public $compiled_code = array();
+ /** @var array this will hash handle names to the compiled code for that handle */
+ public $compiled_code = [];
- // This will hold the uncompiled code for that handle.
- public $uncompiled_code = array();
+ /** @var array this will hold the uncompiled code for that handle */
+ public $uncompiled_code = [];
- // Cache settings
+ /** @var int cache settings */
public $use_cache = 1;
public $cache_writable = 1;
- // Auto-compile setting
+ /** @var int auto-compile setting */
public $auto_compile = 1;
- // Current template name
+ /** @var string current template name */
public $tpl = '';
public $cur_tpl = '';
- // List of replacements. tpl files in this list will be replaced with other tpl files
- // according to configuration in xs.cfg
- public $replace = array();
+ /** @var array list of replacements */
+ public $replace = [];
- // counter for include
+ /** @var int counter for include */
public $include_count = 0;
- // extension tpl-cache files
+ /** @var string extension tpl-cache files */
public $cached_tpl_ext = 'php';
- // eXtreme Styles variables
- public $xs_started = 0;
- public $xs_version = 8; // number version. internal. do not change.
- public $xs_versiontxt = '2.3.1'; // text version
-
- // These handles will be parsed if pparse() is executed.
- // Can be used to automatically include header/footer if there is any content.
+ /** @var string these handles will be parsed if pparse() is executed */
public $preparse = '';
public $postparse = '';
- // subtemplates mod detection
+ /** @var bool subtemplates mod detection */
public $subtemplates = false;
- // style configuration
- public $style_config = array();
+ /** @var array style configuration */
+ public $style_config = [];
- public $lang = array();
+ public $lang = [];
/**
* Constructor. Installs XS mod on first run or updates it and sets the root dir.
+ *
+ * @param string $root
*/
public function __construct($root = '.')
{
@@ -122,21 +127,14 @@ class Template
$this->use_cache = $bb_cfg['xs_use_cache'];
}
- /**
- * Destroys this template object. Should be called when you're done with it, in order
- * to clear out the template data so you can load/parse a new template set.
- */
- public function destroy()
- {
- $this->_tpldata = array('.' => array(0 => array()));
- $this->vars = &$this->_tpldata['.'][0];
- $this->xs_started = 0;
- }
-
/**
* Generates a full path+filename for the given filename, which can either
- * be an absolute name, or a name relative to the rootdir for this Template
- * object.
+ * be an absolute name, or a name relative to the rootdir for this Template object.
+ *
+ * @param $filename
+ * @param bool $xs_include
+ *
+ * @return mixed|string
*/
public function make_filename($filename, $xs_include = false)
{
@@ -147,15 +145,19 @@ class Template
// Check if it's an absolute or relative path.
if (($filename[0] !== '/') && ($filename[1] !== ':')) {
return $this->root . '/' . $filename;
- } else {
- return $filename;
}
+
+ return $filename;
}
/**
* Converts template filename to cache filename.
* Returns empty string if non-cachable (for tpl files outside of root dir).
* $filename should be absolute filename
+ *
+ * @param $filename
+ *
+ * @return string
*/
public function make_filename_cache($filename)
{
@@ -165,8 +167,10 @@ class Template
}
/**
- * Sets the template filenames for handles. $filename_array
- * should be a hash of handle => filename pairs.
+ * Sets the template filenames for handles.
+ * $filename_array should be a hash of handle => filename pairs.
+ *
+ * @param $filenames
*/
public function set_filenames($filenames)
{
@@ -177,6 +181,13 @@ class Template
/**
* Assigns template filename for handle.
+ *
+ * @param $handle
+ * @param $filename
+ * @param bool $xs_include
+ * @param bool $quiet
+ *
+ * @return bool
*/
public function set_filename($handle, $filename, $xs_include = false, $quiet = false)
{
@@ -188,9 +199,9 @@ class Template
if (!$this->files[$handle]) {
if ($xs_include || $quiet) {
return false;
- } else {
- die("Template->make_filename(): Error - invalid template $filename");
}
+
+ die("Template->make_filename(): Error - invalid template $filename");
}
// creating cache filename
if ($can_cache) {
@@ -219,6 +230,10 @@ class Template
/**
* includes file or executes code
+ *
+ * @param $filename
+ * @param $code
+ * @param $handle
*/
public function execute($filename, $code, $handle)
{
@@ -230,16 +245,19 @@ class Template
$V =& $this->vars;
if ($filename) {
- include($filename);
+ include $filename;
} else {
eval($code);
}
}
/**
- * Load the file for the handle, compile the file,
- * and run the compiled code. This will print out
- * the results of executing the template.
+ * Load the file for the handle, compile the file and run the compiled code.
+ * This will print out the results of executing the template.
+ *
+ * @param $handle
+ *
+ * @return bool
*/
public function pparse($handle)
{
@@ -291,77 +309,14 @@ class Template
return true;
}
- /**
- * Precompile file
- */
- public function precompile($template, $filename)
- {
- global $precompile_num;
- if (empty($precompile_num)) {
- $precompile_num = 0;
- }
- $precompile_num++;
- $handle = 'precompile_' . $precompile_num;
- // save old configuration
- $root = $this->root;
- $tpl_name = $this->tpl;
- $old_config = $this->use_cache;
- $old_autosave = $this->auto_compile;
- // set temporary configuration
- $this->root = $this->tpldir . $template;
- $this->tpl = $template;
- $this->use_cache = 1;
- $this->auto_compile = 1;
- // set filename
- $res = $this->set_filename($handle, $filename, true, true);
- if (!$res || !$this->files_cache2[$handle]) {
- $this->root = $root;
- $this->tpl = $tpl_name;
- $this->use_cache = $old_config;
- $this->auto_compile = $old_autosave;
- return false;
- }
- $this->files_cache[$handle] = '';
- // load template
- $res = $this->loadfile($handle);
- if (!$res || empty($this->uncompiled_code[$handle])) {
- $this->root = $root;
- $this->tpl = $tpl_name;
- $this->use_cache = $old_config;
- $this->auto_compile = $old_autosave;
- return false;
- }
- // compile the code
- $this->compile2($this->uncompiled_code[$handle], $handle, $this->files_cache2[$handle]);
- // restore confirugation
- $this->root = $root;
- $this->tpl = $tpl_name;
- $this->use_cache = $old_config;
- $this->auto_compile = $old_autosave;
- return true;
- }
-
- /**
- * Inserts the uncompiled code for $handle as the
- * value of $varname in the root-level. This can be used
- * to effectively include a template in the middle of another
- * template.
- * Note that all desired assignments to the variables in $handle should be done
- * BEFORE calling this function.
- */
- public function assign_var_from_handle($varname, $handle)
- {
- ob_start();
- $res = $this->pparse($handle);
- $this->vars[$varname] = ob_get_contents();
- ob_end_clean();
- return $res;
- }
-
/**
* Block-level variable assignment. Adds a new block iteration with the given
- * variable assignments. Note that this should only be called once per block
- * iteration.
+ * variable assignments. Note that this should only be called once per block iteration.
+ *
+ * @param $blockname
+ * @param $vararray
+ *
+ * @return bool
*/
public function assign_block_vars($blockname, $vararray)
{
@@ -392,6 +347,8 @@ class Template
/**
* Root-level variable assignment. Adds to current assignments, overriding
* any existing variable assignment with the same name.
+ *
+ * @param $vararray
*/
public function assign_vars($vararray)
{
@@ -403,27 +360,22 @@ class Template
/**
* Root-level variable assignment. Adds to current assignments, overriding
* any existing variable assignment with the same name.
+ *
+ * @param $varname
+ * @param bool $varval
*/
public function assign_var($varname, $varval = true)
{
$this->vars[$varname] = $varval;
}
- /**
- * TODO: Add type check [??]
- * Root-level. Adds to current assignments, appends
- * to any existing variable assignment with the same name.
- */
- public function append_vars($vararray)
- {
- foreach ($vararray as $key => $val) {
- $this->vars[$key] = !isset($this->vars[$key]) ? $val : $this->vars[$key] . $val;
- }
- }
-
/**
* If not already done, load the file for the given handle and populate
* the uncompiled_code[] hash with its code. Do not compile.
+ *
+ * @param $handle
+ *
+ * @return bool
*/
public function loadfile($handle)
{
@@ -459,6 +411,11 @@ class Template
* ' . $this->_tpldata['parent.'][$_parent_i]['$child1.'][$_child1_i]['$child2.'][$_child2_i]...['varname'] . '
* It's ready to be inserted into an "echo" line in one of the templates.
* NOTE: expects a trailing "." on the namespace.
+ *
+ * @param $namespace
+ * @param $varname
+ *
+ * @return string
*/
public function generate_block_varref($namespace, $varname)
{
@@ -484,6 +441,11 @@ class Template
*
* If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
* NOTE: does not expect a trailing "." on the blockname.
+ *
+ * @param $blockname
+ * @param $include_last_iterator
+ *
+ * @return string
*/
public function generate_block_data_ref($blockname, $include_last_iterator)
{
@@ -492,9 +454,9 @@ class Template
$blockcount = count($blocks) - 1;
if ($include_last_iterator) {
return '$' . $blocks[$blockcount] . '_item';
- } else {
- return '$' . $blocks[$blockcount - 1] . '_item[\'' . $blocks[$blockcount] . '.\']';
}
+
+ return '$' . $blocks[$blockcount - 1] . '_item[\'' . $blocks[$blockcount] . '.\']';
}
public function compile_code($filename, $code)
@@ -521,7 +483,7 @@ class Template
$block_nesting_level = 0;
$block_names = array();
- $block_names[0] = ".";
+ $block_names[0] = '.';
$block_items = array();
$count_if = 0;
@@ -654,7 +616,7 @@ class Template
$line .= ' $' . $var . '_item = &$this->_tpldata[\'' . $var . '.\'][$' . $var . '_i];' . "\n";
$line .= " \${$var}_item['S_ROW_COUNT'] = \${$var}_i;\n";
$line .= " \${$var}_item['S_NUM_ROWS'] = \${$var}_count;\n";
- $line .= "\n?" . ">";
+ $line .= "\n?" . '>';
} else {
// This block is nested.
// Generate a namespace string for this block.
@@ -672,7 +634,7 @@ class Template
$line .= ' $' . $var . '_item = &' . $varref . '[$' . $var . '_i];' . "\n";
$line .= " \${$var}_item['S_ROW_COUNT'] = \${$var}_i;\n";
$line .= " \${$var}_item['S_NUM_ROWS'] = \${$var}_count;\n";
- $line .= "\n?" . ">";
+ $line .= "\n?" . '>';
}
$compiled[] = $line;
continue;
@@ -697,7 +659,7 @@ class Template
$line = '<' . "?php\n\n";
$line .= '} // END ' . $var . "\n\n";
$line .= 'if(isset($' . $var . '_item)) { unset($' . $var . '_item); } ';
- $line .= "\n\n?" . ">";
+ $line .= "\n\n?" . '>';
if (isset($block_items[$var])) {
$block_items[$var]--;
} else {
@@ -781,9 +743,13 @@ class Template
return $code_header . implode('', $compiled) . $code_footer;
}
- /*
- * Compile code between tags
- */
+ /**
+ * Compile code between tags
+ *
+ * @param $code
+ *
+ * @return mixed
+ */
public function _compile_text($code)
{
if (strlen($code) < 3) {
@@ -814,10 +780,13 @@ class Template
return $code;
}
- //
- // Compile IF tags - much of this is from Smarty with
- // some adaptions for our block level methods
- //
+ /**
+ * Compile IF tags - much of this is from Smarty with some adaptions for our block level methods
+ *
+ * @param $tag_args
+ * @param $elseif
+ * @return string
+ */
public function compile_tag_if($tag_args, $elseif)
{
/* Tokenize args for 'if' tag. */
@@ -928,7 +897,14 @@ class Template
return $code;
}
- // This is from Smarty
+ /**
+ * This is from Smarty
+ *
+ * @param $is_arg
+ * @param $tokens
+ *
+ * @return mixed
+ */
public function _parse_is_expr($is_arg, $tokens)
{
$expr_end = 0;
@@ -985,10 +961,16 @@ class Template
/**
* Compiles code and writes to cache if needed
+ *
+ * @param $code
+ * @param $handle
+ * @param $cache_file
+ *
+ * @return string
*/
public function compile2($code, $handle, $cache_file)
{
- $code = $this->compile_code('', $code, XS_USE_ISSET);
+ $code = $this->compile_code('', $code);
if ($cache_file && !empty($this->use_cache) && !empty($this->auto_compile)) {
$res = $this->write_cache($cache_file, $code);
if ($handle && $res) {
@@ -999,25 +981,11 @@ class Template
return $code;
}
- /**
- * Compiles the given string of code, and returns
- * the result in a string.
- * If "do_not_echo" is true, the returned code will not be directly
- * executable, but can be used as part of a variable assignment
- * for use in assign_code_from_handle().
- * This function isn't used and kept only for compatibility with original template.php
- */
- public function compile($code, $do_not_echo = false, $retvar = '')
- {
- $code = ' ?' . '>' . $this->compile_code('', $code, true) . '<' . "?php \n";
- if ($do_not_echo) {
- $code = "ob_start();\n" . $code . "\n\${$retvar} = ob_get_contents();\nob_end_clean();\n";
- }
- return $code;
- }
-
/**
* Write cache to disk
+ *
+ * @param $filename
+ * @param $code
*/
public function write_cache($filename, $code)
{
@@ -1028,24 +996,15 @@ class Template
{
global $bb_cfg;
- if (empty($this->xs_started)) { // adding predefined variables
- $this->xs_started = 1;
- // adding language variable (eg: "english" or "german")
- // can be used to make truly multi-lingual templates
- $this->vars['LANG'] = isset($this->vars['LANG']) ? $this->vars['LANG'] : $bb_cfg['default_lang'];
- // adding current template
- $tpl = $this->root . '/';
- if (substr($tpl, 0, 2) === './') {
- $tpl = substr($tpl, 2, strlen($tpl));
- }
- $this->vars['TEMPLATE'] = isset($this->vars['TEMPLATE']) ? $this->vars['TEMPLATE'] : $tpl;
- $this->vars['TEMPLATE_NAME'] = isset($this->vars['TEMPLATE_NAME']) ? $this->vars['TEMPLATE_NAME'] : $this->tpl;
+ // adding language variable (eg: "english" or "german")
+ // can be used to make truly multi-lingual templates
+ $this->vars['LANG'] = isset($this->vars['LANG']) ? $this->vars['LANG'] : $bb_cfg['default_lang'];
+ // adding current template
+ $tpl = $this->root . '/';
+ if (substr($tpl, 0, 2) === './') {
+ $tpl = substr($tpl, 2, strlen($tpl));
}
- }
-
- public function lang_error($var)
- {
- trigger_error(basename($this->cur_tpl) . " : undefined language variable {L_{$var}}", E_USER_WARNING);
- return "Undefined: {L_{$var}}";
+ $this->vars['TEMPLATE'] = isset($this->vars['TEMPLATE']) ? $this->vars['TEMPLATE'] : $tpl;
+ $this->vars['TEMPLATE_NAME'] = isset($this->vars['TEMPLATE_NAME']) ? $this->vars['TEMPLATE_NAME'] : $this->tpl;
}
}
diff --git a/styles/templates/admin/admin_attachments.tpl b/styles/templates/admin/admin_attachments.tpl
index 950b8ab95..638029408 100644
--- a/styles/templates/admin/admin_attachments.tpl
+++ b/styles/templates/admin/admin_attachments.tpl
@@ -214,7 +214,7 @@