Closes #529: Disabled state is private

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

diff --git a/ChangeLog b/ChangeLog
index 6a99003..46feb82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,7 @@ From 0.9.11 branch:
     * Profile:
         - #486: fix force login to see private fiche.                      -Car
         - #509: can access trombi of the current year promotion            -FRU
+        - #529: Disabled state is private                                  -FRU
 
 ================================================================================
 VERSION 0.9.11                                                 18 Septembre 2006

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index d0fe12e..9a846f8 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -317,8 +317,8 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
                        c.uid IS NOT NULL AS is_contact,
                        s.text AS section, p.x, p.y, p.pub AS photo_pub,
                        u.matricule_ax,
-                       m.expertise != '' AS is_referent
-                       
+                       m.expertise != '' AS is_referent,
+                       COUNT(e.email) > 0 AS actif
                  FROM  auth_user_md5   AS u
            INNER JOIN  auth_user_quick AS q  USING(user_id)
            INNER JOIN  aliases         AS a  ON (u.user_id=a.id AND a.type='a_vie')
@@ -328,7 +328,9 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
            INNER JOIN  sections        AS s  ON (s.id  = u.section)
             LEFT JOIN  photo           AS p  ON (p.uid = u.user_id) 
             LEFT JOIN  mentor          AS m  ON (m.uid = u.user_id)
-                WHERE  a.alias = {?}";
+            LEFT JOIN  emails          AS e  ON (e.uid = u.user_id AND e.flags='active')
+                WHERE  a.alias = {?}
+             GROUP BY  u.user_id";
     $res  = XDB::query($reqsql, $from_uid, $login);
     $user = $res->fetchOneAssoc();
     $uid  = $user['user_id'];

diff --git a/modules/search/classes.inc.php b/modules/search/classes.inc.php
index 57f1d7d..a286a88 100644 (file)
--- a/modules/search/classes.inc.php
+++ b/modules/search/classes.inc.php
@@ -28,7 +28,7 @@ $globals->search->result_fields = '
                if(u.nom_usage=\'\', u.nom, u.nom_usage) AS NomSortKey,
                 u.nom_usage,u.date,
                 u.deces!=0 AS dcd,u.deces,
-               u.perms IN (\'admin\',\'user\') AS inscrit,
+               u.perms IN (\'admin\',\'user\', \'disabled\') AS inscrit,
                u.perms != \'pending\' AS wasinscrit,
                FIND_IN_SET(\'femme\', u.flags) AS sexe,
                 a.alias AS forlife,

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 916ca5a..b143b96 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -71,8 +71,12 @@ function chgMainWinLoc( strPage ) {
         <div class='email'>
           {if $x.dcd}
           Décédé{if $x.sexe}e{/if} le {$x.deces|date_format}
+          {elseif !$x.actif}
+          Ce camarade n'a plus d'adresse redirection valide,<br />
+          <a href="marketing/broken/{$x.user_id}" class="popup">clique ici si tu connais son adresse email !</a>
           {elseif !$x.inscrit}
-          Le compte de cette personne n'est pas actif (personne non inscrite ou exclue).
+          Cette personne n'est pas inscrite à Polytechnique.org,<br />
+          <a href="marketing/public/{$x.user_id}" class="popup">clique ici si tu connais son adresse email !</a>
           {else}
           {if $virtualalias}
           <a href="mailto:{$virtualalias}">{$virtualalias}</a><br />