From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 27 Jun 2011 12:04:45 +0000 (+0200)
Subject: Fixes google apps suspension.
X-Git-Tag: xorg/1.1.2~2
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=be1a47bf9f2dae8406c496e2271e6027ddff2eab;p=platal.git

Fixes google apps suspension.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/modules/googleapps.php b/modules/googleapps.php
index 72519bb..b4900b9 100644
--- a/modules/googleapps.php
+++ b/modules/googleapps.php
@@ -49,11 +49,13 @@ class GoogleAppsModule extends PLModule
         // Fills up the 'is Google Apps redirection active' variable.
         $redirect_active = false;
         $redirect_unique = true;
+        $gapps_email = '';
 
         if ($account->active()) {
             $redirect = new Redirect($user);
             foreach ($redirect->emails as $email) {
                 if ($email->type == 'googleapps') {
+                    $gapps_email = $email->email;
                     $redirect_active = $email->active;
                     $redirect_unique = !$redirect->other_active($email->email);
                 }
@@ -83,7 +85,7 @@ class GoogleAppsModule extends PLModule
                 if ($account->pending_update_suspension) {
                     $page->trigWarning("Ton compte est déjà en cours de désactivation.");
                 } else {
-                    if (!$redirect_active || $redirect->modify_one_email('googleapps', false) == SUCCESS) {
+                    if (!$redirect_active || $redirect->modify_one_email($gapps_email, false) == SUCCESS) {
                         $account->suspend();
                         $page->trigSuccess("Ton compte Google Apps est dorénavant désactivé.");
                     } else {