Google Apps code polishing.

[platal.git] / modules / admin.php

diff --git a/modules/admin.php b/modules/admin.php
index 92a2107..c122a7f 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -587,7 +587,7 @@ class AdminModule extends PLModule
                         if ($globals->mailstorage->googleapps_domain && Env::v('newpass_clair') != "********") {
                             require_once 'googleapps.inc.php';
                             $account = new GoogleAppsAccount($mr['user_id'], $mr['forlife']);
-                            if ($account->g_status == 'active' && $account->sync_password) {
+                            if ($account->active() && $account->sync_password) {
                                 $account->set_password($pass_encrypted);
                             }
                         }
@@ -841,11 +841,12 @@ class AdminModule extends PLModule
         $page->assign('xorg_title','Polytechnique.org - Administration - Décédés');
 
         $res = XDB::iterator(
-                "SELECT  u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, a.alias,
-                         DATEDIFF(NOW(), u.deces) AS days
+                "SELECT  u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, a.alias, DATE(MAX(s.start)) AS last
                    FROM  auth_user_md5 AS u
               LEFT JOIN  aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie')
+              LEFT JOIN  logger.sessions AS s ON (s.uid = u.user_id AND suid = 0)
                   WHERE  perms IN ('admin', 'user') AND deces <> 0
+               GROUP BY  u.user_id
                ORDER BY  u.promo, u.nom");
         $page->assign('dead', $res);
     }