diff --git a/adminator3/include/main.function.shared.php b/adminator3/include/main.function.shared.php index f04d4d6f..51f052d5 100644 --- a/adminator3/include/main.function.shared.php +++ b/adminator3/include/main.function.shared.php @@ -1,6 +1,6 @@ @@ -20,13 +20,17 @@ function init_helper_base_html($app_name = "adminator") return $base_html; } -function init_mysql($app_name = "adminator") +function init_mysql($app_name = "adminator", $print_html = true) { - $hlaska_connect = init_helper_base_html($app_name)."\n
\n"; - $hlaska_connect .= "
\n"; - $hlaska_connect .= "Omlouváme se, " . $app_name . " v tuto chvíli není dostupný!
\n"; - $hlaska_connect .= "
\nDetailní informace: Chyba! Nelze se pripojit k Mysql databázi.
\n"; + if ($print_html) { + $hlaska_connect = init_helper_base_html($app_name)."\n
\n"; + $hlaska_connect .= "
\n"; + $hlaska_connect .= "Omlouváme se, " . $app_name . " v tuto chvíli není dostupný!
\n"; + $hlaska_connect .= "
\nDetailní informace: Chyba! Nelze se pripojit k Mysql databázi.
\n"; + } else { + $hlaska_connect = "Detailní informace: Chyba! Nelze se pripojit k Mysql databázi.\n"; + } mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT); @@ -50,7 +54,9 @@ function init_mysql($app_name = "adminator") if ($conn_mysql->connect_error) { echo "connection error: " . $conn_mysql->connect_error . "\n"; } - echo "
\n"; + if ($print_html) { + echo "\n"; + } die(); } @@ -69,13 +75,17 @@ function init_mysql($app_name = "adminator") return $conn_mysql; } -function init_postgres($app_name = "adminator") +function init_postgres($app_name = "adminator", $print_html = true) { - $hlaska_connect = init_helper_base_html($app_name)."
"; - $hlaska_connect .= "
"; - $hlaska_connect .= "Omlouváme se, Adminátor2 v tuto chvíli není dostupný!
"; - $hlaska_connect .= "
Detailní informace: Chyba! Nelze se pripojit k Postgre databázi.
"; + if ($print_html) { + $hlaska_connect = init_helper_base_html($app_name)."
"; + $hlaska_connect .= "
"; + $hlaska_connect .= "Omlouváme se, Adminátor2 v tuto chvíli není dostupný!
"; + $hlaska_connect .= "
Detailní informace: Chyba! Nelze se pripojit k Postgre databázi.
"; + } else { + $hlaska_connect = "Detailní informace: Chyba! Nelze se pripojit k Postgre databázi.\n"; + } $POSTGRES_SERVER = getenv("POSTGRES_SERVER") ? getenv("POSTGRES_SERVER") : "localhost"; $POSTGRES_USER = getenv("POSTGRES_USER") ? getenv("POSTGRES_USER") : "root"; @@ -97,9 +107,14 @@ function init_postgres($app_name = "adminator") die($hlaska_connect . 'Caught exception: ' . $e->getMessage() . "\n" . "
\n"); } - if (!($db_ok2)) { - die($hlaska_connect.pg_last_error().""); + if ($db_ok2 === false) { + try { + die($hlaska_connect.pg_last_error().""); + } catch (\Throwable $e) { + die($hlaska_connect . 'Caught exception: ' . $e->getMessage() . "\n" . "\n"); + } } + return $db_ok2; } diff --git a/adminator3/phpstan.neon b/adminator3/phpstan.neon index 5006da16..ea4e3e96 100644 --- a/adminator3/phpstan.neon +++ b/adminator3/phpstan.neon @@ -18,6 +18,10 @@ parameters: - message: "#^Variable \\$.* in (empty|isset)\\(\\) is never defined\\.$#" path: app/Controllers/Core/* + # for cli/queue + - + message: "#^Dead catch - Throwable is never thrown in the try block\\.$#" + path: include/main.function.shared.php # common known issues - message: '#Undefined variable: \$.*#'