From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Mon, 19 May 2008 23:19:18 +0000 (+0200)
Subject: Fixes "patte cassée" page for Google Apps users.
X-Git-Tag: core/1.0.0~178^2~1
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b1797f70e5a49dbd238f16746410d3a4ed1c68ff;p=platal.git

Fixes "patte cassée" page for Google Apps users.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
---

diff --git a/modules/email.php b/modules/email.php
index b321981..0e3f170 100644
--- a/modules/email.php
+++ b/modules/email.php
@@ -527,7 +527,8 @@ L'équipe d'administration <support@" . $globals->mail->domain . '>';
             } else {
                 $page->assign('email',$email);
                 $sel = XDB::query(
-                        "SELECT  e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails,
+                        "SELECT  e1.uid, e1.panne != 0 AS panne,
+                                 (count(e2.uid) + IF(FIND_IN_SET('googleapps', u.mail_storage), 1, 0)) AS nb_mails,
                                  u.nom, u.prenom, u.promo, a.alias AS forlife
                            FROM  emails as e1
                       LEFT JOIN  emails as e2 ON(e1.uid = e2.uid