From ef057f1ab0138f1b354bdd12a2089e4321a16f70 Mon Sep 17 00:00:00 2001
From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Mon, 30 Jun 2008 22:36:13 +0200
Subject: [PATCH] Adds a link to the Google Apps emails directly in the
 "Service" menu (Closes #851).

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
---
 include/xorg/session.inc.php   | 3 ++-
 templates/skin/common.menu.tpl | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php
index 34581a1..9ce9c2f 100644
--- a/include/xorg/session.inc.php
+++ b/include/xorg/session.inc.php
@@ -243,11 +243,12 @@ function start_connexion ($uid, $identified)
                 matricule, password, FIND_IN_SET('femme', u.flags) AS femme,
                 a.alias AS forlife, a2.alias AS bestalias,
                 q.core_mail_fmt AS mail_fmt, UNIX_TIMESTAMP(q.banana_last) AS banana_last, q.watch_last, q.core_rss_hash,
-                FIND_IN_SET('watch', u.flags) AS watch_account, q.last_version
+                FIND_IN_SET('watch', u.flags) AS watch_account, q.last_version, g.g_account_name IS NOT NULL AS googleapps
           FROM  auth_user_md5   AS u
     INNER JOIN  auth_user_quick AS q  USING(user_id)
     INNER JOIN  aliases         AS a  ON (u.user_id = a.id AND a.type='a_vie')
     INNER JOIN  aliases         AS a2 ON (u.user_id = a2.id AND FIND_IN_SET('bestalias',a2.flags))
+     LEFT JOIN  gapps_accounts  AS g  ON (u.user_id = g.l_userid AND g.g_status = 'active')
          WHERE  u.user_id = {?} AND u.perms IN('admin','user')", $uid);
     $sess = $res->fetchOneAssoc();
     $res = XDB::query("SELECT  UNIX_TIMESTAMP(s.start) AS lastlogin, s.host
diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl
index c26852e..f93a58e 100644
--- a/templates/skin/common.menu.tpl
+++ b/templates/skin/common.menu.tpl
@@ -55,6 +55,9 @@
 <div class="menu_title">Services</div>
 <div class="menu_item"><a href="emails/send">Envoyer un mail</a></div>
 <div class="menu_item"><a href="banana/">Forums &amp; PA</a></div>
+{if $smarty.session.googleapps}
+<div class="menu_item"><a href="http://gmail.polytechnique.org/">Mails Google Apps</a></div>
+{/if}
 <div class="menu_item"><a href="lists">Listes de diffusion</a></div>
 <div class="menu_item"><a href="payment">Télépaiements</a></div>
 <div class="menu_item"><a href="emails/antispam/submit">Soumettre un spam</a></div>
-- 
2.1.4