Skip to content

adminator: update database init functions for re-use with queue #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
czhujer merged 2 commits into from
Jun 27, 2025
Merged

adminator: update database init functions for re-use with queue #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
607cf1b
adminator: update database init functions for re-use with queue
czhujer Jun 27, 2025
f141a1c
phpstan
czhujer Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions adminator3/include/main.function.shared.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

function init_helper_base_html($app_name = "adminator")
function init_helper_base_html($app_name = "adminator"): string
{
$base_html = "<html>
<head>
Expand All @@ -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<div style=\"color: black; padding-left: 20px; \">\n";
$hlaska_connect .= "<div style=\"padding-top: 50px; font-size: 18px; \">\n";
$hlaska_connect .= "Omlouváme se, " . $app_name . " v tuto chvíli není dostupný! </div>\n";
$hlaska_connect .= "<div style=\"padding-top: 10px; font-size: 12px; \" >\nDetailní informace: Chyba! Nelze se pripojit k Mysql databázi. </div>\n";
if ($print_html) {
$hlaska_connect = init_helper_base_html($app_name)."\n<div style=\"color: black; padding-left: 20px; \">\n";
$hlaska_connect .= "<div style=\"padding-top: 50px; font-size: 18px; \">\n";
$hlaska_connect .= "Omlouváme se, " . $app_name . " v tuto chvíli není dostupný! </div>\n";
$hlaska_connect .= "<div style=\"padding-top: 10px; font-size: 12px; \" >\nDetailní informace: Chyba! Nelze se pripojit k Mysql databázi. </div>\n";
} else {
$hlaska_connect = "Detailní informace: Chyba! Nelze se pripojit k Mysql databázi.\n";
}

mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);

Expand All @@ -50,7 +54,9 @@ function init_mysql($app_name = "adminator")
if ($conn_mysql->connect_error) {
echo "connection error: " . $conn_mysql->connect_error . "\n";
}
echo "</div></div></body></html>\n";
if ($print_html) {
echo "</div></div></body></html>\n";
}
die();
}

Expand All @@ -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)."<div style=\"color: black; padding-left: 20px; \">";
$hlaska_connect .= "<div style=\"padding-top: 50px; font-size: 18px; \">";
$hlaska_connect .= "Omlouváme se, Adminátor2 v tuto chvíli není dostupný! </div>";
$hlaska_connect .= "<div style=\"padding-top: 10px; font-size: 12px; \" >Detailní informace: Chyba! Nelze se pripojit k Postgre databázi. </div>";
if ($print_html) {
$hlaska_connect = init_helper_base_html($app_name)."<div style=\"color: black; padding-left: 20px; \">";
$hlaska_connect .= "<div style=\"padding-top: 50px; font-size: 18px; \">";
$hlaska_connect .= "Omlouváme se, Adminátor2 v tuto chvíli není dostupný! </div>";
$hlaska_connect .= "<div style=\"padding-top: 10px; font-size: 12px; \" >Detailní informace: Chyba! Nelze se pripojit k Postgre databázi. </div>";
} 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";
Expand All @@ -97,9 +107,14 @@ function init_postgres($app_name = "adminator")
die($hlaska_connect . 'Caught exception: ' . $e->getMessage() . "\n" . "</div></div></body></html>\n");
}

if (!($db_ok2)) {
die($hlaska_connect.pg_last_error()."</div></div></body></html>");
if ($db_ok2 === false) {
try {
die($hlaska_connect.pg_last_error()."</div></div></body></html>");
} catch (\Throwable $e) {
die($hlaska_connect . 'Caught exception: ' . $e->getMessage() . "\n" . "</div></div></body></html>\n");
}
}

return $db_ok2;
}

Expand Down
4 changes: 4 additions & 0 deletions adminator3/phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: \$.*#'
Expand Down