Merge branch '3.0.x' into main

legacy/application/common/CORSHelper.php

@@ -10,7 +10,9 @@ class CORSHelper
 
         if (!($origin == '' || preg_match('/https?:\/\/localhost/', $origin) === 1 || in_array($origin, $allowedOrigins))) {
             // Don't allow CORS from other domains to prevent XSS.
-            Logging::error("request origin '{$origin}' is not in allowed '" . implode(', ', $allowedOrigins) . "'!");
+            Logging::error(
+                "request origin '{$origin}' is not in the configured 'allowed_cors_origins' '" . implode(', ', $allowedOrigins) . "'"
+            );
 
             throw new Zend_Controller_Action_Exception('Forbidden', 403);
         }

legacy/application/configs/constants.php

@@ -41,6 +41,7 @@ define('WHOS_USING_URL', 'https://github.com/orgs/libretime/people');
 define('TERMS_AND_CONDITIONS_URL', 'https://github.com/libretime/libretime/blob/main/README.md');
 define('PRIVACY_POLICY_URL', 'https://github.com/libretime/organization/blob/main/CODE_OF_CONDUCT.md');
 define('USER_MANUAL_URL', 'https://libretime.org/docs');
+define('TROUBLESHOOTING_URL', 'https://libretime.org/docs/admin-manual/troubleshooting/');
 define('ABOUT_AIRTIME_URL', 'https://libretime.org');
 define('LIBRETIME_CONTRIBUTE_URL', 'https://libretime.org/contribute');
 define('LIBRETIME_DISCOURSE_URL', 'https://discourse.libretime.org');

legacy/application/views/scripts/error/error-500.phtml

@@ -12,7 +12,12 @@
         <h2><?php echo _("Oops!") ?></h2>
         <p><?php echo _("Something went wrong!") ?></p>
         <div class="button-bar">
-            <a class="toggle-button" href="<?php echo $this->helpUrl; ?>"><?php echo _("Help") ?></a>
+            <a class="toggle-button" href="<?php echo TROUBLESHOOTING_URL; ?>" target="_blank">
+                <?php echo _("Troubleshooting help") ?>
+            </a>
+            <a class="toggle-button" href="<?php echo $this->helpUrl; ?>" target="_blank">
+                <?php echo _("More help") ?>
+            </a>
         </div>
     </div>
 </body>

legacy/composer.json

@@ -28,9 +28,9 @@
     "adbario/php-dot-notation": "^3.0.0",
     "composer/semver": "^3.2",
     "james-heinrich/getid3": "^1.9",
+    "league/uri": "^6.7",
     "libretime/celery-php": "dev-main",
     "libretime/propel1": "dev-main",
-    "league/uri": "^6.7",
     "php-amqplib/php-amqplib": "^3.0",
     "simplepie/simplepie": "^1.5",
     "symfony/config": "^5.4",

legacy/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": "bfb63fdad05ca51f1ca445d3652b1787",
+    "content-hash": "99a8bfaf51b5e36bb702f789ce200fea",
     "packages": [
         {
             "name": "adbario/php-dot-notation",