github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-14 10:37:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Some fixes, auto language removal (so buggy) and replenishable status.

Browse source
This commit is contained in:
Yuriy Pikhtarev 2017-06-22 01:42:06 +03:00
commit 2ac12a2e54
No known key found for this signature in database
GPG key ID: 3A9B5A757B48ECC6
9 changed files with 35 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/index.php
View file

@ -41,8 +41,6 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
CACHE('bb_cache')->set('admin_module_' . $user->id, $module, 600);
}
$module = CACHE('bb_cache')->get('admin_module_' . $user->id);
$template->assign_vars(array(
'TPL_ADMIN_NAVIGATE' => true,
'U_FORUM_INDEX' => '../index.php',

2
bt/includes/init_tr.php
View file

@ -62,7 +62,7 @@ function tracker_exit()
function silent_exit()
{
while (ob_end_clean()) ;
ob_end_clean();
tracker_exit();
}

8
common.php
View file

@ -271,12 +271,10 @@ function file_write($str, $file, $max_size = LOG_MAX_SIZE, $lock = true, $replac
rename($file, $new_name);
}
}
if (!$fp = fopen($file, 'ab')) {
if ($dir_created = bb_mkdir(dirname($file))) {
$fp = fopen($file, 'ab');
}
if (file_exists($file) && $dir_created = bb_mkdir(dirname($file))) {
$fp = fopen($file, 'ab+');
}
if ($fp) {
if (isset($fp)) {
if ($lock) {
flock($fp, LOCK_EX);
}

23
library/config.php
View file

@ -36,8 +36,8 @@ $bb_cfg = [];
$bb_cfg['js_ver'] = $bb_cfg['css_ver'] = 1;
// Version info
$bb_cfg['tp_version'] = '2.2.1';
$bb_cfg['tp_release_date'] = '16-06-2017';
$bb_cfg['tp_version'] = '2.2.2';
$bb_cfg['tp_release_date'] = '22-06-2017';
$bb_cfg['tp_release_codename'] = 'Aurochs';
// Database
@ -162,7 +162,6 @@ $bb_cfg['pm_url'] = 'privmsg.php'; # "http://{$domain_name}/privmsg.php"
// Language
$bb_cfg['charset'] = 'UTF-8'; // page charset
$bb_cfg['auto_language'] = true; // select user-preferred language automatically
$bb_cfg['lang'] = [
'af' => [
'name' => 'Afrikaans',
@ -669,6 +668,7 @@ $bb_cfg['tor_icons'] = [
TOR_CHECKING => '<span class="tor-icon tor-checking">%</span>',
TOR_TMP => '<span class="tor-icon tor-dup">T</span>',
TOR_PREMOD => '<span class="tor-icon tor-dup">&#8719;</span>',
TOR_REPLENISH => '<span class="tor-icon tor-dup">R</span>',
];
// Запрет на скачивание
@ -720,19 +720,8 @@ $bb_cfg['topic_left_column_witdh'] = 150;
$bb_cfg['post_img_width_decr'] = 52;
$bb_cfg['attach_img_width_decr'] = 130;
if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language']) {
$user_lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
if (file_exists(LANG_ROOT_DIR . '/' . $user_lang)) {
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . '/' . $user_lang . '/';
$bb_cfg['default_lang'] = $user_lang;
} else {
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . '/en/';
$bb_cfg['default_lang'] = 'en';
}
if (isset($bb_cfg['default_lang']) && file_exists(LANG_ROOT_DIR . '/' . $bb_cfg['default_lang'])) {
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . '/' . $bb_cfg['default_lang'] . '/';
} else {
if (isset($bb_cfg['default_lang']) && file_exists(LANG_ROOT_DIR . '/' . $bb_cfg['default_lang'])) {
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . '/' . $bb_cfg['default_lang'] . '/';
} else {
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . '/en/';
}
$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . '/en/';
}

31
library/defines.php
View file

@ -97,26 +97,27 @@ define('CRON_RUNNING', TRIGGERS_DIR . '/cron_running');
define('MEM_USAGE', function_exists('memory_get_usage'));
// Gzip
define('GZIP_OUTPUT_ALLOWED', (extension_loaded('zlib') && !ini_get('zlib.output_compression')));
define('GZIP_OUTPUT_ALLOWED', extension_loaded('zlib') && !ini_get('zlib.output_compression'));
define('UA_GZIP_SUPPORTED', isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false);
// Torrents (reserved: -1)
define('TOR_NOT_APPROVED', 0); // не проверено
define('TOR_CLOSED', 1); // закрыто
define('TOR_APPROVED', 2); // проверено
define('TOR_NEED_EDIT', 3); // недооформлено
define('TOR_NO_DESC', 4); // неоформлено
define('TOR_DUP', 5); // повтор
define('TOR_CLOSED_CPHOLD', 6); // закрыто правообладателем
define('TOR_CONSUMED', 7); // поглощено
define('TOR_DOUBTFUL', 8); // сомнительно
define('TOR_CHECKING', 9); // проверяется
define('TOR_TMP', 10); // временная
define('TOR_PREMOD', 11); // премодерация
define('TOR_NOT_APPROVED', 0); // не проверено
define('TOR_CLOSED', 1); // закрыто
define('TOR_APPROVED', 2); // проверено
define('TOR_NEED_EDIT', 3); // недооформлено
define('TOR_NO_DESC', 4); // неоформлено
define('TOR_DUP', 5); // повтор
define('TOR_CLOSED_CPHOLD', 6); // закрыто правообладателем
define('TOR_CONSUMED', 7); // поглощено
define('TOR_DOUBTFUL', 8); // сомнительно
define('TOR_CHECKING', 9); // проверяется
define('TOR_TMP', 10); // временная
define('TOR_PREMOD', 11); // премодерация
define('TOR_REPLENISH', 12); // пополняемая
define('CRON_LOG_ENABLED', true); // global ON/OFF
define('CRON_LOG_ENABLED', true); // global ON/OFF
define('CRON_FORCE_LOG', false); // always log regardless of job settings
define('CRON_DIR', INC_DIR . '/cron/');
define('CRON_JOB_DIR', CRON_DIR . 'jobs/');
define('CRON_LOG_DIR', 'cron'); // inside LOG_DIR
define('CRON_LOG_FILE', 'cron'); // without ext
define('CRON_LOG_FILE', 'cron'); // without ext

1
library/language/source/main.php
View file

@ -1116,6 +1116,7 @@ $lang['TOR_STATUS_NAME'] = array(
TOR_CHECKING => 'verified',
TOR_TMP => 'temporary',
TOR_PREMOD => 'pre-moderation',
TOR_REPLENISH => 'replenish',
);
$lang['TOR_STATUS_FAILED'] = 'Such status does not exist!';
$lang['TORRENT_FAILED'] = 'Distribution was not found!';

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "torrentpier",
"version": "2.2.0",
"version": "2.2.2",
"description": "Bull-powered BitTorrent tracker engine",
"main": "index.js",
"repository": "git@github.com:torrentpier/torrentpier.git",

4
src/Helpers/CronHelper.php
View file

@ -129,7 +129,9 @@ class CronHelper
self::touchLockFile(CRON_RUNNING);
file_write('', START_MARK);
} elseif ($mode === 'end') {
unlink(START_MARK);
if (file_exists(START_MARK)) {
unlink(START_MARK);
}
}
}
}

5
tracker.php
View file

@ -376,8 +376,11 @@ if (!$set_default) {
elseif ($req_forums =& $_REQUEST[$forum_key]) {
if ($req_forums != $search_all) {
$clean_forums = [];
if (is_array($req_forums)) {
$req_forums = implode(',', $req_forums);
}
foreach (explode(',', $req_forums) as $req_forum) {
$clean_forums[] = (int) $req_forum;
$clean_forums[] = (int)$req_forum;
}
$forum_val = implode(',', array_intersect($clean_forums, $allowed_forums));
}