- 
+
- 
+ 
## π About TorrentPier
-TorrentPier β bull-powered BitTorrent Public/Private tracker engine, written in PHP. High speed, simple modifications, load-balanced
-architecture. In addition, we have a very helpful
+TorrentPier β bull-powered BitTorrent Public/Private tracker engine, written in PHP. High speed, simple modifications, load-balanced
+architecture. In addition, we have a very helpful
[official support forum](https://torrentpier.com), where it's possible to get support and download modifications for the engine.
## π Current status
-TorrentPier is currently in active development. The goal is to remove all legacy code and rewrite the existing code to
-modern specifications. If you want delve deep into the code, check our [issues](https://github.com/torrentpier/torrentpier/issues)
-and go from there. The documentation will be translated to english in the near future, currently russian is the main language of it.
+TorrentPier is currently in active development. The goal is to remove all legacy code and rewrite the existing code to
+modern specifications. If you want to delve deep into the code, check our [issues](https://github.com/torrentpier/torrentpier/issues)
+and go from there. The documentation will be translated to English in the near future; currently Russian is the main language.
## β¨ Features
* Rich forum with browsing/moderation tools
@@ -40,7 +40,7 @@ and go from there. The documentation will be translated to english in the near f
* Bonus points
* Polling system
* PM/DM system
-* Multilingual support (Russian and English is currently fully supported, with others in the future)
+* Multilingual support (Russian and English are currently fully supported, with others in the future)
* Atom/RSS feeds
* ... and so MUCH MORE!
@@ -56,7 +56,7 @@ and go from there. The documentation will be translated to english in the near f
## π§ Requirements
* Apache / nginx ([example config](install/nginx.conf)) / caddy ([example config](install/Caddyfile))
-* MySQL 5.5.3 or above / MariaDB 10.0 or above / Percona
+* MySQL 5.5.3 or above (including MySQL 8.0+) / MariaDB 10.0 or above / Percona
* PHP: 8.1 / 8.2 / 8.3 / 8.4
* PHP Extensions: mbstring, gd, bcmath, intl, tidy (optional), xml, xmlwriter
* Crontab (Recommended)
@@ -103,9 +103,9 @@ Check out our [autoinstall](https://github.com/torrentpier/autoinstall) reposito
5. Create a database and import the dump located at `install/sql/mysql.sql`
6. Edit database configuration settings in the environment (`.env.example`), after, rename to `.env`
7. Provide write permissions to the specified folders:
- * `data/avatars`, `data/uploads`, `data/uploads/thumbs`
- * `internal_data/atom`, `internal_data/cache`, `internal_data/log`, `internal_data/triggers`
- * `sitemap`
+ * `data/avatars`, `data/uploads`, `data/uploads/thumbs`
+ * `internal_data/atom`, `internal_data/cache`, `internal_data/log`, `internal_data/triggers`
+ * `sitemap`
8. Voila! β¨
> [!IMPORTANT]
@@ -114,8 +114,8 @@ Check out our [autoinstall](https://github.com/torrentpier/autoinstall) reposito
### Additional steps π£
1. Edit these files:
- * `favicon.png` (change to your own)
- * `robots.txt` (change the addresses in lines `Host` and `Sitemap` to your own)
+ * `favicon.png` (change to your own)
+ * `robots.txt` (change the addresses in lines `Host` and `Sitemap` to your own)
2. Log in to the forum using the **admin/admin** login/password, and finish setting up via admin panel. Don't forget to change your password!
## π Security vulnerabilities
@@ -124,13 +124,13 @@ If you discover a security vulnerability within TorrentPier, please follow our [
## π Our recommendations
-* *It's recommended to run `cron.php`.* - For significant tracker speed increase it ay be required to replace the built-in cron.php in operating system daemon.
+* *It's recommended to run `cron.php`.* - For significant tracker speed increase it may be required to replace the built-in cron.php with an operating system daemon.
* *Local configuration copy.* - You can override the settings using the local configuration file `library/config.local.php`.
## π Contributing / Contributors
-Please read our [contributing policy](CONTRIBUTING.md) and [code of conduct](CODE_OF_CONDUCT.md) for details, and the process for
-submitting pull requests to us. But we are always ready to renew your pull-request for compliance with
+Please read our [contributing policy](CONTRIBUTING.md) and [code of conduct](CODE_OF_CONDUCT.md) for details, and the process for
+submitting pull requests to us. But we are always ready to review your pull-request for compliance with
these requirements. Just send it!
@@ -141,7 +141,7 @@ Made with [contrib.rocks](https://contrib.rocks).
## π Sponsoring
-Support this project by becoming a sponsor or a backer.
+Support this project by becoming a sponsor or a backer.
[](https://opencollective.com/torrentpier)
[](https://opencollective.com/torrentpier)
@@ -164,7 +164,7 @@ Support this project by becoming a sponsor or a backer.
## π¦ Versioning
-We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/torrentpier/torrentpier/tags).
+We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/torrentpier/torrentpier/tags).
## π License
diff --git a/_release.php b/_release.php
index a09f3c718..bb3364439 100644
--- a/_release.php
+++ b/_release.php
@@ -124,7 +124,8 @@ runProcess("git tag -a \"$version\" -m \"Release $version\"");
runProcess("git tag -v \"$version\"");
// Git push
-runProcess("git push origin master");
+runProcess("git checkout v2.4");
+runProcess("git push origin v2.4");
runProcess("git push origin $version");
out("\n- Release $version has been successfully prepared, committed and pushed!", 'success');
diff --git a/admin/admin_board.php b/admin/admin_board.php
index 191666675..b836ff29f 100644
--- a/admin/admin_board.php
+++ b/admin/admin_board.php
@@ -136,8 +136,8 @@ switch ($mode) {
'POSTS_PER_PAGE' => $new['posts_per_page'],
'HOT_TOPIC' => $new['hot_threshold'],
'DEFAULT_DATEFORMAT' => $new['default_dateformat'],
- 'LANG_SELECT' => \TorrentPier\Legacy\Common\Select::language($new['default_lang'], 'default_lang'),
- 'TIMEZONE_SELECT' => \TorrentPier\Legacy\Common\Select::timezone($new['board_timezone'], 'board_timezone'),
+ 'LANG_SELECT' => \TorrentPier\Legacy\Select::language($new['default_lang'], 'default_lang'),
+ 'TIMEZONE_SELECT' => \TorrentPier\Legacy\Select::timezone($new['board_timezone'], 'board_timezone'),
'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'],
'LOGIN_RESET_TIME' => $new['login_reset_time'],
'PRUNE_ENABLE' => (bool)$new['prune_enable'],
diff --git a/admin/admin_log.php b/admin/admin_log.php
index 517a4b9bb..01dbba373 100644
--- a/admin/admin_log.php
+++ b/admin/admin_log.php
@@ -228,6 +228,8 @@ if ($log_rowset) {
case $log_type['mod_topic_change_tor_status']:
case $log_type['mod_topic_change_tor_type']:
case $log_type['mod_topic_tor_unregister']:
+ case $log_type['mod_topic_tor_register']:
+ case $log_type['mod_topic_tor_delete']:
case $log_type['mod_topic_renamed']:
case $log_type['mod_post_delete']:
case $log_type['mod_post_pin']:
diff --git a/admin/admin_robots.php b/admin/admin_robots.php
index 44d73d52b..36fd92a1f 100644
--- a/admin/admin_robots.php
+++ b/admin/admin_robots.php
@@ -16,8 +16,12 @@ require __DIR__ . '/pagestart.php';
$robots_file = BB_ROOT . 'robots.txt';
-// ΠΠ±ΡΠ°Π±ΠΎΡΠΊΠ° ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΈΡ
if (isset($_POST['save'])) {
+ // Check for demo mode
+ if (IN_DEMO_MODE) {
+ bb_die($lang['CANT_EDIT_IN_DEMO_MODE']);
+ }
+
$robots_txt = $_POST['robots_txt'] ?? '';
if (!is_writable($robots_file) && is_file($robots_file)) {
diff --git a/admin/admin_sitemap.php b/admin/admin_sitemap.php
index 3e3fd1fb6..15c605803 100644
--- a/admin/admin_sitemap.php
+++ b/admin/admin_sitemap.php
@@ -33,6 +33,10 @@ if (!$result = DB()->sql_query($sql)) {
}
if (isset($_POST['submit'])) {
+ // Check for demo mode
+ if (IN_DEMO_MODE) {
+ bb_die($lang['CANT_EDIT_IN_DEMO_MODE']);
+ }
if (!empty($new_params)) {
bb_update_config($new_params);
}
diff --git a/admin/admin_user_search.php b/admin/admin_user_search.php
index f89f3f669..4a29d0e06 100644
--- a/admin/admin_user_search.php
+++ b/admin/admin_user_search.php
@@ -52,8 +52,8 @@ if (!isset($_REQUEST['dosearch'])) {
}
}
- $language_list = \TorrentPier\Legacy\Common\Select::language('', 'language_type');
- $timezone_list = \TorrentPier\Legacy\Common\Select::timezone('', 'timezone_type');
+ $language_list = \TorrentPier\Legacy\Select::language('', 'language_type');
+ $timezone_list = \TorrentPier\Legacy\Select::timezone('', 'timezone_type');
$sql = 'SELECT f.forum_id, f.forum_name, f.forum_parent, c.cat_id, c.cat_title
FROM ( ' . BB_FORUMS . ' AS f INNER JOIN ' . BB_CATEGORIES . ' AS c ON c.cat_id = f.cat_id )
diff --git a/admin/index.php b/admin/index.php
index ea3d0a2aa..1f7bbd491 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -90,7 +90,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
'NEW_VERSION_SIZE' => $update_data['latest_version_size'],
'NEW_VERSION_DL_LINK' => $update_data['latest_version_dl_link'],
'NEW_VERSION_LINK' => $update_data['latest_version_link'],
- 'NEW_VERSION_MD5' => $update_data['latest_version_checksum']
+ 'NEW_VERSION_HASH' => $update_data['latest_version_checksum']
]);
}
@@ -128,14 +128,14 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
$topics_per_day = $total_topics;
}
- if ($users_per_day > $total_users) {
+ if ((int)$users_per_day > $total_users) {
$users_per_day = $total_users;
}
$template->assign_vars([
- 'NUMBER_OF_POSTS' => $total_posts,
- 'NUMBER_OF_TOPICS' => $total_topics,
- 'NUMBER_OF_USERS' => $total_users,
+ 'NUMBER_OF_POSTS' => commify($total_posts),
+ 'NUMBER_OF_TOPICS' => commify($total_topics),
+ 'NUMBER_OF_USERS' => commify($total_users),
'START_DATE' => $start_date,
'POSTS_PER_DAY' => $posts_per_day,
'TOPICS_PER_DAY' => $topics_per_day,
diff --git a/bt/announce.php b/bt/announce.php
index 91d9d1e23..245b7c0dd 100644
--- a/bt/announce.php
+++ b/bt/announce.php
@@ -117,7 +117,7 @@ $stopped = ($event === 'stopped');
// Check info_hash length
if (strlen($info_hash) !== 20) {
- msg_die('Invalid info_hash: ' . (mb_check_encoding($info_hash, 'UTF8') ? $info_hash : $info_hash_hex));
+ msg_die('Invalid info_hash: ' . (mb_check_encoding($info_hash, DEFAULT_CHARSET) ? $info_hash : $info_hash_hex));
}
/**
@@ -259,7 +259,7 @@ if ($lp_info) {
// Verify if torrent registered on tracker and user authorized
if (empty($row['topic_id'])) {
- msg_die('Torrent not registered, info_hash = ' . (mb_check_encoding($info_hash, 'UTF8') ? $info_hash : $info_hash_hex));
+ msg_die('Torrent not registered, info_hash = ' . (mb_check_encoding($info_hash, DEFAULT_CHARSET) ? $info_hash : $info_hash_hex));
}
if (empty($row['user_id'])) {
msg_die('Please LOG IN and RE-DOWNLOAD this torrent (user not found)');
diff --git a/bt/scrape.php b/bt/scrape.php
index 534cd57fd..e2c2676ec 100644
--- a/bt/scrape.php
+++ b/bt/scrape.php
@@ -34,7 +34,7 @@ $info_hash_hex = bin2hex($info_hash);
// Check info_hash length
if (strlen($info_hash) !== 20) {
- msg_die('Invalid info_hash: ' . (mb_check_encoding($info_hash, 'UTF8') ? $info_hash : $info_hash_hex));
+ msg_die('Invalid info_hash: ' . (mb_check_encoding($info_hash, DEFAULT_CHARSET) ? $info_hash : $info_hash_hex));
}
// Handle multiple hashes
@@ -99,7 +99,7 @@ if (!empty($info_hash_count)) {
// Verify if torrent registered on tracker
if (empty($torrents)) {
- msg_die('Torrent not registered, info_hash = ' . (mb_check_encoding($info_hash, 'UTF8') ? $info_hash : $info_hash_hex));
+ msg_die('Torrent not registered, info_hash = ' . (mb_check_encoding($info_hash, DEFAULT_CHARSET) ? $info_hash : $info_hash_hex));
}
die(\Arokettu\Bencode\Bencode::encode($torrents));
diff --git a/cliff.toml b/cliff.toml
index 1753dd8a4..105f9ee7c 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -23,7 +23,7 @@ body = """
{%- endmacro -%}
{%- macro nightly_url() -%}
- https://nightly.link/{{ remote.github.owner }}/{{ remote.github.repo }}/workflows/ci/master/TorrentPier-master
+ https://nightly.link/{{ remote.github.owner }}/{{ remote.github.repo }}/workflows/ci/v2.4/TorrentPier-v2.4
{%- endmacro -%}
{% macro print_commit(commit) -%}
@@ -105,12 +105,12 @@ commit_parsers = [
{ message = "^refactor", group = "π Refactor" },
{ message = "^style", group = "π¨ Styling" },
{ message = "^test", group = "π§ͺ Testing" },
- { message = "^ignore|^release", skip = true },
+ { message = "^ignore|^release|^changelog", skip = true },
{ message = "^chore|^ci|^misc", group = "βοΈ Miscellaneous" },
{ body = ".*security", group = "π‘οΈ Security" },
{ message = "^revert", group = "βοΈ Revert" },
{ message = "^crowdin|^crodwin", group = "π³ New translations" }, # crowdin pulls supporting
- { message = "^Composer", group = "π¦ Dependencies" }, # dependabot pulls supporting
+ { message = "^Composer|^deps", group = "π¦ Dependencies" }, # dependabot pulls supporting
{ message = "^rem|^drop|^removed", group = "ποΈ Removed" },
{ message = ".*", group = "πΌ Other" },
]
diff --git a/composer.json b/composer.json
index a15ef15cc..c5aaa06ff 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
"arokettu/torrent-file": "^5.2.1",
"bugsnag/bugsnag": "^v3.29.1",
"claviska/simpleimage": "^4.0",
- "belomaxorka/captcha": "1.*",
+ "gregwar/captcha": "1.*",
"egulias/email-validator": "^4.0.1",
"filp/whoops": "^2.15",
"z4kn4fein/php-semver": "^v3.0.0",
diff --git a/composer.lock b/composer.lock
index a3fa490ba..5ce29ce7c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "2acad3dafd9fd57bc8c26303df22dd15",
+ "content-hash": "4a8e483526e6241286bf04937e1f4913",
"packages": [
{
"name": "arokettu/bencode",
@@ -286,16 +286,16 @@
},
{
"name": "arokettu/torrent-file",
- "version": "5.3.1",
+ "version": "5.3.2",
"source": {
"type": "git",
"url": "https://github.com/arokettu/torrent-file.git",
- "reference": "650ed7109bcd01dd6c4f47d129f120eb1f82ca07"
+ "reference": "0fba9ed15b8f60beb33a590a36db9b97d28ce171"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/arokettu/torrent-file/zipball/650ed7109bcd01dd6c4f47d129f120eb1f82ca07",
- "reference": "650ed7109bcd01dd6c4f47d129f120eb1f82ca07",
+ "url": "https://api.github.com/repos/arokettu/torrent-file/zipball/0fba9ed15b8f60beb33a590a36db9b97d28ce171",
+ "reference": "0fba9ed15b8f60beb33a590a36db9b97d28ce171",
"shasum": ""
},
"require": {
@@ -313,9 +313,9 @@
"league/event": "^3.0",
"phpunit/phpunit": "^10.5.3",
"psy/psysh": "*",
- "sandfox.dev/code-standard": "^1.2024.07.05",
+ "sandfox.dev/code-standard": "^1.2025.05.07",
"squizlabs/php_codesniffer": "*",
- "vimeo/psalm": "^5.2"
+ "vimeo/psalm": "^5.2 | ^6"
},
"suggest": {
"ext-openssl": "for signature logic"
@@ -351,7 +351,7 @@
"issues": "https://gitlab.com/sandfox/torrent-file/-/issues",
"source": "https://gitlab.com/sandfox/torrent-file"
},
- "time": "2024-07-28T21:43:34+00:00"
+ "time": "2025-06-28T21:41:10+00:00"
},
{
"name": "arokettu/unsigned",
@@ -411,88 +411,18 @@
},
"time": "2025-03-31T23:49:37+00:00"
},
- {
- "name": "belomaxorka/captcha",
- "version": "v1.2.4",
- "source": {
- "type": "git",
- "url": "https://github.com/belomaxorka/Captcha.git",
- "reference": "db51723a9539b57ac3faff0211c117b4c55dbe23"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/belomaxorka/Captcha/zipball/db51723a9539b57ac3faff0211c117b4c55dbe23",
- "reference": "db51723a9539b57ac3faff0211c117b4c55dbe23",
- "shasum": ""
- },
- "require": {
- "ext-fileinfo": "*",
- "ext-gd": "*",
- "ext-mbstring": "*",
- "php": ">=5.3.0",
- "symfony/finder": "*"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6.4 || ^7.0 || ^8.0 || ^9.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Gregwar\\": "src/Gregwar"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "GrΓ©goire Passault",
- "email": "g.passault@gmail.com",
- "homepage": "https://www.gregwar.com/",
- "role": "Developer"
- },
- {
- "name": "Jeremy Livingston",
- "email": "jeremy.j.livingston@gmail.com"
- },
- {
- "name": "belomaxorka",
- "email": "roman25052006.kelesh@gmail.com",
- "homepage": "https://belomaxorka.github.io/",
- "role": "Developer"
- }
- ],
- "description": "Captcha generator",
- "homepage": "https://github.com/belomaxorka/Captcha",
- "keywords": [
- "anti-bot",
- "anti-spam",
- "bot-protection",
- "captcha",
- "no-bot",
- "obfuscation",
- "security",
- "spam",
- "spam-protection"
- ],
- "support": {
- "source": "https://github.com/belomaxorka/Captcha/tree/v1.2.4"
- },
- "time": "2025-03-10T13:15:53+00:00"
- },
{
"name": "bugsnag/bugsnag",
- "version": "v3.29.3",
+ "version": "v3.30.0",
"source": {
"type": "git",
"url": "https://github.com/bugsnag/bugsnag-php.git",
- "reference": "9d9aa665f5e9d24f45aad5114dbd2d861119febb"
+ "reference": "ea174966d8a09424d7963e1e0fe9d570b63ff98c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bugsnag/bugsnag-php/zipball/9d9aa665f5e9d24f45aad5114dbd2d861119febb",
- "reference": "9d9aa665f5e9d24f45aad5114dbd2d861119febb",
+ "url": "https://api.github.com/repos/bugsnag/bugsnag-php/zipball/ea174966d8a09424d7963e1e0fe9d570b63ff98c",
+ "reference": "ea174966d8a09424d7963e1e0fe9d570b63ff98c",
"shasum": ""
},
"require": {
@@ -540,9 +470,9 @@
],
"support": {
"issues": "https://github.com/bugsnag/bugsnag-php/issues",
- "source": "https://github.com/bugsnag/bugsnag-php/tree/v3.29.3"
+ "source": "https://github.com/bugsnag/bugsnag-php/tree/v3.30.0"
},
- "time": "2025-03-06T12:03:07+00:00"
+ "time": "2025-07-08T15:15:58+00:00"
},
{
"name": "claviska/simpleimage",
@@ -995,16 +925,16 @@
},
{
"name": "google/recaptcha",
- "version": "1.3.0",
+ "version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/google/recaptcha.git",
- "reference": "d59a801e98a4e9174814a6d71bbc268dff1202df"
+ "reference": "56522c261d2e8c58ba416c90f81a4cd9f2ed89b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/google/recaptcha/zipball/d59a801e98a4e9174814a6d71bbc268dff1202df",
- "reference": "d59a801e98a4e9174814a6d71bbc268dff1202df",
+ "url": "https://api.github.com/repos/google/recaptcha/zipball/56522c261d2e8c58ba416c90f81a4cd9f2ed89b9",
+ "reference": "56522c261d2e8c58ba416c90f81a4cd9f2ed89b9",
"shasum": ""
},
"require": {
@@ -1043,7 +973,7 @@
"issues": "https://github.com/google/recaptcha/issues",
"source": "https://github.com/google/recaptcha"
},
- "time": "2023-02-18T17:41:46+00:00"
+ "time": "2025-06-26T22:21:57+00:00"
},
{
"name": "graham-campbell/result-type",
@@ -1107,6 +1037,64 @@
],
"time": "2024-07-20T21:45:45+00:00"
},
+ {
+ "name": "gregwar/captcha",
+ "version": "v1.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Gregwar/Captcha.git",
+ "reference": "4edbcd09fde4353b94ce550f43460eba73baf2cc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Gregwar/Captcha/zipball/4edbcd09fde4353b94ce550f43460eba73baf2cc",
+ "reference": "4edbcd09fde4353b94ce550f43460eba73baf2cc",
+ "shasum": ""
+ },
+ "require": {
+ "ext-fileinfo": "*",
+ "ext-gd": "*",
+ "ext-mbstring": "*",
+ "php": ">=5.3.0",
+ "symfony/finder": "*"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6.4 || ^7.0 || ^8.0 || ^9.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Gregwar\\": "src/Gregwar"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "GrΓ©goire Passault",
+ "email": "g.passault@gmail.com",
+ "homepage": "http://www.gregwar.com/"
+ },
+ {
+ "name": "Jeremy Livingston",
+ "email": "jeremy.j.livingston@gmail.com"
+ }
+ ],
+ "description": "Captcha generator",
+ "homepage": "https://github.com/Gregwar/Captcha",
+ "keywords": [
+ "bot",
+ "captcha",
+ "spam"
+ ],
+ "support": {
+ "issues": "https://github.com/Gregwar/Captcha/issues",
+ "source": "https://github.com/Gregwar/Captcha/tree/v1.3.0"
+ },
+ "time": "2025-06-23T12:25:54+00:00"
+ },
{
"name": "guzzlehttp/guzzle",
"version": "7.9.3",
@@ -1620,16 +1608,16 @@
},
{
"name": "league/flysystem",
- "version": "3.29.1",
+ "version": "3.30.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
+ "reference": "2203e3151755d874bb2943649dae1eb8533ac93e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
- "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2203e3151755d874bb2943649dae1eb8533ac93e",
+ "reference": "2203e3151755d874bb2943649dae1eb8533ac93e",
"shasum": ""
},
"require": {
@@ -1653,13 +1641,13 @@
"composer/semver": "^3.0",
"ext-fileinfo": "*",
"ext-ftp": "*",
- "ext-mongodb": "^1.3",
+ "ext-mongodb": "^1.3|^2",
"ext-zip": "*",
"friendsofphp/php-cs-fixer": "^3.5",
"google/cloud-storage": "^1.23",
"guzzlehttp/psr7": "^2.6",
"microsoft/azure-storage-blob": "^1.1",
- "mongodb/mongodb": "^1.2",
+ "mongodb/mongodb": "^1.2|^2",
"phpseclib/phpseclib": "^3.0.36",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.5.11|^10.0",
@@ -1697,22 +1685,22 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
- "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
+ "source": "https://github.com/thephpleague/flysystem/tree/3.30.0"
},
- "time": "2024-10-08T08:58:34+00:00"
+ "time": "2025-06-25T13:29:59+00:00"
},
{
"name": "league/flysystem-local",
- "version": "3.29.0",
+ "version": "3.30.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-local.git",
- "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
+ "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
- "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+ "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/6691915f77c7fb69adfb87dcd550052dc184ee10",
+ "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10",
"shasum": ""
},
"require": {
@@ -1746,9 +1734,9 @@
"local"
],
"support": {
- "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
+ "source": "https://github.com/thephpleague/flysystem-local/tree/3.30.0"
},
- "time": "2024-08-09T21:24:39+00:00"
+ "time": "2025-05-21T10:34:19+00:00"
},
{
"name": "league/mime-type-detection",
@@ -3146,16 +3134,16 @@
},
{
"name": "symfony/mailer",
- "version": "v6.4.21",
+ "version": "v6.4.23",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
- "reference": "ada2809ccd4ec27aba9fc344e3efdaec624c6438"
+ "reference": "a480322ddf8e54de262c9bca31fdcbe26b553de5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mailer/zipball/ada2809ccd4ec27aba9fc344e3efdaec624c6438",
- "reference": "ada2809ccd4ec27aba9fc344e3efdaec624c6438",
+ "url": "https://api.github.com/repos/symfony/mailer/zipball/a480322ddf8e54de262c9bca31fdcbe26b553de5",
+ "reference": "a480322ddf8e54de262c9bca31fdcbe26b553de5",
"shasum": ""
},
"require": {
@@ -3206,7 +3194,7 @@
"description": "Helps sending emails",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/mailer/tree/v6.4.21"
+ "source": "https://github.com/symfony/mailer/tree/v6.4.23"
},
"funding": [
{
@@ -3222,7 +3210,7 @@
"type": "tidelift"
}
],
- "time": "2025-04-26T23:47:35+00:00"
+ "time": "2025-06-26T21:24:02+00:00"
},
{
"name": "symfony/mime",
@@ -3651,16 +3639,16 @@
"packages-dev": [
{
"name": "symfony/var-dumper",
- "version": "v6.4.21",
+ "version": "v6.4.23",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "22560f80c0c5cd58cc0bcaf73455ffd81eb380d5"
+ "reference": "d55b1834cdbfcc31bc2cd7e095ba5ed9a88f6600"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/22560f80c0c5cd58cc0bcaf73455ffd81eb380d5",
- "reference": "22560f80c0c5cd58cc0bcaf73455ffd81eb380d5",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d55b1834cdbfcc31bc2cd7e095ba5ed9a88f6600",
+ "reference": "d55b1834cdbfcc31bc2cd7e095ba5ed9a88f6600",
"shasum": ""
},
"require": {
@@ -3716,7 +3704,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v6.4.21"
+ "source": "https://github.com/symfony/var-dumper/tree/v6.4.23"
},
"funding": [
{
@@ -3732,7 +3720,7 @@
"type": "tidelift"
}
],
- "time": "2025-04-09T07:34:50+00:00"
+ "time": "2025-06-27T15:05:27+00:00"
}
],
"aliases": [],
@@ -3746,6 +3734,6 @@
"platform": {
"php": ">=8.1"
},
- "platform-dev": [],
- "plugin-api-version": "2.3.0"
+ "platform-dev": {},
+ "plugin-api-version": "2.6.0"
}
diff --git a/filelist.php b/filelist.php
index 8e256dc67..2cfd9d418 100644
--- a/filelist.php
+++ b/filelist.php
@@ -82,7 +82,7 @@ if (IS_GUEST && $torrent->isPrivate()) {
// Get torrent files
$files = $torrent->$t_version_field()->$t_files_field();
-if ($meta_v1 && $meta_v2) {
+if ($meta_v2) {
$files = new \RecursiveIteratorIterator($files); // Flatten the list
}
@@ -102,19 +102,6 @@ foreach ($files as $file) {
$torrent_name = !empty($t_name = $torrent->getName()) ? str_short(htmlCHR($t_name), 200) : $lang['UNKNOWN'];
$torrent_size = humn_size($row['size'], 2);
-// Get announcers list
-$announcers_list = $torrent->getAnnounceList()->toArray();
-$announcers_count = 0;
-foreach ($announcers_list as $announcer) {
- $announcers_count++;
- $row_class = ($announcers_count % 2) ? 'row1' : 'row2';
- $template->assign_block_vars('announcers', [
- 'ROW_NUMBER' => $announcers_count,
- 'ROW_CLASS' => $row_class,
- 'ANNOUNCER' => $announcer[0]
- ]);
-}
-
// Output page
$template->assign_vars([
'PAGE_TITLE' => "$torrent_name (" . $torrent_size . ")",
diff --git a/index.php b/index.php
index 2c752341c..589b061ae 100644
--- a/index.php
+++ b/index.php
@@ -272,9 +272,9 @@ $template->assign_vars([
'PAGE_TITLE' => $viewcat ? $cat_title_html[$viewcat] : $lang['HOME'],
'NO_FORUMS_MSG' => $only_new ? $lang['NO_NEW_POSTS'] : $lang['NO_FORUMS'],
- 'TOTAL_TOPICS' => sprintf($lang['POSTED_TOPICS_TOTAL'], $stats['topiccount']),
- 'TOTAL_POSTS' => sprintf($lang['POSTED_ARTICLES_TOTAL'], $stats['postcount']),
- 'TOTAL_USERS' => sprintf($lang['REGISTERED_USERS_TOTAL'], $stats['usercount']),
+ 'TOTAL_TOPICS' => sprintf($lang['POSTED_TOPICS_TOTAL'], commify($stats['topiccount'])),
+ 'TOTAL_POSTS' => sprintf($lang['POSTED_ARTICLES_TOTAL'], commify($stats['postcount'])),
+ 'TOTAL_USERS' => sprintf($lang['REGISTERED_USERS_TOTAL'], commify($stats['usercount'])),
'TOTAL_GENDER' => $bb_cfg['gender'] ? sprintf(
$lang['USERS_TOTAL_GENDER'],
$stats['male'],
diff --git a/install.php b/install.php
index 009098420..327c0fb5d 100644
--- a/install.php
+++ b/install.php
@@ -206,6 +206,12 @@ if (is_file(BB_ROOT . '.env')) {
$newValue = trim(readline());
if (!empty($newValue) || $key === 'DB_PASSWORD') {
+ if ($key === 'TP_HOST') {
+ if (!preg_match('/^https?:\/\//', $newValue)) {
+ $newValue = 'https://' . $newValue;
+ }
+ $newValue = parse_url($newValue, PHP_URL_HOST);
+ }
$line = "$key=$newValue";
$$key = $newValue;
} else {
diff --git a/library/ajax/change_torrent.php b/library/ajax/change_torrent.php
index ca26b7c24..fd6de3bff 100644
--- a/library/ajax/change_torrent.php
+++ b/library/ajax/change_torrent.php
@@ -68,11 +68,23 @@ switch ($type) {
case 'reg':
\TorrentPier\Legacy\Torrent::tracker_register($attach_id);
+ // Log action
+ $log_action->mod('mod_topic_tor_register', [
+ 'forum_id' => $torrent['forum_id'],
+ 'topic_id' => $torrent['topic_id'],
+ 'topic_title' => $torrent['topic_title'],
+ ]);
$url = (TOPIC_URL . $torrent['topic_id']);
break;
case 'unreg':
\TorrentPier\Legacy\Torrent::tracker_unregister($attach_id);
+ // Log action
+ $log_action->mod('mod_topic_tor_unregister', [
+ 'forum_id' => $torrent['forum_id'],
+ 'topic_id' => $torrent['topic_id'],
+ 'topic_title' => $torrent['topic_title'],
+ ]);
$url = (TOPIC_URL . $torrent['topic_id']);
break;
diff --git a/library/ajax/post_mod_comment.php b/library/ajax/post_mod_comment.php
index cca1c8e30..959f66ec6 100644
--- a/library/ajax/post_mod_comment.php
+++ b/library/ajax/post_mod_comment.php
@@ -27,7 +27,7 @@ $post = DB()->fetch_row("
WHERE p.post_id = $post_id
");
if (!$post) {
- $this->ajax_die('not post');
+ $this->ajax_die($lang['TOPIC_POST_NOT_EXIST']);
}
$data = [
diff --git a/library/ajax/posts.php b/library/ajax/posts.php
index e34b8b2c1..694177522 100644
--- a/library/ajax/posts.php
+++ b/library/ajax/posts.php
@@ -26,7 +26,7 @@ if (isset($this->request['post_id'])) {
AND p.post_id = pt.post_id
LIMIT 1");
if (!$post) {
- $this->ajax_die('not post');
+ $this->ajax_die($lang['TOPIC_POST_NOT_EXIST']);
}
$is_auth = auth(AUTH_ALL, $post['forum_id'], $userdata, $post);
diff --git a/library/ajax/thanks.php b/library/ajax/thanks.php
index cbe29ac01..bf536cdd7 100644
--- a/library/ajax/thanks.php
+++ b/library/ajax/thanks.php
@@ -29,6 +29,40 @@ if (!$poster_id = (int)$this->request['poster_id']) {
$this->ajax_die($lang['NO_USER_ID_SPECIFIED']);
}
+$cache_lifetime = 3600;
+$thanks_cache_key = 'topic_thanks_' . $topic_id;
+
+/**
+ * Get thanks by topic id
+ *
+ * @param $topic_id
+ * @param string $thanks_cache_key
+ * @param int $cache_lifetime
+ * @return array
+ */
+function get_thanks_list($topic_id, string $thanks_cache_key, int $cache_lifetime)
+{
+ if (!$cached_thanks = CACHE('bb_cache')->get($thanks_cache_key)) {
+ $cached_thanks = [];
+ $sql = DB()->fetch_rowset('SELECT u.username, u.user_rank, u.user_id, thx.* FROM ' . BB_THX . ' thx, ' . BB_USERS . " u WHERE thx.topic_id = $topic_id AND thx.user_id = u.user_id");
+
+ foreach ($sql as $row) {
+ $cached_thanks[$row['user_id']] = [
+ 'user_id' => $row['user_id'],
+ 'username' => $row['username'],
+ 'user_rank' => $row['user_rank'],
+ 'time' => $row['time']
+ ];
+ }
+
+ if (!empty($cached_thanks)) {
+ CACHE('bb_cache')->set($thanks_cache_key, $cached_thanks, $cache_lifetime);
+ }
+ }
+
+ return $cached_thanks;
+}
+
switch ($mode) {
case 'add':
if (IS_GUEST) {
@@ -39,7 +73,8 @@ switch ($mode) {
$this->ajax_die($lang['LIKE_OWN_POST']);
}
- if (DB()->fetch_row('SELECT topic_id FROM ' . BB_THX . " WHERE topic_id = $topic_id AND user_id = " . $userdata['user_id'])) {
+ $cached_thanks = get_thanks_list($topic_id, $thanks_cache_key, $cache_lifetime);
+ if (isset($cached_thanks[$userdata['user_id']])) {
$this->ajax_die($lang['LIKE_ALREADY']);
}
@@ -47,10 +82,34 @@ switch ($mode) {
$values = "$topic_id, {$userdata['user_id']}, " . TIMENOW;
DB()->query('INSERT IGNORE INTO ' . BB_THX . " ($columns) VALUES ($values)");
+ $cached_thanks[$userdata['user_id']] = [
+ 'user_id' => $userdata['user_id'],
+ 'username' => $userdata['username'],
+ 'user_rank' => $userdata['user_rank'],
+ 'time' => TIMENOW
+ ];
+
// Limit voters per topic
- $thanks_count = DB()->fetch_row('SELECT COUNT(*) as thx FROM ' . BB_THX . " WHERE topic_id = $topic_id")['thx'];
- if ($thanks_count > (int)$bb_cfg['tor_thank_limit_per_topic']) {
- DB()->query('DELETE FROM ' . BB_THX . " WHERE topic_id = $topic_id ORDER BY time ASC LIMIT 1");
+ $tor_thank_limit_per_topic = (int)$bb_cfg['tor_thank_limit_per_topic'];
+ if ($tor_thank_limit_per_topic > 0) {
+ $thanks_count = count($cached_thanks);
+ if ($thanks_count > $tor_thank_limit_per_topic) {
+ $oldest_user_id = null;
+ foreach ($cached_thanks as $user_id => $thanks_data) {
+ // First value
+ $oldest_user_id = $thanks_data['user_id'];
+ break;
+ }
+
+ if ($oldest_user_id) {
+ DB()->query('DELETE FROM ' . BB_THX . " WHERE topic_id = $topic_id AND user_id = $oldest_user_id LIMIT 1");
+ unset($cached_thanks[$oldest_user_id]);
+ }
+ }
+ }
+
+ if (!empty($cached_thanks)) {
+ CACHE('bb_cache')->set($thanks_cache_key, $cached_thanks, $cache_lifetime);
}
break;
case 'get':
@@ -58,9 +117,9 @@ switch ($mode) {
$this->ajax_die($lang['NEED_TO_LOGIN_FIRST']);
}
+ $cached_thanks = get_thanks_list($topic_id, $thanks_cache_key, $cache_lifetime);
$user_list = [];
- $sql = DB()->fetch_rowset('SELECT u.username, u.user_rank, u.user_id, t.* FROM ' . BB_THX . ' t, ' . BB_USERS . " u WHERE t.topic_id = $topic_id AND t.user_id = u.user_id");
- foreach ($sql as $row) {
+ foreach ($cached_thanks as $row) {
$user_list[] = '' . profile_url($row) . ' (' . bb_date($row['time']) . ')';
}
diff --git a/library/ajax/view_torrent.php b/library/ajax/view_torrent.php
index 942a32b11..6d342781a 100644
--- a/library/ajax/view_torrent.php
+++ b/library/ajax/view_torrent.php
@@ -11,18 +11,30 @@ if (!defined('IN_AJAX')) {
die(basename(__FILE__));
}
-global $lang;
+global $lang, $userdata;
if (!isset($this->request['attach_id'])) {
$this->ajax_die($lang['EMPTY_ATTACH_ID']);
}
$attach_id = (int)$this->request['attach_id'];
-$torrent = DB()->fetch_row("SELECT attach_id, physical_filename FROM " . BB_ATTACHMENTS_DESC . " WHERE attach_id = $attach_id LIMIT 1");
+$torrent = DB()->fetch_row("
+ SELECT
+ ad.attach_id, ad.physical_filename,
+ tor.forum_id
+ FROM " . BB_ATTACHMENTS_DESC . " ad
+ INNER JOIN " . BB_BT_TORRENTS . " tor ON (ad.attach_id = tor.attach_id)
+ WHERE ad.attach_id = $attach_id LIMIT 1");
if (!$torrent) {
$this->ajax_die($lang['ERROR_BUILD']);
}
+// Check rights
+$is_auth = auth(AUTH_ALL, $torrent['forum_id'], $userdata);
+if (!$is_auth['auth_view']) {
+ $this->ajax_die($lang['SORRY_AUTH_VIEW_ATTACH']);
+}
+
$file_contents = null;
$filename = get_attachments_dir() . '/' . $torrent['physical_filename'];
if (!is_file($filename) || !$file_contents = file_get_contents($filename)) {
@@ -37,7 +49,6 @@ try {
}
$torrent = new TorrentPier\Legacy\TorrentFileList($tor);
-
$tor_filelist = $torrent->get_filelist();
$this->response['html'] = $tor_filelist;
diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index 06a670266..10dab59af 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -66,6 +66,7 @@ $tracker_status = $attachments['_' . $post_id][$i]['tracker_status'];
$download_count = declension((int)$attachments['_' . $post_id][$i]['download_count'], 'times');
$tor_file_size = humn_size($attachments['_' . $post_id][$i]['filesize']);
$tor_file_time = bb_date($attachments['_' . $post_id][$i]['filetime']);
+$real_filename = clean_filename(basename($attachments['_' . $post_id][$i]['real_filename']));
$tor_reged = (bool)$tracker_status;
$show_peers = (bool)$bb_cfg['bt_show_peers'];
@@ -88,10 +89,14 @@ if ($tor_auth_reg || $tor_auth_del) {
$tracker_link = ($tor_reged) ? $unreg_tor_url : $reg_tor_url;
}
-if ($bb_cfg['tracker']['use_old_torrent_name_format']) {
- $display_name = '[' . $bb_cfg['server_name'] . '].t' . $bt_topic_id . '.' . TORRENT_EXT;
+if ($bb_cfg['tracker']['use_real_filename']) {
+ $display_name = $real_filename;
} else {
- $display_name = $t_data['topic_title'] . ' [' . $bb_cfg['server_name'] . '-' . $bt_topic_id . ']' . '.' . TORRENT_EXT;
+ if ($bb_cfg['tracker']['use_old_torrent_name_format']) {
+ $display_name = '[' . $bb_cfg['server_name'] . '].t' . $bt_topic_id . '.' . TORRENT_EXT;
+ } else {
+ $display_name = $t_data['topic_title'] . ' [' . $bb_cfg['server_name'] . '-' . $bt_topic_id . ']' . '.' . TORRENT_EXT;
+ }
}
if (!$tor_reged) {
@@ -475,6 +480,8 @@ if ($tor_reged && $tor_info) {
if ($infoByIP = infoByIP((!empty($peer['ipv6']) ? $peer['ipv6'] : $peer['ip']), $peer['port'])) {
if (!empty($infoByIP['countryCode'])) {
$peerCountry = render_flag($infoByIP['countryCode'], false);
+ } else {
+ $peerCountry = $lang['NOT_AVAILABLE'];
}
}
}
diff --git a/library/config.php b/library/config.php
index 866c8ed75..bb8ea9cbe 100644
--- a/library/config.php
+++ b/library/config.php
@@ -18,8 +18,8 @@ $reserved_port = env('TP_PORT', 80);
$bb_cfg = [];
// Version info
-$bb_cfg['tp_version'] = 'v2.4.6-alpha.4';
-$bb_cfg['tp_release_date'] = '13-06-2025';
+$bb_cfg['tp_version'] = 'v2.4.11';
+$bb_cfg['tp_release_date'] = '06-08-2025';
$bb_cfg['tp_release_codename'] = 'Cattle';
// Increase version number after changing JS or CSS
@@ -209,6 +209,7 @@ $bb_cfg['lang'] = [
'ar' => [
'name' => 'Arabic',
'locale' => 'ar_SA.UTF-8',
+ 'rtl' => true,
],
'hy' => [
'name' => 'Armenian',
@@ -285,6 +286,7 @@ $bb_cfg['lang'] = [
'he' => [
'name' => 'Hebrew',
'locale' => 'he_IL.UTF-8',
+ 'rtl' => true,
],
'hi' => [
'name' => 'Hindi',
@@ -567,7 +569,7 @@ $bb_cfg['limit_max_search_results'] = false; // Limit for number of search resul
// Posting
$bb_cfg['prevent_multiposting'] = true; // TODO: replace "reply" with "edit last msg" if user (not admin or mod) is last topic poster
-$bb_cfg['max_smilies'] = 25; //Max number of smilies in a post (0 - unlimited)
+$bb_cfg['max_smilies'] = 25; // Max number of smilies in a post (0 - unlimited)
$bb_cfg['max_symbols_post'] = 5000; // TODO: Max number of symbols in a post (0 - unlimited)
// PM
@@ -591,7 +593,7 @@ $bb_cfg['user_not_active_days_keep'] = 180; // After how many days should I dele
// Vote for torrents
$bb_cfg['tor_thank'] = true;
$bb_cfg['tor_thanks_list_guests'] = true; // Show voters to guests
-$bb_cfg['tor_thank_limit_per_topic'] = 50;
+$bb_cfg['tor_thank_limit_per_topic'] = 50; // Set "0" to disable limit
// Groups
$bb_cfg['group_members_per_page'] = 50; // How many groups will be displayed in a page
@@ -724,6 +726,8 @@ $bb_cfg['tracker'] = [
'update_dlstat' => true,
'expire_factor' => 2.5,
'compact_mode' => true,
+ 'upd_user_up_down_stat' => true, // unused
+ 'browser_redirect_url' => '', // unused
'scrape' => true,
'limit_active_tor' => true,
'limit_seed_count' => 0,
@@ -743,7 +747,8 @@ $bb_cfg['tracker'] = [
'hybrid_stat_protocol' => 1, // For hybrid torrents there are two identical requests sent by clients, for counting stats we gotta choose one, you can change this to '2' in future, when v1 protocol is outdated
'disabled_v1_torrents' => false, // disallow registration of v1-only torrents, for future implementations where client will use v2 only and there won't be need for v1, thus relieving tracker
'disabled_v2_torrents' => false, // disallow registration of v2-only torrents
- 'use_old_torrent_name_format' => false, // when enabled, the names of torrent files will have the classic format: [yoursite.com].txxx.torrent
+ 'use_real_filename' => false, // Use original torrent filename for downloads. If disabled, filename will be generated automatically
+ 'use_old_torrent_name_format' => false, // Use classic filename format '[yoursite.com].txxx.torrent'. Only works when use_real_filename is disabled
];
// Ratio settings
diff --git a/library/defines.php b/library/defines.php
index df8813a64..0f50090d7 100644
--- a/library/defines.php
+++ b/library/defines.php
@@ -15,11 +15,13 @@ if (!defined('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('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');
diff --git a/library/includes/cron/jobs/attach_maintenance.php b/library/includes/cron/jobs/attach_maintenance.php
index 99e9a7168..d778cb38c 100644
--- a/library/includes/cron/jobs/attach_maintenance.php
+++ b/library/includes/cron/jobs/attach_maintenance.php
@@ -26,9 +26,9 @@ $posts_without_attach = $topics_without_attach = [];
DB()->query("
CREATE TEMPORARY TABLE $tmp_attach_tbl (
- physical_filename VARCHAR(255) NOT NULL default '',
+ physical_filename VARCHAR(255) NOT NULL default '' COLLATE utf8mb4_unicode_ci,
KEY physical_filename (physical_filename(20))
- ) ENGINE = MyISAM DEFAULT CHARSET = utf8
+ ) ENGINE = MyISAM DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci
");
DB()->add_shutdown_query("DROP TEMPORARY TABLE IF EXISTS $tmp_attach_tbl");
diff --git a/library/includes/cron/jobs/tr_cleanup_and_dlstat.php b/library/includes/cron/jobs/tr_cleanup_and_dlstat.php
index a0d7efd25..a0a64251f 100644
--- a/library/includes/cron/jobs/tr_cleanup_and_dlstat.php
+++ b/library/includes/cron/jobs/tr_cleanup_and_dlstat.php
@@ -39,7 +39,7 @@ if ($bb_cfg['tracker']['update_dlstat']) {
INSERT INTO " . NEW_BB_BT_LAST_TORSTAT . "
(topic_id, user_id, dl_status, up_add, down_add, release_add, speed_up, speed_down)
SELECT
- topic_id, user_id, IF(releaser, $releaser, seeder), SUM(up_add), SUM(down_add), IF(releaser, SUM(up_add), 0), SUM(speed_up), SUM(speed_down)
+ topic_id, user_id, IF(MAX(releaser), $releaser, MAX(seeder)), SUM(up_add), SUM(down_add), IF(MAX(releaser), SUM(up_add), 0), SUM(speed_up), SUM(speed_down)
FROM " . BB_BT_TRACKER . "
WHERE (up_add != 0 OR down_add != 0)
GROUP BY topic_id, user_id
@@ -61,7 +61,6 @@ DB()->query("
FROM " . BB_BT_TRACKER . "
WHERE seeder = 1
GROUP BY topic_id, user_id
- ORDER BY update_time DESC
");
// Clean peers table
diff --git a/library/includes/datastore/build_check_updates.php b/library/includes/datastore/build_check_updates.php
index a990d4364..aae8ededd 100644
--- a/library/includes/datastore/build_check_updates.php
+++ b/library/includes/datastore/build_check_updates.php
@@ -18,9 +18,16 @@ if (!$bb_cfg['tp_updater_settings']['enabled']) {
}
$data = [];
+$data[] = ['latest_check_timestamp' => TIMENOW];
-$updaterDownloader = new \TorrentPier\Updater();
-$updaterDownloader = $updaterDownloader->getLastVersion($bb_cfg['tp_updater_settings']['allow_pre_releases']);
+try {
+ $updaterDownloader = new \TorrentPier\Updater();
+ $updaterDownloader = $updaterDownloader->getLastVersion($bb_cfg['tp_updater_settings']['allow_pre_releases']);
+} catch (Exception $exception) {
+ bb_log('[Updater] Exception: ' . $exception->getMessage() . LOG_LF);
+ $this->store('check_updates', $data);
+ return;
+}
$getVersion = \TorrentPier\Helpers\VersionHelper::removerPrefix($updaterDownloader['tag_name']);
$currentVersion = \TorrentPier\Helpers\VersionHelper::removerPrefix($bb_cfg['tp_version']);
@@ -28,6 +35,7 @@ $currentVersion = \TorrentPier\Helpers\VersionHelper::removerPrefix($bb_cfg['tp_
// Has update!
if (\z4kn4fein\SemVer\Version::greaterThan($getVersion, $currentVersion)) {
$latestBuildFileLink = $updaterDownloader['assets'][0]['browser_download_url'];
+ $SHAFileHash = $updaterDownloader['assets'][0]['digest'] ?? '';
// Check updater file
$updaterFile = readUpdaterFile();
@@ -41,10 +49,12 @@ if (\z4kn4fein\SemVer\Version::greaterThan($getVersion, $currentVersion)) {
]), UPDATER_FILE, replace_content: true);
}
- // Get MD5 checksum
+ // Get MD5 / sha256 checksum
$buildFileChecksum = '';
- if (isset($latestBuildFileLink)) {
- $buildFileChecksum = strtoupper(md5_file($latestBuildFileLink));
+ if (!empty($SHAFileHash)) {
+ $buildFileChecksum = $SHAFileHash;
+ } else {
+ $buildFileChecksum = 'MD5: ' . strtoupper(md5_file($latestBuildFileLink));
}
// Build data array
@@ -58,5 +68,4 @@ if (\z4kn4fein\SemVer\Version::greaterThan($getVersion, $currentVersion)) {
];
}
-$data[] = ['latest_check_timestamp' => TIMENOW];
$this->store('check_updates', $data);
diff --git a/library/includes/datastore/build_stats.php b/library/includes/datastore/build_stats.php
index e25d8e085..1b4ffbe98 100644
--- a/library/includes/datastore/build_stats.php
+++ b/library/includes/datastore/build_stats.php
@@ -17,7 +17,7 @@ $data = [];
// usercount
$row = DB()->fetch_row("SELECT COUNT(*) AS usercount FROM " . BB_USERS . " WHERE user_id NOT IN(" . EXCLUDED_USERS . ")");
-$data['usercount'] = commify($row['usercount']);
+$data['usercount'] = (int)$row['usercount'];
// newestuser
$row = DB()->fetch_row("SELECT user_id, username, user_rank FROM " . BB_USERS . " WHERE user_active = 1 AND user_id NOT IN(" . EXCLUDED_USERS . ") ORDER BY user_id DESC LIMIT 1");
@@ -25,8 +25,8 @@ $data['newestuser'] = $row;
// post/topic count
$row = DB()->fetch_row("SELECT SUM(forum_topics) AS topiccount, SUM(forum_posts) AS postcount FROM " . BB_FORUMS);
-$data['postcount'] = commify($row['postcount']);
-$data['topiccount'] = commify($row['topiccount']);
+$data['postcount'] = (int)$row['postcount'];
+$data['topiccount'] = (int)$row['topiccount'];
// Tracker stats
if ($bb_cfg['tor_stats']) {
diff --git a/library/includes/functions.php b/library/includes/functions.php
index 67256eb1f..38db141cd 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -800,6 +800,11 @@ function str_short($text, $max_length, $space = ' ')
return $text ?? '';
}
+function wbr($text, $max_word_length = HTML_WBR_LENGTH)
+{
+ return preg_replace("/([\w\->;:.,~!?(){}@#$%^*\/\\\\]{" . $max_word_length . "})/ui", '$1| # | -{L_BT_FLIST_ANNOUNCERS} | -
|---|---|
| {announcers.ROW_NUMBER} | -{announcers.ANNOUNCER} | -
| {L_BT_FLIST_ANNOUNCERS_NOTICE} | -|
| {L_ADD_ATTACHMENT_TITLE} | |
|---|---|
|
+
{L_ADD_ATTACHMENT_EXPLAIN} |
@@ -26,6 +29,24 @@