Merge branch 'platal-0.9.17'

[platal.git] / classes / xorgsession.php

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index 7cbaec4..7c76433 100644 (file)
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -188,11 +188,12 @@ class XorgSession extends PlSession
                                     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();
         $perms = $sess['perms'];