Improve my last commit => make link to member edition form if the user is member...

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

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index e327c22..b8216c7 100644 (file)
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -40,10 +40,13 @@ function list_sort_owners(&$members, $tri_promo = true) {
                 $membres[0][] = Array('l' => $mem);
             }
         } else {
-            $res = XDB::query('SELECT prenom, nom FROM groupex.membres WHERE email={?}', $mem);
-            if (list($prenom, $nom) = $res->fetchOneRow()) {
+            $res = XDB::query('SELECT m2.uid, m1.prenom, m1.nom
+                                 FROM groupex.membres AS m1
+                            LEFT JOIN groupex.membres AS m2 ON(m1.email=m2.email AND m2.asso_id={?})
+                                WHERE m1.email={?}', $globals->asso('id'), $mem);
+            if (list($uid, $prenom, $nom) = $res->fetchOneRow()) {
                 $key = $tri_promo ? 0 : strtoupper($nom{0});
-                $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $mem, 'p' => (!$tri_promo ? 'non-X' : null));
+                $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $mem, 'x' => $uid, 'p' => (!$tri_promo ? 'non-X' : null));
             } else {
                 $membres[0][] = Array('l' => $mem, 'p' => (!$tri_promo ? 'non-X' : null));
             }

diff --git a/templates/listes/admin.tpl b/templates/listes/admin.tpl
index 34d73bf..a53da88 100644 (file)
--- a/templates/listes/admin.tpl
+++ b/templates/listes/admin.tpl
@@ -47,8 +47,12 @@ qui y 
       <td class='titre'>{if $promo}{$promo}{else}non-X{/if}</td>
       <td>
         {foreach from=$xs item=x}
-        {if $promo}
+        {if $promo && strpos($x.l, '@') === false}
         <a href="profile/{$x.l}" class="popup2">{$x.n}</a>
+        {elseif $x.x}
+        <a href="{$platal->ns}member/{$x.x}">{$x.n}</a>
+        {elseif $x.n}
+        {$x.n}
         {else}
         {$x.l}
         {/if}
@@ -81,8 +85,12 @@ qui y 
       <td class='titre'>{if $promo}{$promo}{else}non-X{/if}</td>
       <td>
         {foreach from=$xs item=x}
-        {if $promo}
+        {if $promo && strpos($x.l, '@') === false}
         <a href="profile/{$x.l}" class="popup2">{$x.n}</a>
+        {elseif $x.x}
+        <a href="{$platal->ns}member/{$x.x}">{$x.n}</a>
+        {elseif $x.n}
+        {$x.n}
         {else}
         {$x.l}
         {/if}

diff --git a/templates/listes/members.tpl b/templates/listes/members.tpl
index dc05886..c32770a 100644 (file)
--- a/templates/listes/members.tpl
+++ b/templates/listes/members.tpl
@@ -94,8 +94,10 @@
       {/if}
     </td>
     <td>
-      {if $promo}
+      {if $promo && strpos($x.l, '@') === false}
       <a href="profile/{$x.l}" class="popup2">{$x.n}</a>
+      {elseif $x.x}
+      <a href="{$platal->ns}member/{$x.x}">{$x.n}</a>
       {elseif $x.n}
       {$x.n}
       {else}
@@ -133,8 +135,10 @@
       {/if}
     </td>
     <td>
-      {if $promo}
+      {if $promo && strpos($x.l, '@') === false}
       <a href="profile/{$x.l}" class="popup2">{$x.n}</a>
+      {elseif $x.x}
+      <a href="{$platal->ns}member/{$x.x}">{$x.n}</a>
       {elseif $x.n}
       {$x.n}
       {else}