github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-19 13:01:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Исправления SSL, sitemap и т.д.

Browse source 
Множественные исправления предыдущих коммитов, правки форматирования.
This commit is contained in:
Exile 2014-11-18 19:55:25 +03:00
commit 1c5fb857f2
13 changed files with 71 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -31,4 +31,4 @@ $RECYCLE.BIN/
.LSOverride .LSOverride
._* ._*
.Spotlight-V100 .Spotlight-V100
.Trashes .Trashes

1
CONTRIBUTORS.md
View file

@ -36,6 +36,7 @@ nord51
Вася Вася
Alexander.S (http://torrent.dchub.ws/) Alexander.S (http://torrent.dchub.ws/)
sasha20072007 sasha20072007
gerhanovn
***************************** *****************************
** Прочая информация ** ** Прочая информация **

5
common.php
View file

@ -19,9 +19,10 @@ header('X-Frame-Options: SAMEORIGIN');
// Get initial config // Get initial config
require(BB_ROOT . 'library/config.php'); require(BB_ROOT . 'library/config.php');
$server_protocol = '//'; $server_protocol = ($bb_cfg['cookie_secure']) ? 'https://' : 'http://';
$server_port = (in_array($bb_cfg['server_port'], array(80, 443))) ? '' : ':' . $bb_cfg['server_port'];
define('FORUM_PATH', $bb_cfg['script_path']); define('FORUM_PATH', $bb_cfg['script_path']);
define('FULL_URL', $server_protocol . $bb_cfg['server_name'] . $bb_cfg['script_path']); define('FULL_URL', $server_protocol . $bb_cfg['server_name'] . $server_port . $bb_cfg['script_path']);
unset($server_protocol, $server_port); unset($server_protocol, $server_port);
// Debug options // Debug options

6
group_edit.php
View file

@ -78,6 +78,7 @@ if ($is_moderator)
'GROUP_DESCRIPTION' => htmlCHR($group_info['group_description']), 'GROUP_DESCRIPTION' => htmlCHR($group_info['group_description']),
'GROUP_SIGNATURE' => htmlCHR($group_info['group_signature']), 'GROUP_SIGNATURE' => htmlCHR($group_info['group_signature']),
'U_GROUP_URL' => GROUP_URL . $group_id, 'U_GROUP_URL' => GROUP_URL . $group_id,
'RELEASE_GROUP' => ($group_info['release_group']) ? true : false,
'GROUP_TYPE' => $group_type, 'GROUP_TYPE' => $group_type,
'S_GROUP_OPEN_TYPE' => GROUP_OPEN, 'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED,
@ -88,9 +89,8 @@ if ($is_moderator)
'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_GROUP_CONFIG_ACTION' => "group_edit.php?" . POST_GROUPS_URL . "=$group_id", 'S_GROUP_CONFIG_ACTION' => "group_edit.php?" . POST_GROUPS_URL . "=$group_id",
'AVATAR_EXPLAIN' => sprintf($lang['AVATAR_EXPLAIN'], $bb_cfg['group_avatars']['max_width'], $bb_cfg['group_avatars']['max_height'], (round($bb_cfg['group_avatars']['max_size'] / 1024))), 'AVATAR_EXPLAIN' => sprintf($lang['AVATAR_EXPLAIN'], $bb_cfg['group_avatars']['max_width'], $bb_cfg['group_avatars']['max_height'], (round($bb_cfg['group_avatars']['max_size'] / 1024))),
'AVATAR_IMG' => get_avatar(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id']), 'AVATAR_IMG' => get_avatar(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id']),
'RELEASE_GROUP' => ($group_info['release_group']) ? true : false,
)); ));
$template->set_filenames(array('body' => 'group_edit.tpl')); $template->set_filenames(array('body' => 'group_edit.tpl'));

10
index.php
View file

