promo must be in [birth + 15y ; birth + 30y]

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@664 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 8158148..a360233 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@ New:
 
     * Register:
         - Switch to the new URI scheme.                                     -MC
+        - Check birth date coherence with promotion                        -FRU
 
     * Search:
         - Switch to the new URI scheme.                                     -MC

diff --git a/modules/register.php b/modules/register.php
index b67c5bc..dc89b97 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -123,16 +123,20 @@ class RegisterModule extends PLModule
                         $err[] = $sub_state['forlife']." doit renvoyer vers un email existant ".
                             "valide, en particulier, il ne peut pas être renvoyé vers lui-même.";
                     }
-                    if (!preg_match('/^[0-3][0-9][01][0-9][12][90][0-9][0-9]$/',
-                                    Post::v('naissance')))
-                    {
+                    $birth = Env::v('naissance');
+                    if (!preg_match('/^[0-3][0-9][01][0-9][12][90][0-9][0-9]$/', $birth)) {
                         $err[] = "La 'Date de naissance' n'est pas correcte.";
+                    } else {
+                        $year  = (int)substr($birth, 4, 4);
+                        $promo = (int)$sub_state['promo'];
+                        if ($year > $promo - 15 || $year < $promo - 30) {
+                            $err[] = "La 'Date de naissance' n'est pas correcte.";
+                        }
                     }
 
                     if (isset($err)) {
                         $err = join('<br />', $err);
                     } else {
-                        $birth = Env::v('naissance');
                         $sub_state['naissance'] = sprintf("%s-%s-%s",
                                                           substr($birth,4,4),
                                                           substr($birth,2,2),

diff --git a/templates/register/step2.tpl b/templates/register/step2.tpl
index 91989da..0029d1a 100644 (file)
--- a/templates/register/step2.tpl
+++ b/templates/register/step2.tpl
@@ -58,8 +58,7 @@
     </tr>
     <tr>
       <td class="titre"> 
-        Nom<br />
-        <span class="smaller">(Xettes mariées : nom à l'X)</span>
+        Nom <span class="smaller">(à l'X)</span>
       </td>
       <td>
         <input type="text" size="20" maxlength="30" name="nom" value="{$smarty.request.nom}" />