diff --git a/server_files/controllers/mon_equipe.php b/server_files/controllers/mon_equipe.php index 05d0198..453b829 100644 --- a/server_files/controllers/mon_equipe.php +++ b/server_files/controllers/mon_equipe.php @@ -120,7 +120,7 @@ class MyTeam ensure(preg_match("#^[A-Z]{3}$#", $this->trigram), "Le trigramme n'est pas valide."); ensure($this->trigram == $this->team->getTrigram() || !trigramExists($this->trigram), "Une équipe a déjà choisi ce trigramme."); ensure($this->tournament != null, "Le tournoi indiqué n'existe pas."); - ensure(date("y-m-d H:i:s") <= $this->tournament->getInscriptionDate(), "Les inscriptions sont terminées."); + ensure(date("Y-m-d H:i:s") <= $this->tournament->getInscriptionDate(), "Les inscriptions sont terminées."); ensure($this->team->getValidationStatus() == ValidationStatus::NOT_READY, "Votre équipe est déjà validée ou en cours de validation."); } diff --git a/server_files/utils.php b/server_files/utils.php index e0a26f5..3fa8116 100644 --- a/server_files/utils.php +++ b/server_files/utils.php @@ -9,14 +9,14 @@ function ensure($bool, $error_msg = "") function formatDate($date = NULL, $with_time = false) { if ($date == NULL) - $date = date("yyyy-mm-dd"); + $date = date("Y-m-d H:i:s"); return strftime("%d %B %G" . ($with_time ? " %H:%M" : ""), strtotime($date)); } function dateWellFormed($date, $with_time = false) { - return date_parse_from_format($with_time ? "yyyy-mm-dd HH-MM:ss" : "yy-mm-dd", $date) !== false; + return date_parse_from_format($with_time ? "Y-m-d H:i:s" : "Y-m-d", $date) !== false; } function genRandomPhrase($size, $uppercase = false) diff --git a/server_files/views/mon_equipe.php b/server_files/views/mon_equipe.php index 7b0f2a1..1546526 100644 --- a/server_files/views/mon_equipe.php +++ b/server_files/views/mon_equipe.php @@ -19,7 +19,7 @@ require_once "header.php";