From 3f721aa1cfaa17df45a21eb1b7ad2a9262a5987e Mon Sep 17 00:00:00 2001 From: maxpozdeev Date: Sun, 7 Jan 2024 14:24:03 +0300 Subject: [PATCH] little more debug info in setup --- src/init.php | 5 +++-- src/setup.php | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/init.php b/src/init.php index e41813e..87ae067 100644 --- a/src/init.php +++ b/src/init.php @@ -21,13 +21,13 @@ if (!defined('MTT_THEME')) { define('MTT_THEME_PATH', MTT_CONTENT_PATH. MTT_THEME. '/'); -if (getenv('MTT_ENABLE_DEBUG') == 'YES') { +if (getenv('MTT_ENABLE_DEBUG') == 'YES' && !defined('MTT_DEBUG')) { define('MTT_DEBUG', true); error_reporting(E_ALL); ini_set('display_errors', '1'); ini_set('log_errors', '1'); } -else { +else if (!defined('MTT_DEBUG')) { //ini_set('display_errors', '0'); //ini_set('log_errors', '1'); define('MTT_DEBUG', false); @@ -271,6 +271,7 @@ function setup_and_start_session() # this is a known samesite flag workaround, was fixed in 7.3 session_set_cookie_params($lifetime, $path. '; samesite=lax', null, null, true); } else { + /** @disregard P1006 available in php 7.3 */ session_set_cookie_params([ 'lifetime' => $lifetime, 'path' => $path, diff --git a/src/setup.php b/src/setup.php index 3e1f8e1..737f40a 100644 --- a/src/setup.php +++ b/src/setup.php @@ -15,9 +15,11 @@ if (version_compare(PHP_VERSION, '7.2.0') < 0) { if (getenv('MTT_ENABLE_DEBUG') == 'YES') { set_exception_handler('debugExceptionHandler'); + define('MTT_DEBUG', true); } else { set_exception_handler('myExceptionHandler'); + define('MTT_DEBUG', false); } if (!defined('MTTPATH')) define('MTTPATH', dirname(__FILE__) .'/'); @@ -76,10 +78,13 @@ if ($configExists) // Determine current installed db version $ver = databaseVersion($db); + if (MTT_DEBUG) { + error_log("Database version detected: $ver"); + } if ($ver == '') { - // clean install - // will not load settings from database in init.php + // Clean install + // Don't load settings from database in init.php Config::$noDatabase = true; } else if (version_compare($ver, '1.4') < 0) {