last touch about disabled accounts

diff --git a/htdocs/fiche.php b/htdocs/fiche.php
index a067c3c..8c8ad89 100644 (file)
--- a/htdocs/fiche.php
+++ b/htdocs/fiche.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: fiche.php,v 1.23 2004-11-17 18:16:23 x2000habouzit Exp $
+        $Id: fiche.php,v 1.24 2004-11-18 15:28:16 x2000habouzit Exp $
  ***************************************************************************/
 
 
@@ -44,8 +44,9 @@ else
     $where_clause = " WHERE u.matricule = '{$_REQUEST['mat']}'";
 
 $reqsql = "SELECT  u.prenom, u.nom, u.epouse, IF(gp.nat='',gp.pays,gp.nat) AS text, gp.a2,
-                  u.user_id, a.alias, a2.alias, u.matricule, u.deces != 0 as dcd,
-                  u.deces, u.date, u.cv, sections.text, u.mobile, u.web,
+                  u.user_id, a.alias, a2.alias, u.matricule, u.perms IN ('admin','user'),
+                  FIND_IN_SET('femme', u.flags) AS sexe, u.deces != 0 as dcd, u.deces,
+                  u.date, u.cv, sections.text, u.mobile, u.web,
                   u.libre, u.promo, c.uid IS NOT NULL, p.x, p.y
             FROM  auth_user_md5  AS u
        INNER JOIN  aliases        AS a  ON (u.user_id=a.id AND a.type='a_vie')
@@ -61,8 +62,8 @@ if (mysql_num_rows($result)!=1)
         exit;
 
 if (list($prenom, $nom, $epouse, $nationalite, $iso3166,
-        $user_id, $forlife, $bestalias, $matricule, $dcd, $deces, 
-        $date,
+        $user_id, $forlife, $bestalias, $matricule, $inscrit,
+       $sexe, $dcd, $deces, $date,
         $cv, $section, 
         $mobile, $web, $libre, $promo,
         $is_contact, $size_x, $size_y) = mysql_fetch_row($result)) {
@@ -79,6 +80,8 @@ $page->assign('nationalite', $nationalite);
 $page->assign('iso3166', $iso3166);
 $page->assign('user_id', $user_id);
 $page->assign('matricule', $matricule);
+$page->assign('inscrit', $inscrit);
+$page->assign('sexe', $sexe);
 $page->assign('dcd', $dcd);
 $page->assign('deces', $deces);
 $page->assign('date', $date);

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 538883e..3a39e3d 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: fiche.tpl,v 1.29 2004-11-17 21:09:47 x2000habouzit Exp $
+        $Id: fiche.tpl,v 1.30 2004-11-18 15:28:16 x2000habouzit Exp $
  ***************************************************************************}
 
 {literal}
@@ -33,6 +33,7 @@ function chgMainWinLoc( strPage ) {
   <tr>
     <td id="fiche_identite">
       <div class="civilite">
+        {if $sexe}&bull;{/if}
         {$prenom} {if $epouse eq ""}{$nom}{else}{$epouse} ({$nom}){/if}&nbsp;
         <a href="vcard.php/{$forlife}.vcf?x={$user_id}">
           <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite"/>
@@ -58,10 +59,16 @@ function chgMainWinLoc( strPage ) {
       </div>
       <div class="contact">
         <div class='email'>
+          {if $dcd}
+          Décédé{if $sexe}e{/if} le {$deces|date_format:"%d %B %Y"}
+          {elseif !$inscrit}
+          Le compte de cette personne n'est pas actif (personne non inscrite ou exclue).
+          {else}
           <a href="mailto:{$bestalias}@polytechnique.org">{$bestalias}@polytechnique.org</a>
           {if $bestalias neq $forlife}<br />
           <a href="mailto:{$forlife}@polytechnique.org">{$forlife}@polytechnique.org</a>
           {/if}
+          {/if}
         </div>
         <div class="mob">
           {if $mobile}<em class="intitule">Mobile : </em>{$mobile}<br />{/if}

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 4f66ef0..e49234b 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: minifiche.tpl,v 1.18 2004-11-18 15:17:42 x2000habouzit Exp $
+        $Id: minifiche.tpl,v 1.19 2004-11-18 15:28:17 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -45,7 +45,7 @@
     {/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
     {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format:"%d %B %Y"}{/if}
     {min_auth level="cookie"}
-    {if !$c.dcd && !$c.inscrit}
+    {if !$c.dcd && !$c.wasinscrit}
     <a href="{"marketing/public.php"|url}?num={$c.matricule}" class='popup'>clique ici si tu connais son adresse email !</a>
     {/if}
     {/min_auth}