X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fgoogleapps.php;h=14baa8e6df47628fa0b9ba70de1aa2459e37d2f9;hb=854aef5e1888607164f4c4a35f0ee0ad5579eb8b;hp=6eb41bae31bca555b90ad4ce7101817fc1630bfc;hpb=0089e5947ab47ba3f35f7a977884392adf3c6da5;p=platal.git

diff --git a/modules/googleapps.php b/modules/googleapps.php
index 6eb41ba..14baa8e 100644
--- a/modules/googleapps.php
+++ b/modules/googleapps.php
@@ -52,10 +52,10 @@ class GoogleAppsModule extends PLModule
 
         if ($account->active()) {
             $redirect = new Redirect(S::v('uid'));
-            $page->assign('redirect_unique', !$redirect->other_active(NULL));
+            $page->assign('redirect_unique', !$redirect->other_active('googleapps'));
 
-            $storage = new MailStorageGoogleApps(S::v('uid'));
-            $page->assign('redirect_active', $storage->active());
+            $storage = new EmailStorage(S::v('uid'), 'googleapps');
+            $page->assign('redirect_active', $storage->active);
         }
 
         // Updates the Google Apps account as required.
@@ -64,20 +64,25 @@ class GoogleAppsModule extends PLModule
                 if ($subaction == 'sync') {
                     $account->set_password_sync(true);
                     $account->set_password(S::v('password'));
-                    $page->trig("Ton mot de passe Google Apps sera dorénavant synchronisé avec ton mot de passe Polytechnique.org.");
+                    pl_redirect('googleapps#password');
                 } else if ($subaction == 'nosync') {
                     $account->set_password_sync(false);
                 } else if (Post::has('response2') && !$account->sync_password) {
-                    $account->set_password(Post::v('response2'));
+                    if (S::has_xsrf_token()) {
+                        $account->set_password(Post::v('response2'));
+                    } else {
+                        $page->trig("Le changement de ton mot de passe Google Apps a échoué, merci de réessayer.");
+                    }
                 }
             }
 
             if ($action == 'suspend' && Post::has('suspend') && $account->active()) {
-                if ($account->pending_update_suspension) {
+                if (!S::has_xsrf_token()) {
+                    $page->trig("La demande de suspension de ton compte a échouée, merci de réessayer.");
+                } else if ($account->pending_update_suspension) {
                     $page->trig("Ton compte est déjà en cours de désactivation.");
                 } else {
-                    $storage = new MailStorageGoogleApps(S::v('uid'));
-                    if ($storage->disable()) {
+                    if ($redirect->modify_one_email('googleapps', false) == SUCCESS) {
                         $account->suspend();
                         $page->trig("Ton compte Google Apps est dorénavant désactivé.");
                     } else {
@@ -102,8 +107,12 @@ class GoogleAppsModule extends PLModule
                     $password = Post::v('response2');
                 }
 
-                $account->create($password_sync, $password, $redirect_mails);
-                $page->trig("La demande de création de ton compte Google Apps a bien été enregistrée.");
+                if (S::has_xsrf_token()) {
+                    $account->create($password_sync, $password, $redirect_mails);
+                    $page->trig("La demande de création de ton compte Google Apps a bien été enregistrée.");
+                } else {
+                    $page->trig("La demande de création de ton compte Google Apps a échouée, merci de réessayer.");
+                }
             }
         }
 
@@ -181,7 +190,10 @@ class GoogleAppsModule extends PLModule
         $page->changeTpl('googleapps/admin.user.tpl');
         $page->assign('xorg_title', 'Polytechnique.org - Administration Google Apps');
         $page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid')));
-        
+
+        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();
@@ -189,7 +201,7 @@ class GoogleAppsModule extends PLModule
 
         if ($user) {
             $account = new GoogleAppsAccount($user);
-            $storage = new MailStorageGoogleApps($user);
+            $storage = new EmailStorage($user, 'googleapps');
 
             // Force synchronization of plat/al and Google Apps passwords.
             if ($action == 'forcesync' && $account->sync_password) {
@@ -201,7 +213,7 @@ class GoogleAppsModule extends PLModule
             // Displays basic account information.
             $page->assign('account', $account);
             $page->assign('admin_account', GoogleAppsAccount::is_administrator($user));
-            $page->assign('googleapps_storage', $storage->active());
+            $page->assign('googleapps_storage', $storage->active);
             $page->assign('user', $user);
 
             // Retrieves user's pending requests.