From ec6233ac6d0d3c7c818329feddcc04bfebc23458 Mon Sep 17 00:00:00 2001 From: Pierretux <pierretux@noreply.git.spip.net> Date: Mon, 6 Sep 2021 11:43:37 +0200 Subject: [PATCH] On remplace http_status par http_response_code disponble depuis php 5.4 --- ecrire/action/cookie.php | 2 +- ecrire/action/menu_rubriques.php | 2 +- ecrire/inc/filtres.php | 4 ++-- ecrire/inc/flock.php | 2 +- ecrire/inc/minipres.php | 2 +- ecrire/inc/utils.php | 2 +- ecrire/public.php | 2 +- ecrire/public/aiguiller.php | 2 +- ecrire/public/debusquer.php | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ecrire/action/cookie.php b/ecrire/action/cookie.php index c31f6b55a5..27d40d4344 100644 --- a/ecrire/action/cookie.php +++ b/ecrire/action/cookie.php @@ -60,7 +60,7 @@ function action_cookie_dist($set_cookie_admin = null, $change_session = null) { $session = charger_fonction('session', 'inc'); $session(true); spip_log('statut 204 pour ' . $_SERVER['REQUEST_URI']); - http_status(204); // No Content + http_response_code(204); // No Content return; } diff --git a/ecrire/action/menu_rubriques.php b/ecrire/action/menu_rubriques.php index 706f4e68f5..f2be3b9c0e 100644 --- a/ecrire/action/menu_rubriques.php +++ b/ecrire/action/menu_rubriques.php @@ -63,7 +63,7 @@ function action_menu_rubriques_dist() { ) { include_spip('inc/headers'); header('Content-Type: text/html; charset=' . $GLOBALS['meta']['charset']); - http_status(304); + http_response_code(304); exit; } else { include_spip('inc/actions'); diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php index 8fe948f20c..c418dd8774 100644 --- a/ecrire/inc/filtres.php +++ b/ecrire/inc/filtres.php @@ -5314,7 +5314,7 @@ function sinon_interdire_acces($ok = false, $url = '', $statut = 0, $message = n if (!$statut or !in_array($statut, [404, 403])) { $statut = 403; } - http_status(403); + http_response_code(403); $echec = charger_fonction('403', 'exec'); $echec($message); } else { @@ -5323,7 +5323,7 @@ function sinon_interdire_acces($ok = false, $url = '', $statut = 0, $message = n $statut = 404; } // Dans tous les cas on modifie l'entité avec ce qui est demandé - http_status($statut); + http_response_code($statut); // Si le statut est une erreur et qu'il n'y a pas de redirection on va chercher le squelette du même nom if ($statut >= 400) { echo recuperer_fond("$statut", ['erreur' => $message]); diff --git a/ecrire/inc/flock.php b/ecrire/inc/flock.php index d35b5ac02a..fe36e37569 100644 --- a/ecrire/inc/flock.php +++ b/ecrire/inc/flock.php @@ -390,7 +390,7 @@ function lire_fichier_securise($fichier, &$contenu, $options = []) { function raler_fichier($fichier) { include_spip('inc/minipres'); $dir = dirname($fichier); - http_status(401); + http_response_code(401); echo minipres(_T('texte_inc_meta_2'), "<h4 style='color: red'>" . _T('texte_inc_meta_1', ['fichier' => $fichier]) . " <a href='" diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php index 68a8ba87a9..b323e3ff04 100644 --- a/ecrire/inc/minipres.php +++ b/ecrire/inc/minipres.php @@ -206,7 +206,7 @@ function minipres($titre = '', $corps = '', $options = []) { if (!_AJAX) { if (isset($options['status'])) { - http_status($options['status']); + http_response_code($options['status']); } return install_debut_html($titre, $options['onload'], $options['all_inline']) diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 043ef35f89..1b37231cd1 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -1056,7 +1056,7 @@ function spip_touch($fichier, $duree = 0, $touch = true) { **/ function action_cron() { include_spip('inc/headers'); - http_status(204); // No Content + http_response_code(204); // No Content header('Connection: close'); define('_DIRECT_CRON_FORCE', true); cron(); diff --git a/ecrire/public.php b/ecrire/public.php index 8124b10b0b..4aa9a748b6 100644 --- a/ecrire/public.php +++ b/ecrire/public.php @@ -118,7 +118,7 @@ if (isset($GLOBALS['_INC_PUBLIC']) and $GLOBALS['_INC_PUBLIC']) { if (isset($page['status'])) { include_spip('inc/headers'); - http_status($page['status']); + http_response_code($page['status']); } // Content-Type ? diff --git a/ecrire/public/aiguiller.php b/ecrire/public/aiguiller.php index 13ed9f814d..98a90341b4 100644 --- a/ecrire/public/aiguiller.php +++ b/ecrire/public/aiguiller.php @@ -160,7 +160,7 @@ function traiter_appels_inclusions_ajax() { } } else { include_spip('inc/headers'); - http_status(400); + http_response_code(400); $texte = _L('signature ajax bloc incorrecte'); } ajax_retour($texte, false); diff --git a/ecrire/public/debusquer.php b/ecrire/public/debusquer.php index 9cba5208e4..0ddae1d270 100644 --- a/ecrire/public/debusquer.php +++ b/ecrire/public/debusquer.php @@ -137,7 +137,7 @@ function public_debusquer_dist($message = '', $lieu = '', $opt = []) { return $res; } if ($tableau_des_erreurs) { - http_status(503); + http_response_code(503); } http_no_cache(); -- GitLab