X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fgoogleapps.php;h=246396626c9bea97ecb65e76c63b226da85e35fc;hb=06f4daf9ceb56712582d81330896848a1a262894;hp=553aeafdee829081f8109e55865c37efe5197a36;hpb=301e3543efce642475e428cfab02a8a38b4ed3f8;p=platal.git

diff --git a/modules/googleapps.php b/modules/googleapps.php
index 553aeaf..2463966 100644
--- a/modules/googleapps.php
+++ b/modules/googleapps.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -29,14 +29,14 @@ class GoogleAppsModule extends PLModule
         }
 
         return array(
-            'googleapps'            => $this->make_hook('index', AUTH_MDP),
-            'admin/googleapps'      => $this->make_hook('admin', AUTH_MDP. 'admin'),
-            'admin/googleapps/job'  => $this->make_hook('admin_job', AUTH_MDP, 'admin'),
+            'googleapps'            => $this->make_hook('index',      AUTH_MDP),
+            'admin/googleapps'      => $this->make_hook('admin',      AUTH_MDP, 'admin'),
+            'admin/googleapps/job'  => $this->make_hook('admin_job',  AUTH_MDP, 'admin'),
             'admin/googleapps/user' => $this->make_hook('admin_user', AUTH_MDP, 'admin'),
         );
     }
 
-    function handler_index(&$page, $action = null, $subaction = null)
+    function handler_index(&$page, $action = null)
     {
         require_once("emails.inc.php");
         require_once("googleapps.inc.php");
@@ -44,33 +44,34 @@ class GoogleAppsModule extends PLModule
         $page->addJsLink('motdepasse.js');
         $page->setTitle('Compte Google Apps');
 
-        $account = new GoogleAppsAccount(S::v('uid'), S::v('forlife'));
+        $user = S::user();
+        $account = new GoogleAppsAccount($user);
 
         // Fills up the 'is Google Apps redirection active' variable.
         $page->assign('redirect_active', false);
         $page->assign('redirect_unique', true);
 
         if ($account->active()) {
-            $redirect = new Redirect(S::v('uid'));
+            $redirect = new Redirect($user);
             $page->assign('redirect_unique', !$redirect->other_active('googleapps'));
 
-            $storage = new EmailStorage(S::v('uid'), 'googleapps');
+            $storage = new EmailStorage($user, 'googleapps');
             $page->assign('redirect_active', $storage->active);
         }
 
         // Updates the Google Apps account as required.
         if ($action) {
-            if ($action == 'password') {
-                if ($subaction == 'sync') {
+            if ($action == 'password' && Post::has('pwsync')) {
+                S::assert_xsrf_token();
+                if (Post::v('pwsync') == 'sync') {
                     $account->set_password_sync(true);
                     $account->set_password(S::v('password'));
-                    pl_redirect('googleapps#password');
-                } else if ($subaction == 'nosync') {
+                } else {
                     $account->set_password_sync(false);
-                } else if (Post::has('response2') && !$account->sync_password) {
-                    S::assert_xsrf_token();
-                    $account->set_password(Post::v('response2'));
                 }
+            } elseif ($action == 'password' && Post::has('response2') && !$account->sync_password) {
+                S::assert_xsrf_token();
+                $account->set_password(Post::v('response2'));
             }
 
             if ($action == 'suspend' && Post::has('suspend') && $account->active()) {
@@ -179,7 +180,7 @@ class GoogleAppsModule extends PLModule
         }
     }
 
-    function handler_admin_user(&$page, $user = null, $action = null) {
+    function handler_admin_user(&$page, $user = null) {
         require_once("emails.inc.php");
         require_once("googleapps.inc.php");
         $page->changeTpl('googleapps/admin.user.tpl');
@@ -189,34 +190,43 @@ class GoogleAppsModule extends PLModule
         if (!$user && Post::has('login')) {
             $user = Post::v('login');
         }
-        if ($user && !is_numeric($user)) {
-            $res = XDB::query("SELECT id FROM aliases WHERE alias = {?} AND type != 'homonyme'", $user);
-            $user = $res->fetchOneCell();
-        }
+        $user = User::get($user);
 
         if ($user) {
             $account = new GoogleAppsAccount($user);
             $storage = new EmailStorage($user, 'googleapps');
 
-            // Force synchronization of plat/al and Google Apps passwords.
-            if ($action == 'forcesync' && $account->sync_password) {
-                $res = XDB::query("SELECT password FROM auth_user_md5 WHERE user_id = {?}", $user);
-                $account->set_password($res->fetchOneCell());
-                $page->trigSuccess('Le mot de passe a été synchronisé.');
+            // Apply requested actions.
+            if (Post::has('suspend') && $account->active() && !$account->pending_update_suspension) {
+                S::assert_xsrf_token();
+                $account->suspend();
+                $page->trigSuccess('Le compte est en cours de suspension.');
+            } else if (Post::has('unsuspend') && $account->suspended() && !$account->pending_update_suspension) {
+                S::assert_xsrf_token();
+                $account->do_unsuspend();
+                $page->trigSuccess('Le compte est en cours de réactivation.');
+            } else if (Post::has('forcesync') && $account->active() && $account->sync_password) {
+                $account->set_password($user->password());
+                $page->trigSuccess('Le mot de passe est en cours de synchronisation.');
+            } else if (Post::has('sync') && $account->active()) {
+                $account->set_password($user->password());
+                $account->set_password_sync(true);
+            } else if (Post::has('nosync') && $account->active()) {
+                $account->set_password_sync(false);
             }
 
             // Displays basic account information.
             $page->assign('account', $account);
-            $page->assign('admin_account', GoogleAppsAccount::is_administrator($user));
+            $page->assign('admin_account', GoogleAppsAccount::is_administrator($user->id()));
             $page->assign('googleapps_storage', $storage->active);
-            $page->assign('user', $user);
+            $page->assign('user', $user->id());
 
             // Retrieves user's pending requests.
             $res = XDB::iterator(
                 "SELECT  q_id, q_recipient_id, p_status, j_type, UNIX_TIMESTAMP(p_entry_date) AS p_entry_date
                    FROM  gapps_queue
                   WHERE  q_recipient_id = {?}
-               ORDER BY  p_entry_date DESC", $user);
+               ORDER BY  p_entry_date DESC", $user->id());
             $page->assign('requests', $res);
         }
     }