From 539094ee7f84a3a16ff74db0d10588f5a7f760a1 Mon Sep 17 00:00:00 2001 From: Exile Date: Thu, 16 Oct 2014 20:41:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B0=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=81=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=D0=BC?= =?UTF-8?q?=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++ upload/.htaccess | 3 +- upload/admin/admin_mass_email.php | 2 +- upload/ajax.php | 2 +- upload/group.php | 6 ++-- upload/library/config.php | 31 ++++++++++--------- .../includes/{classes => core}/mysql.php | 0 upload/library/includes/cron/jobs/sitemap.php | 2 +- upload/library/includes/functions_post.php | 2 +- upload/library/includes/init_bb.php | 2 +- upload/library/includes/ucp/email.php | 2 +- upload/library/includes/ucp/register.php | 4 +-- upload/library/includes/ucp/sendpasswd.php | 2 +- upload/privmsg.php | 2 +- upload/search.php | 6 ++-- upload/tracker.php | 6 ++-- 16 files changed, 41 insertions(+), 35 deletions(-) rename upload/library/includes/{classes => core}/mysql.php (100%) diff --git a/README.md b/README.md index 831135f27..0e55470e3 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,10 @@ TorrentPier II - движок торрент-трекера, написанны - internal_data/sitemap - internal_data/triggers +## Необходимая версия php + +Минимально поддерживаемой версией в настоящий момент является 5.3. Существует поддержка вплоть до версии 5.5 (в данной версии в логах будет уведомление об использовании устаревших функций). Версия php 5.6 в настоящее время движком не поддерживается и его работа на ней не гарантируется. Мы делаем все возможное чтобы в самое ближайшее время добавить его поддержку. + ## Необходимые настройки php mbstring.internal_encoding = UTF-8 diff --git a/upload/.htaccess b/upload/.htaccess index 90e71cb17..1c8daf65c 100644 --- a/upload/.htaccess +++ b/upload/.htaccess @@ -9,4 +9,5 @@ deny from all RewriteEngine On -RewriteRule ^sitemap.xml$ internal_data/sitemap/sitemap.xml [L] \ No newline at end of file +RewriteRule ^sitemap.xml$ internal_data/sitemap/sitemap.xml [L] +RewriteRule ^/internal_data/atom/(.*) /atom$1 [L] \ No newline at end of file diff --git a/upload/admin/admin_mass_email.php b/upload/admin/admin_mass_email.php index 705cba974..a9285ebf0 100644 --- a/upload/admin/admin_mass_email.php +++ b/upload/admin/admin_mass_email.php @@ -53,7 +53,7 @@ if (isset($_POST['submit'])) "); } - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); foreach ($user_list as $i => $row) { diff --git a/upload/ajax.php b/upload/ajax.php index db6c2ea47..0f40f474d 100644 --- a/upload/ajax.php +++ b/upload/ajax.php @@ -67,7 +67,7 @@ switch ($ajax->action) break; case 'sitemap'; - require(INC_DIR .'classes/sitemap.php'); + require(CLASS_DIR .'sitemap.php'); break; } diff --git a/upload/group.php b/upload/group.php index 44c40fa43..07fc133d6 100644 --- a/upload/group.php +++ b/upload/group.php @@ -220,7 +220,7 @@ else if (@$_POST['joingroup']) if ($bb_cfg['group_send_email']) { - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -272,7 +272,7 @@ else if ($bb_cfg['group_send_email']) { - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -342,7 +342,7 @@ else bb_die('Could not get user email information'); } - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/upload/library/config.php b/upload/library/config.php index 4474d2723..6d4e9d3f3 100644 --- a/upload/library/config.php +++ b/upload/library/config.php @@ -238,21 +238,22 @@ $page_cfg['show_torhelp'] = array( ); // Path (trailing slash '/' at the end: XX_PATH - without, XX_DIR - with) -define('BB_PATH', realpath(BB_ROOT) ); -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_ROOT .'/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_ROOT .'/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('LANG_ROOT_DIR', BB_PATH .'/library/language/' ); -define('TEMPLATES_DIR', BB_PATH .'/styles/templates/' ); +define('BB_PATH', realpath(BB_ROOT) ); +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_ROOT .'/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_ROOT .'/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('CLASS_DIR', BB_PATH .'/library/includes/classes/'); +define('LANG_ROOT_DIR', BB_PATH .'/library/language/' ); +define('TEMPLATES_DIR', BB_PATH .'/styles/templates/' ); // URL's $bb_cfg['ajax_url'] = 'ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php" diff --git a/upload/library/includes/classes/mysql.php b/upload/library/includes/core/mysql.php similarity index 100% rename from upload/library/includes/classes/mysql.php rename to upload/library/includes/core/mysql.php diff --git a/upload/library/includes/cron/jobs/sitemap.php b/upload/library/includes/cron/jobs/sitemap.php index fcd83c551..7d50cb894 100644 --- a/upload/library/includes/cron/jobs/sitemap.php +++ b/upload/library/includes/cron/jobs/sitemap.php @@ -2,7 +2,7 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); -require(INC_DIR .'classes/sitemap.php'); +require(CLASS_DIR .'sitemap.php'); $map = new sitemap(); $map->create(); diff --git a/upload/library/includes/functions_post.php b/upload/library/includes/functions_post.php index 937ccd701..85cdeedda 100644 --- a/upload/library/includes/functions_post.php +++ b/upload/library/includes/functions_post.php @@ -367,7 +367,7 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi if ($watch_list) { - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $orig_word = $replacement_word = array(); diff --git a/upload/library/includes/init_bb.php b/upload/library/includes/init_bb.php index 89e77c1aa..47d10263e 100644 --- a/upload/library/includes/init_bb.php +++ b/upload/library/includes/init_bb.php @@ -429,7 +429,7 @@ function make_url ($path) require(INC_DIR .'functions.php'); require(INC_DIR .'sessions.php'); require(INC_DIR .'template.php'); -require(INC_DIR .'classes/mysql.php'); +require(INC_DIR .'core/mysql.php'); define('SQL_LAYER', 'mysql'); diff --git a/upload/library/includes/ucp/email.php b/upload/library/includes/ucp/email.php index 1e6fae97b..382727706 100644 --- a/upload/library/includes/ucp/email.php +++ b/upload/library/includes/ucp/email.php @@ -49,7 +49,7 @@ if ($row = DB()->fetch_row($sql)) if (!$errors) { - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($userdata['username'] ." <{$userdata['user_email']}>"); diff --git a/upload/library/includes/ucp/register.php b/upload/library/includes/ucp/register.php index e5f5f68d1..46db112b4 100644 --- a/upload/library/includes/ucp/register.php +++ b/upload/library/includes/ucp/register.php @@ -649,7 +649,7 @@ if ($submit && !$errors) $email_template = 'user_welcome'; } - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -688,7 +688,7 @@ if ($submit && !$errors) $pr_data['user_actkey'] = $user_actkey; $db_data['user_actkey'] = $user_actkey; - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/upload/library/includes/ucp/sendpasswd.php b/upload/library/includes/ucp/sendpasswd.php index f098a1b4e..79dd6bd20 100644 --- a/upload/library/includes/ucp/sendpasswd.php +++ b/upload/library/includes/ucp/sendpasswd.php @@ -42,7 +42,7 @@ if ( isset($_POST['submit']) ) bb_die('Could not update new password information'); } - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/upload/privmsg.php b/upload/privmsg.php index 93d2d3f47..440adde73 100644 --- a/upload/privmsg.php +++ b/upload/privmsg.php @@ -1042,7 +1042,7 @@ else if ( $submit || $refresh || $mode != '' ) if (bf($to_userdata['user_opt'], 'user_opt', 'user_notify_pm') && $to_userdata['user_active'] && $bb_cfg['pm_notify_enabled']) { - require(INC_DIR .'classes/emailer.php'); + require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/upload/search.php b/upload/search.php index 9b248d417..d1e3f67d8 100644 --- a/upload/search.php +++ b/upload/search.php @@ -5,9 +5,9 @@ define('BB_ROOT', './'); require(BB_ROOT . 'common.php'); require(INC_DIR . 'bbcode.php'); -require(INC_DIR . 'classes/utf8.php'); -require(INC_DIR . 'classes/correct.php'); -require(INC_DIR . 'classes/reflection.php'); +require(CLASS_DIR . 'utf8.php'); +require(CLASS_DIR . 'correct.php'); +require(CLASS_DIR . 'reflection.php'); $page_cfg['load_tpl_vars'] = array( 'post_buttons', diff --git a/upload/tracker.php b/upload/tracker.php index 2027f1858..7af97ce54 100644 --- a/upload/tracker.php +++ b/upload/tracker.php @@ -4,9 +4,9 @@ define('BB_SCRIPT', 'tracker'); define('BB_ROOT', './'); require(BB_ROOT .'common.php'); -require(INC_DIR .'classes/utf8.php'); -require(INC_DIR .'classes/correct.php'); -require(INC_DIR .'classes/reflection.php'); +require(CLASS_DIR .'utf8.php'); +require(CLASS_DIR .'correct.php'); +require(CLASS_DIR .'reflection.php'); require(INC_DIR .'functions_group.php'); // Page config