diff --git a/core/core.php b/core/core.php index bafd8c5..e09804a 100644 --- a/core/core.php +++ b/core/core.php @@ -51,7 +51,7 @@ class common const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '1.12.00.13'; + const ZWII_VERSION = '1.12.00.14'; // URL autoupdate const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/'; diff --git a/module/suscribe/changes.md b/module/suscribe/changes.md index c947222..f98ed9e 100644 --- a/module/suscribe/changes.md +++ b/module/suscribe/changes.md @@ -1,3 +1,5 @@ +# Version 2.3 +- Warning lors de la saisie d'un email vide # Version 2.2 - Ajoute la gestion des profils # Version 2.1 diff --git a/module/suscribe/enum.json b/module/suscribe/enum.json index 5afa3e5..37ede75 100644 --- a/module/suscribe/enum.json +++ b/module/suscribe/enum.json @@ -1 +1 @@ -{"name":"suscribe","realName":"Auto Inscription","version":"2.2","update":"0.0","delete":true,"dataDirectory":""} \ No newline at end of file +{"name":"suscribe","realName":"Auto Inscription","version":"2.3","update":"0.0","delete":true,"dataDirectory":""} \ No newline at end of file diff --git a/module/suscribe/suscribe.php b/module/suscribe/suscribe.php index 97c23ba..78142df 100755 --- a/module/suscribe/suscribe.php +++ b/module/suscribe/suscribe.php @@ -15,7 +15,7 @@ class suscribe extends common { - const VERSION = '2.2'; + const VERSION = '2.3'; const REALNAME = 'Auto Inscription'; const DELETE = true; const UPDATE = '0.0'; @@ -243,12 +243,14 @@ class suscribe extends common */ // Soumission du formulaire if ($this->isPost()) { + // Contrôler la validité du domaine saisi parmi les domaines valides + $email_to_check = $this->getInput('registrationAddMail', helper::FILTER_MAIL, true); // Le domaine saisi est invalide si un filtre existe if ( - !empty($this->getData(['module', $this->getUrl(0), 'config', 'filter'])) + empty($this->getData(['module', $this->getUrl(0), 'config', 'filter'])) === true && + empty($email_to_check) === true ) { - // Contrôler la validité du domaine saisi parmi les domaines valides - $email_to_check = $this->getInput('registrationAddMail', helper::FILTER_MAIL, true); + // Récupérer la liste des domaines valides depuis la configuration et supprimer les espaces autour $filter = trim($this->getData(['module', $this->getUrl(0), 'config', 'filter']));