From 7277f1e98d3260091f689eb16d37a309321ed738 Mon Sep 17 00:00:00 2001 From: osaajani <> Date: Mon, 17 Aug 2020 21:05:01 +0200 Subject: [PATCH] Add re-populate form on submission error --- controllers/publics/Webhook.php | 2 +- index.php | 4 ++++ templates/command/add.php | 8 ++++---- templates/conditional_group/add.php | 4 ++-- templates/contact/add.php | 16 +++++++++++++--- templates/group/add.php | 4 ++-- templates/phone/add.php | 3 ++- templates/phone/list.php | 2 +- templates/scheduled/add.php | 16 ++++++++-------- templates/user/add.php | 8 ++++---- templates/webhook/add.php | 6 +++--- 11 files changed, 44 insertions(+), 29 deletions(-) diff --git a/controllers/publics/Webhook.php b/controllers/publics/Webhook.php index 1090fde..0ee9862 100644 --- a/controllers/publics/Webhook.php +++ b/controllers/publics/Webhook.php @@ -121,7 +121,7 @@ namespace controllers\publics; if (!$this->internal_webhook->create($_SESSION['user']['id'], $url, $type)) { - \FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce webhook.'); + \FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce webhook, vérifiez qu\'il s\'agit bien d\'une URL HTTP(S) valide.'); return $this->redirect(\descartes\Router::url('Webhook', 'add')); } diff --git a/index.php b/index.php index 4720b96..5774b7b 100644 --- a/index.php +++ b/index.php @@ -13,6 +13,10 @@ $_SESSION['csrf'] = str_shuffle(uniqid().uniqid()); } + //Save previous $_POST for re-populate forms on validation errors + $_SESSION['previous_http_post'] = $_SESSION['http_post'] ?? []; + $_SESSION['http_post'] = $_POST; + //Routing current query try { diff --git a/templates/command/add.php b/templates/command/add.php index 2cdae44..575bc17 100644 --- a/templates/command/add.php +++ b/templates/command/add.php @@ -41,21 +41,21 @@
@@ -58,6 +58,16 @@ Laissez vide si vous ne souhaitez pas renseigner d'informations supplémentaires pour le contact. Utilisez uniquement des lettres, des chiffres et des underscore pour les noms de données, ni espace ni caractères spéciaux.