From d29638053fdb5ef1df2ff1fa0a2fff99169682b3 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Fri, 5 Nov 2004 13:41:31 +0000
Subject: [PATCH] bugfixes

---
 include/notifs.inc.php      | 10 +++++-----
 templates/carnet/notifs.tpl | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index 5f11e0e..9f98284 100644
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: notifs.inc.php,v 1.2 2004-11-04 20:19:36 x2000habouzit Exp $
+        $Id: notifs.inc.php,v 1.3 2004-11-05 13:41:31 x2000habouzit Exp $
  ***************************************************************************/
 
 require_once('diogenes.flagset.inc.php');
@@ -49,10 +49,10 @@ class Notifs {
 	$this->flags = new FlagSet($flags);
 	
 	$res = $globals->db->query("SELECT  type,arg,prenom,nom,promo
-				      FROM  watch
-				INNER JOIN  auth_user_md5 USING(user_id)
-				     WHERE  watch.user_id = '$uid'
-				  ORDER BY  arg");
+				      FROM  watch         AS w
+				 LEFT JOIN  auth_user_md5 AS u ON(u.user_id = w.arg)
+				     WHERE  w.user_id = '$uid'
+				  ORDER BY  promo,nom,arg");
 	while(list($type, $arg, $prenom, $nom, $promo) = mysql_fetch_row($res)) {
 	    if($type=='promo') {
 		$this->promos[$arg] = $arg;
diff --git a/templates/carnet/notifs.tpl b/templates/carnet/notifs.tpl
index e26acd6..cfd00f6 100644
--- a/templates/carnet/notifs.tpl
+++ b/templates/carnet/notifs.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: notifs.tpl,v 1.4 2004-11-04 19:57:46 x2000habouzit Exp $
+        $Id: notifs.tpl,v 1.5 2004-11-05 13:41:31 x2000habouzit Exp $
  ***************************************************************************}
 
 {dynamic}
@@ -96,13 +96,13 @@ Si un non-inscrit que tu surveille s'inscrit, il sera automatiquement ajout
 <table class='tinybicol' cellpadding="0" cellspacing="0">
   <tr>
     <td>
-      {if !$nonins|@count}
+      {if $notifs->nonins|@count eq 0}
       <p>Tu ne surveilles actuellement aucun non-inscrit.</p>
-      {elseif $promos|@count}
-      <p>Tu surveilles {if $promos|@count eq 1}le non-inscrit{else}les non-inscrits{/if} :</p>
+      {elseif $notifs->nonins|@count}
+      <p>Tu surveilles {if $notifs->nonins|@count eq 1}le non-inscrit{else}les non-inscrits{/if} :</p>
       <ul>
-        {foreach from=$nonins item=p}
-        <li>{$p}</li>
+        {foreach from=$notifs->nonins item=p}
+        <li>{$p.prenom} {$p.nom} ({$p.promo})</li>
         {/foreach}
       </ul>
       {/if}
-- 
2.1.4