diff --git a/fn/common.php b/fn/common.php index 46002fc..7d94f68 100644 --- a/fn/common.php +++ b/fn/common.php @@ -1,27 +1,33 @@ Succès : " . $msg . "

\n"; - closeHTML(); + $final_message = "

Succès : " . $msg . "

\n"; } // When the user requests something unexpected function userError($msg) { + global $final_message; + $final_message = "

Erreur utilisataire : " . $msg . "

\n"; http_response_code(403); - echo "

Erreur utilisataire : " . $msg . "

\n"; - closeHTML(); + executePage(); } // When the system did something unexpected function serverError($msg) { + global $final_message; + $final_message = "

Server error: The server encountered an error: " . $msg . "

\n"; http_response_code(500); error_log("Niver internal error: " . strip_tags($msg)); - echo "

Server error: The server encountered an error: " . $msg . "

\n"; - closeHTML(); + executePage(); } function processForm($requireLogin = true) { + if (http_response_code() !== 200) + return false; if (empty($_POST) AND $requireLogin AND !isset($_SESSION['username'])) echo '

Ce formulaire ne sera pas accepté car il faut se connecter avant.

'; if (empty($_POST)) diff --git a/html.php b/html.php index 647e1d4..b52a359 100644 --- a/html.php +++ b/html.php @@ -71,6 +71,9 @@ if (empty($_POST) === false AND (isset($_SERVER['HTTP_SEC_FETCH_SITE']) !== true userError("Anti-CSRF verification failed ! (Wrong or unset Sec-Fetch-Site HTTP header)"); function closeHTML() { + global $final_message; + if (isset($final_message)) + echo $final_message; ?> diff --git a/router.php b/router.php index e468708..231dbc2 100644 --- a/router.php +++ b/router.php @@ -44,6 +44,8 @@ if (SERVICE !== '.') { require "html.php"; -require "pages/" . PAGE_ADDRESS . ".php"; - -closeHtml(); +function executePage() { + require "pages/" . PAGE_ADDRESS . ".php"; + closeHtml(); +} +executePage();