Merge branch 'master' into added-print-topic

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## [v2.3.0.4-beta](https://github.com/torrentpier/torrentpier/tree/v2.3.0.4-beta) (2023-02-22)
+[Full Changelog](https://github.com/torrentpier/torrentpier/compare/v2.3.0.3...v2.3.0.4-beta)
+
+**Merged pull requests:**
+
+- docs: change official forum path [\#532](https://github.com/torrentpier/torrentpier/pull/532) ([Exileum](https://github.com/Exileum))
+- Fixed broken sql log selecting in debug-panel [\#533](https://github.com/torrentpier/torrentpier/pull/533) ([belomaxorka](https://github.com/belomaxorka))
+- New implementation of old browser detector [\#534](https://github.com/torrentpier/torrentpier/pull/534) ([belomaxorka](https://github.com/belomaxorka))
+- Fixed SQLite caching issue [\#535](https://github.com/torrentpier/torrentpier/pull/535) ([belomaxorka](https://github.com/belomaxorka))
+- Extended email validation [\#536](https://github.com/torrentpier/torrentpier/pull/536) ([belomaxorka](https://github.com/belomaxorka))
+- Admin panel adjustments [\#538](https://github.com/torrentpier/torrentpier/pull/538) ([belomaxorka](https://github.com/belomaxorka))
+- Added user birthday icon in profile [\#539](https://github.com/torrentpier/torrentpier/pull/539) ([belomaxorka](https://github.com/belomaxorka))
+- Added forum description in viewforum page [\#540](https://github.com/torrentpier/torrentpier/pull/540) ([belomaxorka](https://github.com/belomaxorka))
+- Fixed broken copy log from debug-panel [\#541](https://github.com/torrentpier/torrentpier/pull/541) ([belomaxorka](https://github.com/belomaxorka))
+- Added copy button in viewforum page [\#542](https://github.com/torrentpier/torrentpier/pull/542) ([belomaxorka](https://github.com/belomaxorka))
+- Added current topic url copy button in viewtopic [\#543](https://github.com/torrentpier/torrentpier/pull/543) ([belomaxorka](https://github.com/belomaxorka))
+- Added ``$bb_cfg['emailer']['enabled']`` check in admin_mass_email.php [\#545](https://github.com/torrentpier/torrentpier/pull/545) ([belomaxorka](https://github.com/belomaxorka))
+- Updated scrollTo up to 1.4.6 [\#547](https://github.com/torrentpier/torrentpier/pull/547) ([belomaxorka](https://github.com/belomaxorka))
+- Updated quicksearch up to Feb 21, 2018 commit [\#548](https://github.com/torrentpier/torrentpier/pull/548) ([belomaxorka](https://github.com/belomaxorka))
+
 ## [v2.3.0.3](https://github.com/torrentpier/torrentpier/tree/v2.3.0.3) (2023-02-18)
 [Full Changelog](https://github.com/torrentpier/torrentpier/compare/v2.3.0.2...v2.3.0.3)
 

admin/admin_mass_email.php

@@ -14,6 +14,10 @@ if (!empty($setmodules)) {
 
 require __DIR__ . '/pagestart.php';
 
+if (!$bb_cfg['emailer']['enabled']) {
+    bb_die($lang['EMAILER_DISABLED']);
+}
+
 set_time_limit(1200);
 
 $subject = (string)trim(request_var('subject', ''));

composer.json

@@ -42,22 +42,21 @@
   },
   "require": {
     "php": "^7.1.3",
-    "bugsnag/bugsnag": "*",
+    "bugsnag/bugsnag": "v3.29.0",
     "egulias/email-validator": "2.*",
-    "filp/whoops": "*",
+    "filp/whoops": "2.14.6",
-    "gigablah/sphinxphp": "*",
+    "gigablah/sphinxphp": "2.0.8",
-    "google/recaptcha": "*",
+    "google/recaptcha": "1.2.4",
     "guzzlehttp/guzzle": "6.*",
     "guzzlehttp/psr7": "1.*",
-    "longman/ip-tools": "*",
+    "longman/ip-tools": "1.2.1",
-    "rych/bencode": "*",
+    "rych/bencode": "v1.0.0",
-    "samdark/sitemap": "*",
+    "samdark/sitemap": "2.4.0",
-    "swiftmailer/swiftmailer": "*",
+    "swiftmailer/swiftmailer": "v6.3.0",
     "symfony/dotenv": "4.*",
-    "symfony/polyfill": "*"
+    "symfony/polyfill": "v1.27.0"
   },
   "require-dev": {
-    "phpstan/phpstan": "*",
     "symfony/var-dumper": "4.*"
   },
   "autoload": {

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": "f032a639a723929ad90e6ecf95aa4054",
+    "content-hash": "fe19943e4649e385d7d39dad9572fdcc",
     "packages": [
         {
             "name": "bugsnag/bugsnag",
@@ -1361,65 +1361,6 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "phpstan/phpstan",
-            "version": "1.9.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "922e2689bb180575d0f57de0443c431a5a698e8f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/922e2689bb180575d0f57de0443c431a5a698e8f",
-                "reference": "922e2689bb180575d0f57de0443c431a5a698e8f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2|^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan-shim": "*"
-            },
-            "bin": [
-                "phpstan",
-                "phpstan.phar"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHPStan - PHP Static Analysis Tool",
-            "keywords": [
-                "dev",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.16"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ondrejmirtes",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/phpstan",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-02-07T10:42:21+00:00"
-        },
         {
             "name": "symfony/var-dumper",
             "version": "v4.4.47",

library/ajax/manage_admin.php

@@ -62,7 +62,7 @@ switch ($mode) {
         exec("indexer --config {$bb_cfg['sphinx_config_path']} --all --rotate", $result);
 
         if (!is_file($bb_cfg['sphinx_config_path'] . ".log")) {
-            file_put_contents($bb_cfg['sphinx_config_path'] . ".log", "####Logger from dimka3210.####" . date("H:i:s", TIMENOW) . "##############################\r\n\r\n\r\n\r\n", FILE_APPEND);
+            file_put_contents($bb_cfg['sphinx_config_path'] . ".log", "##############################" . date("H:i:s", TIMENOW) . "##############################\r\n\r\n\r\n\r\n", FILE_APPEND);
         }
 
         file_put_contents($bb_cfg['sphinx_config_path'] . ".log", "##############################" . date("H:i:s", TIMENOW) . "##############################\r\n", FILE_APPEND);

library/config.php

@@ -21,8 +21,8 @@ $bb_cfg = [];
 $bb_cfg['js_ver'] = $bb_cfg['css_ver'] = 1;
 
 // Version info
-$bb_cfg['tp_version'] = '2.3.0.3';
+$bb_cfg['tp_version'] = '2.3.0.4-beta';
-$bb_cfg['tp_release_date'] = '18-02-2023';
+$bb_cfg['tp_release_date'] = '22-02-2023';
 $bb_cfg['tp_release_codename'] = 'Bison';
 
 // Database

styles/templates/default/viewtopic.tpl

@@ -140,6 +140,7 @@ ajax.callback.post_mod_comment = function(data) {
 };
 </script>
 <a style="cursor: help; color: #800000;" title="{L_EDIT_TOPIC_TITLE}" onclick="edit_topic_title('edit'); return false" href="#">&para;</a>
+<a style="color: #800000;" data-clipboard-text="{FULL_URL}{U_VIEW_TOPIC}" class="copyElement clickable" title="Copy to clipboard">&#8594;</a>
 
 <div id="tt-edit-tpl" style="display: none;">
 	<div class="tt-edit" style="padding: 4px;">