From 5d9955cd78aec0e846394bfc0304de7cb5cd9446 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Mon, 27 Mar 2023 14:10:42 +0700 Subject: [PATCH] Minor fixes (#654) * Minor fixes * Removed WTF statement * Fixed broken birthday applying in profile.php * Removed double-quotes --- composer.json | 2 +- composer.lock | 6 +++--- library/ajax/change_torrent.php | 1 - library/ajax/edit_user_profile.php | 4 ++-- library/ajax/index_data.php | 12 ++++++++---- library/ajax/sitemap.php | 2 +- library/config.php | 2 +- library/includes/cron/jobs/sitemap.php | 2 +- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 0ee8ec85f..1bc309fcd 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "forum": "https://torrentpier.com" }, "require": { - "php": "^7.4", + "php": "^7.4|^8.0", "bugsnag/bugsnag": "v3.29.0", "egulias/email-validator": "^3.2", "filp/whoops": "^2.15", diff --git a/composer.lock b/composer.lock index 004e32873..0a850c52c 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": "6241213ade775fe6873c1265d649c934", + "content-hash": "a0a31557a48a379fcaf7e44571398d48", "packages": [ { "name": "bugsnag/bugsnag", @@ -2380,8 +2380,8 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.4" + "php": "^7.4|^8.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/library/ajax/change_torrent.php b/library/ajax/change_torrent.php index a37ddd3e8..a56090717 100644 --- a/library/ajax/change_torrent.php +++ b/library/ajax/change_torrent.php @@ -49,7 +49,6 @@ if (!$torrent) { if ($torrent['poster_id'] == $userdata['user_id'] && !IS_AM) { if ($type == 'del_torrent' || $type == 'reg' || $type == 'unreg') { - true; } else { $this->ajax_die($lang['ONLY_FOR_MOD']); } diff --git a/library/ajax/edit_user_profile.php b/library/ajax/edit_user_profile.php index b238abe93..a6fe1b0a7 100644 --- a/library/ajax/edit_user_profile.php +++ b/library/ajax/edit_user_profile.php @@ -68,9 +68,9 @@ switch ($field) { if (!empty($birthday_date['year'])) { if (strtotime($value) >= TIMENOW) { $this->ajax_die($lang['WRONG_BIRTHDAY_FORMAT']); - } elseif (bb_date(TIMENOW, 'Y', 'false') - $birthday_date['year'] > $bb_cfg['birthday_max_age']) { + } elseif (bb_date(TIMENOW, 'Y', false) - $birthday_date['year'] > $bb_cfg['birthday_max_age']) { $this->ajax_die(sprintf($lang['BIRTHDAY_TO_HIGH'], $bb_cfg['birthday_max_age'])); - } elseif (bb_date(TIMENOW, 'Y', 'false') - $birthday_date['year'] < $bb_cfg['birthday_min_age']) { + } elseif (bb_date(TIMENOW, 'Y', false) - $birthday_date['year'] < $bb_cfg['birthday_min_age']) { $this->ajax_die(sprintf($lang['BIRTHDAY_TO_LOW'], $bb_cfg['birthday_min_age'])); } } diff --git a/library/ajax/index_data.php b/library/ajax/index_data.php index 900d9cb35..892ae6eeb 100644 --- a/library/ajax/index_data.php +++ b/library/ajax/index_data.php @@ -23,11 +23,13 @@ switch ($mode) { 'stats', )); + $users = []; + if ($stats['birthday_week_list']) { foreach ($stats['birthday_week_list'] as $week) { - $html[] = profile_url($week) . ' (' . birthday_age($week['user_birthday']) . ')'; + $users[] = profile_url($week) . ' (' . birthday_age($week['user_birthday']) . ')'; } - $html = sprintf($lang['BIRTHDAY_WEEK'], $bb_cfg['birthday_check_day'], implode(', ', $html)); + $html = sprintf($lang['BIRTHDAY_WEEK'], $bb_cfg['birthday_check_day'], implode(', ', $users)); } else { $html = sprintf($lang['NOBIRTHDAY_WEEK'], $bb_cfg['birthday_check_day']); } @@ -39,11 +41,13 @@ switch ($mode) { 'stats', )); + $users = []; + if ($stats['birthday_today_list']) { foreach ($stats['birthday_today_list'] as $today) { - $html[] = profile_url($today) . ' (' . birthday_age($today['user_birthday']) . ')'; + $users[] = profile_url($today) . ' (' . birthday_age($today['user_birthday']) . ')'; } - $html = $lang['BIRTHDAY_TODAY'] . implode(', ', $html); + $html = $lang['BIRTHDAY_TODAY'] . implode(', ', $users); } else { $html = $lang['NOBIRTHDAY_TODAY']; } diff --git a/library/ajax/sitemap.php b/library/ajax/sitemap.php index 987bc3c5d..5af1fb19f 100644 --- a/library/ajax/sitemap.php +++ b/library/ajax/sitemap.php @@ -32,7 +32,7 @@ switch ($mode) { $map->createSitemap(); } - $map_link = make_url('sitemap/sitemap.xml'); + $map_link = make_url(hide_bb_path(SITEMAP_DIR . '/sitemap.xml')); foreach ($bb_cfg['sitemap_sending'] as $source_name => $source_link) { if ($map->sendSitemap($source_link, $map_link)) { diff --git a/library/config.php b/library/config.php index 52710aded..995ba3ca0 100644 --- a/library/config.php +++ b/library/config.php @@ -352,7 +352,7 @@ $bb_cfg['show_sidebar2_on_every_page'] = false; // Cookie $bb_cfg['cookie_domain'] = in_array($domain_name, [getenv('SERVER_ADDR'), 'localhost'], true) ? '' : ".$domain_name"; -$bb_cfg['cookie_secure'] = $domain_ssl ? true : (!empty($_SERVER['HTTPS']) ? true : false); +$bb_cfg['cookie_secure'] = $domain_ssl ? true : \TorrentPier\Helpers\IsHelper::isHTTPS(); $bb_cfg['cookie_prefix'] = 'bb_'; // 'bb_' // Sessions diff --git a/library/includes/cron/jobs/sitemap.php b/library/includes/cron/jobs/sitemap.php index fe3adf675..d53986ec2 100644 --- a/library/includes/cron/jobs/sitemap.php +++ b/library/includes/cron/jobs/sitemap.php @@ -15,7 +15,7 @@ $map = new TorrentPier\Sitemap(); $map->createSitemap(); if (file_exists(SITEMAP_DIR . '/sitemap.xml')) { - $map_link = make_url('sitemap/sitemap.xml'); + $map_link = make_url(hide_bb_path(SITEMAP_DIR . '/sitemap.xml')); foreach ($bb_cfg['sitemap_sending'] as $source_name => $source_link) { $map->sendSitemap($source_link, $map_link);