Docker work update

Author: Ser1ous

core/includes/define.inc.php

@@ -1,56 +1,57 @@
 <?php
+
 use Illuminate\Support\Str;
 
-if (! defined('HTTPS_PORT')) {
+if (!defined('HTTPS_PORT')) {
     define('HTTPS_PORT', env('HTTPS_PORT', '443')); //$https_port
 }
 
-if (! defined('SESSION_STORAGE')) {
+if (!defined('SESSION_STORAGE')) {
     define('SESSION_STORAGE', env('SESSION_STORAGE', 'default')); // $session_cookie_path
 }
 
-if (! defined('REDIS_HOST')) {
+if (!defined('REDIS_HOST')) {
     define('REDIS_HOST', env('REDIS_HOST', '127.0.0.1')); // $session_cookie_path
 }
 
-if (! defined('REDIS_PORT')) {
+if (!defined('REDIS_PORT')) {
     define('REDIS_PORT', env('REDIS_PORT', '6379')); // $session_cookie_path
 }
 
-if (! defined('SESSION_COOKIE_PATH')) {
+if (!defined('SESSION_COOKIE_PATH')) {
     define('SESSION_COOKIE_PATH', env('SESSION_COOKIE_PATH', '')); // $session_cookie_path
 }
 
-if (! defined('SESSION_COOKIE_DOMAIN')) {
+if (!defined('SESSION_COOKIE_DOMAIN')) {
     define('SESSION_COOKIE_DOMAIN', env('SESSION_COOKIE_DOMAIN', '')); //$session_cookie_domain
 }
 
-if (! defined('SESSION_COOKIE_NAME')) {
+if (!defined('SESSION_COOKIE_NAME')) {
     // For legacy extras not using startCMSSession
     define('SESSION_COOKIE_NAME', env('SESSION_COOKIE_NAME', genEvoSessionName())); // $site_sessionname
 }
 
-if (! defined('MODX_CLASS')) {
+if (!defined('MODX_CLASS')) {
     define('MODX_CLASS', env('MODX_CLASS', '\DocumentParser'));
 }
 
-if (! defined('MODX_SITE_HOSTNAMES')) {
+if (!defined('MODX_SITE_HOSTNAMES')) {
     define('MODX_SITE_HOSTNAMES', env('MODX_SITE_HOSTNAMES', ''));
 }
 
-if (! defined('MGR_DIR')) {
+if (!defined('MGR_DIR')) {
     define('MGR_DIR', env('MGR_DIR', 'manager'));
 }
 
-if (! defined('EVO_CORE_PATH')) {
+if (!defined('EVO_CORE_PATH')) {
     define('EVO_CORE_PATH', env('EVO_CORE_PATH', dirname(__DIR__) . '/'));
 }
 
-if (! defined('EVO_STORAGE_PATH')) {
+if (!defined('EVO_STORAGE_PATH')) {
     define('EVO_STORAGE_PATH', env('EVO_STORAGE_PATH', EVO_CORE_PATH . 'storage/'));
 }
 
-if (! defined('MODX_BASE_PATH') || ! defined('MODX_BASE_URL')) {
+if (!defined('MODX_BASE_PATH') || !defined('MODX_BASE_URL')) {
     // automatically assign base_path and base_url
     $script_name = str_replace(
         '\\',
@@ -87,7 +88,7 @@
 
     $url = implode($separator, $items);
 
-    $base_url = Str::finish(implode($separator, $items),'/');
+    $base_url = Str::finish(implode($separator, $items), '/');
     unset($separator);
 
     reset($items);
@@ -112,34 +113,38 @@
     unset($base_url);
 }
 
-if (! preg_match('/\/$/', MODX_BASE_PATH)) {
+if (!preg_match('/\/$/', MODX_BASE_PATH)) {
     throw new RuntimeException('Please, use trailing slash at the end of MODX_BASE_PATH');
 }
 
-if (! preg_match('/\/$/', MODX_BASE_URL)) {
+if (!preg_match('/\/$/', MODX_BASE_URL)) {
     throw new RuntimeException('Please, use trailing slash at the end of MODX_BASE_URL');
 }
 
-if (! defined('MODX_MANAGER_PATH')) {
+if (!defined('MODX_MANAGER_PATH')) {
     define('MODX_MANAGER_PATH', env('MODX_MANAGER_PATH', MODX_BASE_PATH . MGR_DIR . '/'));
 }
 
-if (! defined('MODX_SITE_URL')) {
+if (!defined('MODX_SITE_URL')) {
     // check for valid hostnames
     $site_hostname = 'localhost';
-    if (! is_cli()) {
+    if (!is_cli()) {
         $site_hostname = str_replace(
             ':' . $_SERVER['SERVER_PORT'],
             '',
             get_by_key($_SERVER, 'HTTP_HOST', $site_hostname)
         );
     }
     $site_hostnames = explode(',', MODX_SITE_HOSTNAMES);
-    if (! empty($site_hostnames[0]) && ! in_array($site_hostname, $site_hostnames)) {
+    if (!empty($site_hostnames[0]) && !in_array($site_hostname, $site_hostnames)) {
         $site_hostname = $site_hostnames[0];
     }
     unset($site_hostnames);
 
+    if (!isset($_SERVER['SERVER_PORT'])) {
+        $_SERVER['SERVER_PORT'] = 80;
+    }
+
     // assign site_url
     if ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) === 'on') ||
         $_SERVER['SERVER_PORT'] == HTTPS_PORT ||
@@ -155,10 +160,10 @@
         $site_url = str_replace(':' . $_SERVER['SERVER_PORT'], '', $site_url);
     }
 
-    if (! in_array((int)$_SERVER['SERVER_PORT'], [80, (int)HTTPS_PORT], true) &&
+    if (!in_array((int)$_SERVER['SERVER_PORT'], [80, (int)HTTPS_PORT], true) &&
         strtolower(get_by_key($_SERVER, 'HTTPS', 'off'))
     ) {
-        $site_url .=  ':' . $_SERVER['SERVER_PORT'];
+        $site_url .= ':' . $_SERVER['SERVER_PORT'];
     }
 
     $site_url .= MODX_BASE_URL;
@@ -167,25 +172,25 @@
     unset($site_url);
 }
 
-if (! preg_match('/\/$/', MODX_SITE_URL)) {
+if (!preg_match('/\/$/', MODX_SITE_URL)) {
     throw new RuntimeException('Please, use trailing slash at the end of MODX_SITE_URL');
 }
 
-if (! defined('MODX_MANAGER_URL')) {
+if (!defined('MODX_MANAGER_URL')) {
     define('MODX_MANAGER_URL', env('MODX_MANAGER_URL', MODX_SITE_URL . MGR_DIR . '/'));
 }
 
-if (! defined('MODX_SANITIZE_SEED')) {
+if (!defined('MODX_SANITIZE_SEED')) {
     define('MODX_SANITIZE_SEED', 'sanitize_seed_' . base_convert(md5(__FILE__), 16, 36));
 }
 
 if (is_cli()) {
     define('MODX_CLI', true);
-    if (! (defined('MODX_BASE_PATH') || defined('MODX_BASE_URL'))) {
+    if (!(defined('MODX_BASE_PATH') || defined('MODX_BASE_URL'))) {
         throw new RuntimeException('Please, define MODX_BASE_PATH and MODX_BASE_URL on cli mode');
     }
 
-    if (! defined('MODX_SITE_URL')) {
+    if (!defined('MODX_SITE_URL')) {
         throw new RuntimeException('Please, define MODX_SITE_URL on cli mode');
     }
 }

core/src/ExceptionHandler.php

@@ -409,7 +409,7 @@ public function messageQuit(
             }
 
             echo "\n", $this->renderConsoleBacktrace($backtrace);
-        } else if ($this->shouldDisplay()) {
+        } else if (!$this->shouldDisplay()) {
             $version = isset($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : '';
             $release_date = isset($GLOBALS['release_date']) ? $GLOBALS['release_date'] : '';
 

core/src/Middleware/VerifyCsrfToken.php

@@ -6,7 +6,7 @@ class VerifyCsrfToken
 {
     public function handle($request, Closure $next)
     {
-        if ($_SESSION['_token'] !== $request->input('_token')) {
+        if ($request->has('_token') && isset($_SESSION['_token']) && $_SESSION['_token'] !== $request->input('_token')) {
             return \Response::json(['error' => 'CSRF token mismatch'], '403');
 
         }