From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 4 May 2011 20:38:10 +0000 (+0200)
Subject: Allows to disable googleapps when googleapps email redirection is not currently active.
X-Git-Tag: xorg/1.1.1~29
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=71741ee039a6cc4a40b17b9a27120a55dfde7722;p=platal.git

Allows to disable googleapps when googleapps email redirection is not currently active.

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

diff --git a/modules/googleapps.php b/modules/googleapps.php
index e02c253..72519bb 100644
--- a/modules/googleapps.php
+++ b/modules/googleapps.php
@@ -83,7 +83,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->modify_one_email('googleapps', false) == SUCCESS) {
+                    if (!$redirect_active || $redirect->modify_one_email('googleapps', false) == SUCCESS) {
                         $account->suspend();
                         $page->trigSuccess("Ton compte Google Apps est dorénavant désactivé.");
                     } else {