@ -373,14 +373,13 @@ if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
if ($stats['birthday_week_list']) if ($stats['birthday_week_list'])
{ {
shuffle($stats['birthday_week_list']); shuffle($stats['birthday_week_list']);
foreach($stats['birthday_week_list'] as $i => $week) foreach ($stats['birthday_week_list'] as $i => $week)
{ {
if($i >= 5) if ($i >= 5)
{ {
$week_all = true; $week_all = true;
continue; continue;
} }
$week_list[] = profile_url($week) .' <span class="small">('. birthday_age($week['user_birthday']-1) .')</span>'; $week_list[] = profile_url($week) .' <span class="small">('. birthday_age($week['user_birthday']-1) .')</span>';
} }
$week_all = ($week_all) ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'index_data\', mode: \'birthday_week\'}); return false;" title="'. $lang['ALL'] .'">...</a>' : ''; $week_all = ($week_all) ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'index_data\', mode: \'birthday_week\'}); return false;" title="'. $lang['ALL'] .'">...</a>' : '';
@ -391,14 +390,13 @@ if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
if ($stats['birthday_today_list']) if ($stats['birthday_today_list'])
{ {
shuffle($stats['birthday_today_list']); shuffle($stats['birthday_today_list']);
foreach($stats['birthday_today_list'] as $i => $today) foreach ($stats['birthday_today_list'] as $i => $today)
{ {
if($i >= 5) if ($i >= 5)
{ {
$today_all = true; $today_all = true;
continue; continue;
} }
$today_list[] = profile_url($today) .' <span class="small">('. birthday_age($today['user_birthday']) .')</span>'; $today_list[] = profile_url($today) .' <span class="small">('. birthday_age($today['user_birthday']) .')</span>';
} }
$today_all = ($today_all) ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'index_data\', mode: \'birthday_today\'}); return false;" title="'. $lang['ALL'] .'">...</a>' : ''; $today_all = ($today_all) ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'index_data\', mode: \'birthday_today\'}); return false;" title="'. $lang['ALL'] .'">...</a>' : '';

88
library/config.php
View file

@ -37,7 +37,6 @@
* Error reporting * Error reporting
* Triggers * Triggers
* Date format * Date format
* Subforums * Subforums
* Forums * Forums
* Topics * Topics
@ -48,13 +47,12 @@
* Actions log * Actions log
* Users * Users
* Groups * Groups
* Tidy * Tidy
* Ads * Ads
* Misc
* Attachments * Attachments
* Avatars * Avatars
* Group avatars * Group avatars
* Misc
* Captcha * Captcha
* Atom feed * Atom feed
* Nofollow * Nofollow
@ -253,10 +251,10 @@ define('BB_PATH', realpath(BB_ROOT) );
define('ADMIN_DIR', BB_PATH .'/admin/' ); define('ADMIN_DIR', BB_PATH .'/admin/' );
define('DATA_DIR', BB_PATH .'/data/' ); define('DATA_DIR', BB_PATH .'/data/' );
define('INT_DATA_DIR', BB_PATH .'/internal_data/' ); define('INT_DATA_DIR', BB_PATH .'/internal_data/' );
define('AJAX_HTML_DIR', BB_ROOT .'internal_data/ajax_html/' ); define('AJAX_HTML_DIR', BB_ROOT .'/internal_data/ajax_html/' );
define('CACHE_DIR', BB_PATH .'/internal_data/cache/' ); define('CACHE_DIR', BB_PATH .'/internal_data/cache/' );
define('LOG_DIR', BB_PATH .'/internal_data/log/' ); define('LOG_DIR', BB_PATH .'/internal_data/log/' );
define('SITEMAP_DIR', BB_PATH .'internal_data/sitemap/' ); define('SITEMAP_DIR', BB_PATH .'/internal_data/sitemap/' );
define('TRIGGERS_DIR', BB_PATH .'/internal_data/triggers/' ); define('TRIGGERS_DIR', BB_PATH .'/internal_data/triggers/' );
define('AJAX_DIR', BB_ROOT .'/library/ajax/' ); define('AJAX_DIR', BB_ROOT .'/library/ajax/' );
define('ATTACH_DIR', BB_PATH .'/library/attach_mod/' ); define('ATTACH_DIR', BB_PATH .'/library/attach_mod/' );
@ -463,16 +461,16 @@ $bb_cfg['show_poster_joined'] = true;
$bb_cfg['show_poster_posts'] = true; $bb_cfg['show_poster_posts'] = true;
$bb_cfg['show_poster_from'] = true; $bb_cfg['show_poster_from'] = true;
$bb_cfg['show_bot_nick'] = false; $bb_cfg['show_bot_nick'] = false;
$bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links $bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links
$bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable $bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable
$bb_cfg['post_date_format'] = 'd-M-Y H:i'; $bb_cfg['post_date_format'] = 'd-M-Y H:i';
$bb_cfg['ext_link_new_win'] = true; // open external links in new window $bb_cfg['ext_link_new_win'] = true; // open external links in new window
$bb_cfg['topic_moved_days_keep'] = 7; // remove topic moved links after xx days (or FALSE to disable) $bb_cfg['topic_moved_days_keep'] = 7; // remove topic moved links after xx days (or FALSE to disable)
$bb_cfg['allowed_posts_per_page'] = array(15, 30, 50, 100); $bb_cfg['allowed_posts_per_page'] = array(15, 30, 50, 100);
$bb_cfg['user_signature_start'] = '<div class="signature"><br />_________________<br />'; $bb_cfg['user_signature_start'] = '<div class="signature"><br />_________________<br />';
$bb_cfg['user_signature_end'] = '</div>'; // Это позволит использовать html теги, которые требуют закрытия. Например <table> или <font color> $bb_cfg['user_signature_end'] = '</div>'; // Это позволит использовать html теги, которые требуют закрытия. Например <table> или <font color>
// Posts // Posts
$bb_cfg['use_posts_cache'] = true; // if you switch from ON to OFF, you need to TRUNCATE `bb_posts_html` table $bb_cfg['use_posts_cache'] = true; // if you switch from ON to OFF, you need to TRUNCATE `bb_posts_html` table
@ -574,68 +572,68 @@ $bb_cfg['user_agreement_url'] = 'info.php?show=user_agreement';
$bb_cfg['copyright_holders_url'] = 'info.php?show=copyright_holders'; $bb_cfg['copyright_holders_url'] = 'info.php?show=copyright_holders';
$bb_cfg['advert_url'] = 'info.php?show=advert'; $bb_cfg['advert_url'] = 'info.php?show=advert';
// Attachments
$bb_cfg['attach'] = array(
'upload_path' => DATA_DIR . 'torrent_files', // путь к директории с torrent файлами
'max_size' => 250*1024, // размер аватары в байтах
);
$bb_cfg['file_id_ext'] = array( $bb_cfg['file_id_ext'] = array(
1 => 'gif', 1 => 'gif',
2 => 'gz', 2 => 'gz',
3 => 'jpg', 3 => 'jpg',
4 => 'png', 4 => 'png',
5 => 'rar', 5 => 'rar',
6 => 'tar', 6 => 'tar',
7 => 'tiff', 7 => 'tiff',
8 => 'torrent', 8 => 'torrent',
9 => 'zip', 9 => 'zip',
); );
$bb_cfg['tor_forums_allowed_ext'] = array('torrent', 'zip', 'rar'); // для разделов с раздачами $bb_cfg['tor_forums_allowed_ext'] = array('torrent', 'zip', 'rar'); // для разделов с раздачами
$bb_cfg['gen_forums_allowed_ext'] = array('zip', 'rar'); // для обычных разделов $bb_cfg['gen_forums_allowed_ext'] = array('zip', 'rar'); // для обычных разделов
// Attachments
$bb_cfg['attach'] = array(
'upload_path' => DATA_DIR . 'torrent_files', // путь к директории с torrent файлами
'max_size' => 250*1024, // размер аватары в байтах
);
// Avatars // Avatars
$bb_cfg['avatars'] = array( $bb_cfg['avatars'] = array(
'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов 'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов
'bot_avatar' => 'gallery/bot.gif', // аватара бота 'bot_avatar' => 'gallery/bot.gif', // аватара бота
'max_size' => 100*1024, // размер аватары в байтах 'max_size' => 100*1024, // размер аватары в байтах
'max_height' => 100, // высота аватара в px 'max_height' => 100, // высота аватара в px
'max_width' => 100, // ширина аватара в px 'max_width' => 100, // ширина аватара в px
'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара
'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами 'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами
'up_allowed' => true, // разрешить загрузку аватар 'up_allowed' => true, // разрешить загрузку аватар
); );
// Group avatars // Group avatars
$bb_cfg['group_avatars'] = array( $bb_cfg['group_avatars'] = array(
'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов 'allowed_ext' => array('gif','jpg','jpeg','png'), // разрешенные форматы файлов
'max_size' => 300*1024, // размер аватары в байтах 'max_size' => 300*1024, // размер аватары в байтах
'max_height' => 300, // высота аватара в px 'max_height' => 300, // высота аватара в px
'max_width' => 300, // ширина аватара в px 'max_width' => 300, // ширина аватара в px
'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара
'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами 'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами
'up_allowed' => true, // разрешить загрузку аватар 'up_allowed' => true, // разрешить загрузку аватар
); );
// Captcha // Captcha
$bb_cfg['captcha'] = array( $bb_cfg['captcha'] = array(
'disabled' => false, 'disabled' => false,
'secret_key' => 'secret_key', 'secret_key' => 'secret_key',
'img_path' => INT_DATA_DIR .'captcha/', // with '/' 'img_path' => INT_DATA_DIR .'captcha/', // with ending slash
'img_url' => './internal_data/captcha/', // with '/' 'img_url' => './internal_data/captcha/', // with ending slash
); );
// Atom feed // Atom feed
$bb_cfg['atom'] = array( $bb_cfg['atom'] = array(
'path' => INT_DATA_DIR .'atom', // without '/' 'path' => INT_DATA_DIR .'atom', // without ending slash
'url' => './internal_data/atom', // without '/' 'url' => './internal_data/atom', // without ending slash
); );
// Nofollow // Nofollow
$bb_cfg['nofollow'] = array( $bb_cfg['nofollow'] = array(
'disabled' => false, 'disabled' => false,
'allowed_url' => array($domain_name), // 'allowed.site', 'www.allowed.site' 'allowed_url' => array($domain_name), // 'allowed.site', 'www.allowed.site'
); );
// Local config // Local config

7
library/includes/classes/sitemap.php
View file

@ -12,8 +12,7 @@ class sitemap
var $cat_priority = '0.7'; var $cat_priority = '0.7';
function sitemap () { function sitemap () {
global $bb_cfg; $this->home = make_url();
$this->home = make_url('');
} }
function build_map () { function build_map () {
@ -29,10 +28,10 @@ class sitemap
function build_index ($count) { function build_index ($count) {
$lm = date('c'); $lm = date('c');
$map = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<sitemapindex xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n"; $map = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<sitemapindex xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n";
$map .= "<sitemap>\n<loc>".make_url(substr(SITEMAP_DIR, 2))."/sitemap1.xml</loc>\n<lastmod>{$lm}</lastmod>\n</sitemap>\n"; $map .= "<sitemap>\n<loc>".make_url(substr(SITEMAP_DIR, 3))."/sitemap1.xml</loc>\n<lastmod>{$lm}</lastmod>\n</sitemap>\n";
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$t = $i + 2; $t = $i + 2;
$map .= "<sitemap>\n<loc>".make_url(substr(SITEMAP_DIR, 2))."/sitemap{$t}.xml</loc>\n<lastmod>{$lm}</lastmod>\n</sitemap>\n"; $map .= "<sitemap>\n<loc>".make_url(substr(SITEMAP_DIR, 3))."/sitemap{$t}.xml</loc>\n<lastmod>{$lm}</lastmod>\n</sitemap>\n";
} }
$map .= "</sitemapindex>"; $map .= "</sitemapindex>";

13
library/includes/functions.php
View file

@ -9,13 +9,6 @@ function get_path_from_id ($id, $ext_id, $base_path, $first_div, $sec_div)
return ($base_path ? "$base_path/" : '') . floor($id/$first_div) .'/'. ($id % $sec_div) .'/'. $id . ($ext ? ".$ext" : ''); return ($base_path ? "$base_path/" : '') . floor($id/$first_div) .'/'. ($id % $sec_div) .'/'. $id . ($ext ? ".$ext" : '');
} }
function delete_avatar ($user_id, $avatar_ext_id)
{
global $bb_cfg;
$avatar_file = ($avatar_ext_id) ? get_avatar_path($user_id, $avatar_ext_id) : '';
return ($avatar_file && file_exists($avatar_file)) ? @unlink($avatar_file) : false;
}
function get_avatar_path ($id, $ext_id, $base_path = null, $first_div = 10000, $sec_div = 100) function get_avatar_path ($id, $ext_id, $base_path = null, $first_div = 10000, $sec_div = 100)
{ {
global $bb_cfg; global $bb_cfg;
@ -30,6 +23,12 @@ function get_attach_path ($id, $ext_id = '', $base_path = null, $first_div = 100
return get_path_from_id($id, $ext_id, $base_path, $first_div, $sec_div); return get_path_from_id($id, $ext_id, $base_path, $first_div, $sec_div);
} }
function delete_avatar ($user_id, $avatar_ext_id)
{
$avatar_file = ($avatar_ext_id) ? get_avatar_path($user_id, $avatar_ext_id) : '';
return ($avatar_file && file_exists($avatar_file)) ? @unlink($avatar_file) : false;
}
function get_tracks ($type) function get_tracks ($type)
{ {
static $pattern = '#^a:\d+:{[i:;\d]+}$#'; static $pattern = '#^a:\d+:{[i:;\d]+}$#';

2
library/includes/functions_upload.php
View file

@ -118,8 +118,6 @@ class upload_common
function store ($mode = '', $params = array()) function store ($mode = '', $params = array())
{ {
global $bb_cfg;
if ($mode == 'avatar') if ($mode == 'avatar')
{ {
delete_avatar($params['user_id'], $params['avatar_ext_id']); delete_avatar($params['user_id'], $params['avatar_ext_id']);

2
library/includes/init_bb.php
View file

@ -421,7 +421,7 @@ function html_ent_decode ($txt, $quote_style = ENT_QUOTES, $charset = 'UTF-8')
return (string) html_entity_decode($txt, $quote_style, $charset); return (string) html_entity_decode($txt, $quote_style, $charset);
} }
function make_url ($path) function make_url ($path = '')
{ {
return FULL_URL . preg_replace('#^\/?(.*?)\/?$#', '\1', $path); return FULL_URL . preg_replace('#^\/?(.*?)\/?$#', '\1', $path);
} }

4
library/language/en/html/sidebar1.html
View file

@ -13,8 +13,8 @@
<h3>FAQ</h3> <h3>FAQ</h3>
<ul class="med"> <ul class="med">
<li><a href="info.php?show=user_agreement" class="med" onclick="window.open(this.href, '', IWP); return false;"><b>Terms of use resource</b></a></li> <li><a href="info.php?show=user_agreement" class="med" onclick="window.open(this.href, '', IWP); return false;"><b>Terms of use resource</b></a></li>
<li><a href="http://torrentpier.me/threads/faq-для-новичков.260" class="med">FAQ for beginners</a></li> <li><a href="https://torrentpier.me/threads/faq-dlja-novichkov.260" class="med">FAQ for beginners</a></li>
<li><a href="http://torrentpier.me/forums/Основные-вопросы-по-torrentpier-ii.10" class="med">Where is ask a question?</a></li> <li><a href="https://torrentpier.me/forums/osnovnye-voprosy-po-torrentpier-ii.10" class="med">Where is ask a question?</a></li>
</ul> </ul>
</div> </div>

4
library/language/ru/html/sidebar1.html
View file

@ -13,8 +13,8 @@
<h3>FAQ</h3> <h3>FAQ</h3>
<ul class="med"> <ul class="med">
<li><a href="info.php?show=user_agreement" class="med" onclick="window.open(this.href, '', IWP); return false;"><b>Правила пользования данным ресурсом</b></a></li> <li><a href="info.php?show=user_agreement" class="med" onclick="window.open(this.href, '', IWP); return false;"><b>Правила пользования данным ресурсом</b></a></li>
<li><a href="http://torrentpier.me/threads/faq-для-новичков.260" class="med">FAQ для новичков</a></li> <li><a href="https://torrentpier.me/threads/faq-dlja-novichkov.260" class="med">FAQ для новичков</a></li>
<li><a href="http://torrentpier.me/forums/Основные-вопросы-по-torrentpier-ii.10" class="med">Где задать вопрос?</a></li> <li><a href="https://torrentpier.me/forums/osnovnye-voprosy-po-torrentpier-ii.10" class="med">Где задать вопрос?</a></li>
</ul> </ul>
</div> </div>

4
library/language/uk/html/sidebar1.html
View file

@ -13,8 +13,8 @@
<h3>FAQ</h3> <h3>FAQ</h3>
<ul class="med"> <ul class="med">
<li><a href="info.php?show=user_agreement" class="med" onclick="window.open(this.href, '', IWP); return false;"><b>Правила користування цим ресурсом</b></a></li> <li><a href="info.php?show=user_agreement" class="med" onclick="window.open(this.href, '', IWP); return false;"><b>Правила користування цим ресурсом</b></a></li>
<li><a href="http://torrentpier.me/threads/faq-для-новичков.260" class="med">FAQ для новачків</a></li> <li><a href="https://torrentpier.me/threads/faq-dlja-novichkov.260" class="med">FAQ для новачків</a></li>
<li><a href="http://torrentpier.me/forums/Основные-вопросы-по-torrentpier-ii.10" class="med">Де поставити питання?</a></li> <li><a href="https://torrentpier.me/forums/osnovnye-voprosy-po-torrentpier-ii.10" class="med">Де поставити питання?</a></li>
</ul> </ul>
</div> </div>