Allows to disable googleapps when googleapps email redirection is not currently active.
authorStéphane Jacob <sj@m4x.org>
Wed, 4 May 2011 20:38:10 +0000 (22:38 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 4 May 2011 20:38:10 +0000 (22:38 +0200)
Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/googleapps.php

index e02c253..72519bb 100644 (file)
@@ -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 {