Date format is dd/mm/yyyy in registration.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/modules/register.php b/modules/register.php
index 623e873..0d717a9 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -144,10 +144,12 @@ class RegisterModule extends PLModule
                             "valide, en particulier, il ne peut pas être renvoyé vers lui-même.";
                     }
                     $birth = trim(Env::v('naissance'));
-                    if (!preg_match('/^[0-3][0-9][01][0-9][12][90][0-9][0-9]$/', $birth)) {
+                    if (!preg_match('@^[0-3]?\d/[01]?\d/(19|20)?\d{2}$@', $birth)) {
                         $err[] = "La 'Date de naissance' n'est pas correcte.";
                     } else {
-                        $year  = (int)substr($birth, 4, 4);
+                        $birth = explode('/', $birth, 3);
+                        $year  = intval($birth[2]);
+                        if ($year < 100) $year += 1900;
                         $promo = (int)$sub_state['promo'];
                         if ($year > $promo - 15 || $year < $promo - 30) {
                             $err[] = "La 'Date de naissance' n'est pas correcte.";
@@ -183,10 +185,8 @@ class RegisterModule extends PLModule
                     if (isset($err)) {
                         $err = join('<br />', $err);
                     } else {
-                        $sub_state['naissance'] = sprintf("%s-%s-%s",
-                                                          substr($birth,4,4),
-                                                          substr($birth,2,2),
-                                                          substr($birth,0,2));
+                        $sub_state['naissance'] = sprintf("%04d-%02d-%02d",
+                                                          intval($birth[2]), intval($birth[1]), intval($birth[0]));
                         if ($sub_state['naissance_ini'] != '0000-00-00' && $sub_state['naissance'] != $sub_state['naissance_ini']) {
                             $alert .= "Date de naissance incorrecte à l'inscription - ";
                         }

diff --git a/templates/register/step3.tpl b/templates/register/step3.tpl
index f998b6b..7e3b438 100644 (file)
--- a/templates/register/step3.tpl
+++ b/templates/register/step3.tpl
@@ -71,10 +71,10 @@
     <tr>
       <td class="titre">
         Date de naissance<br />
-        <span class="smaller">(Format JJMMAAAA)</span>
+        <span class="smaller">jour/mois/année</span>
       </td>
       <td>
-        <input type="text" size="8" maxlength="8" name="naissance"  value="{$smarty.post.naissance}" />
+        <input type="text" size="10" maxlength="10" name="naissance"  value="{$smarty.post.naissance}" />
         (demandée si perte de mot de passe)
       </td>
     </tr>