Add a warning when birthday is do not match with promotion

Some fixes for unregistered users management

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

diff --git a/include/emails.inc.php b/include/emails.inc.php
index 836d82c..c3852d3 100644 (file)
--- a/include/emails.inc.php
+++ b/include/emails.inc.php
@@ -39,9 +39,9 @@ function fix_bestalias($uid)
     }
     XDB::execute("UPDATE  aliases
                                SET  flags=CONCAT(flags,',','bestalias')
-                            WHERE  id={?} AND type!='homonyme'
-                         ORDER BY  !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias)
-                            LIMIT  1", $uid);
+                 WHERE  id={?} AND type!='homonyme'
+                  ORDER BY  !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias)
+                     LIMIT  1", $uid);
 }
 
 // }}}
@@ -77,14 +77,17 @@ class Bogo
 
     function Bogo($uid)
     {
-       $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid);
-       if ($res->numRows()) {
-            $this->state = $res->fetchOneCell();
-       } else {
-           $this->state = 'tag_and_drop_spams';
-           $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags)
-                                             VALUES ({?},'tag_and_drop_spams','','0000-00-00','filter')", $uid);
-       }
+        if (!$uid) {
+            return;
+        }
+        $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid);
+        if ($res->numRows()) {
+                $this->state = $res->fetchOneCell();
+        } else {
+            $this->state = 'tag_and_drop_spams';
+            $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags)
+                                    VALUES ({?},'tag_and_drop_spams','','0000-00-00','filter')", $uid);
+        }
     }
 
     // }}}
@@ -92,8 +95,8 @@ class Bogo
 
     function change($uid, $state)
     {
-       $this->state = is_int($state) ? $this->_states[$state] : $state;
-       XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"',
+    $this->state = is_int($state) ? $this->_states[$state] : $state;
+    XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"',
                      $this->state, $uid);
     }
 
@@ -141,7 +144,7 @@ class Email
                              SET  panne_level = IF(flags = 'panne', panne_level - 1, panne_level),
                                   flags = 'active'
                            WHERE  uid={?} AND email={?}", $uid, $this->email);
-           $_SESSION['log']->log("email_on", $this->email.($uid!=S::v('uid') ? "(admin on $uid)" : ""));
+        $_SESSION['log']->log("email_on", $this->email.($uid!=S::v('uid') ? "(admin on $uid)" : ""));
             $this->active = true;
             $this->broken = false;
         }
@@ -154,8 +157,8 @@ class Email
     {
         if ($this->active) {
             XDB::execute("UPDATE  emails SET flags =''
-                                    WHERE  uid={?} AND email={?}", $uid, $this->email);
-               $_SESSION['log']->log("email_off",$this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "") );
+                     WHERE  uid={?} AND email={?}", $uid, $this->email);
+            $_SESSION['log']->log("email_off",$this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "") );
             $this->active = false;
         }
     }
@@ -165,12 +168,12 @@ class Email
 
     function rewrite($rew, $uid)
     {
-       if ($this->rewrite == $rew) {
+        if ($this->rewrite == $rew) {
             return;
         }
-           XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email);
-       $this->rewrite = $rew;
-           return;
+        XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email);
+        $this->rewrite = $rew;
+        return;
     }
 
     // }}}
@@ -193,15 +196,15 @@ class Redirect
 
     function Redirect($_uid)
     {
-       $this->uid=$_uid;
+        $this->uid=$_uid;
         $res = XDB::iterRow("
-               SELECT email, flags, rewrite, panne, last, panne_level
-                 FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid);
-       $this->emails=Array();
+            SELECT email, flags, rewrite, panne, last, panne_level
+              FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid);
+        $this->emails=Array();
         while ($row = $res->next()) {
-               $this->emails[] = new Email($row);
+            $this->emails[] = new Email($row);
         }
-       $this->bogo = new Bogo($_uid);
+        $this->bogo = new Bogo($_uid);
     }
 
     // }}}
@@ -227,11 +230,11 @@ class Redirect
         }
         XDB::execute('DELETE FROM emails WHERE uid={?} AND email={?}', $this->uid, $email);
         $_SESSION['log']->log('email_del',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : ""));
-           foreach ($this->emails as $i=>$mail) {
-               if ($email==$mail->email) {
+        foreach ($this->emails as $i=>$mail) {
+            if ($email==$mail->email) {
                 unset($this->emails[$i]);
             }
-       }
+        }
         return SUCCESS;
     }
 
@@ -248,14 +251,14 @@ class Redirect
             return ERROR_LOOP_EMAIL;
         }
         XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->uid, $email);
-           if ($logger = S::v('log', null)) { // may be absent --> step4.php
-               $logger->log('email_add',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : ""));
+        if ($logger = S::v('log', null)) { // may be absent --> step4.php
+            $logger->log('email_add',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : ""));
         }
-       foreach ($this->emails as $mail) {
-               if ($mail->email == $email_stripped) {
+        foreach ($this->emails as $mail) {
+            if ($mail->email == $email_stripped) {
                 return SUCCESS;
             }
-           }
+        }
         $this->emails[] = new Email(array($email,1,'','0000-00-00'));
 
         // security stuff
@@ -286,13 +289,13 @@ class Redirect
 
     function modify_email($emails_actifs,$emails_rewrite)
     {
-           foreach ($this->emails as $i=>$mail) {
+        foreach ($this->emails as $i=>$mail) {
             if (in_array($mail->email,$emails_actifs)) {
                 $this->emails[$i]->activate($this->uid);
-               } else {
+            } else {
                 $this->emails[$i]->deactivate($this->uid);
-               }
-               $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $this->uid);
+            }
+            $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $this->uid);
         }
     }
 

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index e353de9..74b0ada 100644 (file)
--- a/templates/admin/utilisateurs.tpl
+++ b/templates/admin/utilisateurs.tpl
@@ -180,14 +180,19 @@ function act_fwd(fwd, activate) {
         </select>
       </td>
     </tr>
+    {if $mr.perms neq 'pending'}
     <tr class="pair">
       <td class="titre">
+        {if $mr.naiss_err}<span class="erreur">{/if}
         Date de naissance
+        {if $mr.naiss_err}</span>{/if}
       </td>
       <td>
         <input type="text" name="naissanceN" size="12" maxlength="10" value="{$mr.naissance}" />
+        {if $mr.naiss_err}<span class="erreur smaller">({icon name=error}Date de naissance incohérente)</span>{/if}
       </td>
     </tr>
+    {/if}
     <tr class="pair">
       <td class="titre">
         Date de décès
@@ -215,6 +220,7 @@ function act_fwd(fwd, activate) {
     {if $mr.perms eq 'pending'}
     <tr class="center">
       <td colspan="2">
+        <input type="hidden" name="naissanceN" value="{$mr.naissance}" />
         <input onclick="doEditUser(); return true;" type="submit" name="u_edit" value="UPDATE" />
       </td>
     </tr>