From: Stéphane Jacob <sj@m4x.org>
Date: Thu, 5 Jul 2012 21:07:08 +0000 (+0200)
Subject: Fixes display of accounts awaiting validation when there is none of them.
X-Git-Tag: xorg/1.1.6~30
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=82f1afdea040757a970bfd9e859a87981c23d4e9;p=platal.git

Fixes display of accounts awaiting validation when there is none of them.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 933d6d2..0da98ab 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -680,17 +680,19 @@ class XnetGrpModule extends PLModule
             $page->trigSuccess('Relances effectuées avec succès.');
         }
 
-        $registration_date = XDB::fetchAllAssoc('uid', 'SELECT  uid, date
-                                                          FROM  register_pending_xnet
-                                                         WHERE  uid IN {?}', $uids);
-        $last_date = XDB::fetchAllAssoc('uid', 'SELECT  uid, last_date
-                                                  FROM  register_pending_xnet
-                                                 WHERE  uid IN {?}', $uids);
+        if ($uids) {
+            $registration_date = XDB::fetchAllAssoc('uid', 'SELECT  uid, date
+                                                              FROM  register_pending_xnet
+                                                             WHERE  uid IN {?}', $uids);
+            $last_date = XDB::fetchAllAssoc('uid', 'SELECT  uid, last_date
+                                                      FROM  register_pending_xnet
+                                                     WHERE  uid IN {?}', $uids);
 
-        $users = User::getBulkUsersWithUIDs($uids);
-        $page->assign('users', $users);
-        $page->assign('registration_date', $registration_date);
-        $page->assign('last_date', $last_date);
+            $users = User::getBulkUsersWithUIDs($uids);
+            $page->assign('users', $users);
+            $page->assign('registration_date', $registration_date);
+            $page->assign('last_date', $last_date);
+        }
 
     }
 
diff --git a/templates/xnetgrp/awaiting_active.tpl b/templates/xnetgrp/awaiting_active.tpl
index a3cd289..84fa71d 100644
--- a/templates/xnetgrp/awaiting_active.tpl
+++ b/templates/xnetgrp/awaiting_active.tpl
@@ -20,7 +20,7 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if $users|@count}
+{if t($users) && $users|@count}
 <form action="{$platal->ns}directory/awact" method="post">
   {xsrf_token_field}
   <table cellspacing="2" cellpadding="0" class="tiny">