From: x2003bruneau Date: Sun, 21 Jan 2007 17:19:36 +0000 (+0000) Subject: Show users with broken email in xnet X-Git-Tag: xorg/0.9.13~93 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e429fff0385bbafea7d051ab874e5680a13c69eb;p=platal.git Show users with broken email in xnet git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1378 839d8a87-29fc-0310-9880-83ba4fa771e5 --- diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index bc8bed5..065d1a5 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -383,12 +383,14 @@ class XnetGrpModule extends PLModule m.perms='admin' AS admin, m.origine='X' AS x, u.perms!='pending' AS inscrit, - m.uid + m.uid, e.email AS actif FROM groupex.membres AS m LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid ) LEFT JOIN aliases AS a ON ( a.id = m.uid AND a.type='a_vie' ) + LEFT JOIN emails AS e ON ( e.flags = 'active' AND e.uid = m.uid) WHERE m.asso_id = {?} $ini AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL) + GROUP BY m.uid ORDER BY $tri LIMIT {?},{?}", $globals->asso('id'), $ofs*NB_PER_PAGE, NB_PER_PAGE); $page->assign('ann', $ann); diff --git a/templates/xnetgrp/annuaire.tpl b/templates/xnetgrp/annuaire.tpl index 4a9d780..d6c2a7f 100644 --- a/templates/xnetgrp/annuaire.tpl +++ b/templates/xnetgrp/annuaire.tpl @@ -103,7 +103,11 @@ Tu peux {/if} {if $m.femme}•{/if}{$m.prenom} {$m.nom|strtoupper} {if $m.x}{/if} - {if $m.admin}{/if} + {if $m.admin}{/if} + {if $m.inscrit && !$m.actif} + {icon name=error title="Recherche d'email"} + {assign var=broken value=true} + {/if} {if $m.admin}{/if}{$m.promo}{if $m.admin}{/if} {if $m.inscrit} @@ -129,4 +133,12 @@ Tu peux {/foreach}

+{if $broken} +

+ {icon name=error} : Les camarades dont la ligne contient ce symbole n'ont plus d'adresse de redirection et ne peuvent donc + plus ĂȘtre contacter via leur adresse Polytechnique.org. Si tu connais sa nouvelle adresse, tu peux nous la communiquer en + cliquant sur le symbole. +

+{/if} + {* vim:set et sw=2 sts=2 sws=2: *}