Merge updates: education.

[platal.git] / modules / googleapps.php

diff --git a/modules/googleapps.php b/modules/googleapps.php
index 72519bb..bad3836 100644 (file)
--- a/modules/googleapps.php
+++ b/modules/googleapps.php
@@ -29,10 +29,10 @@ class GoogleAppsModule extends PLModule
         }
 
         return array(
-            'googleapps'            => $this->make_hook('index',      AUTH_MDP, 'gapps'),
-            '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'),
+            'googleapps'            => $this->make_hook('index',      AUTH_PASSWD, 'gapps'),
+            'admin/googleapps'      => $this->make_hook('admin',      AUTH_PASSWD, 'admin'),
+            'admin/googleapps/job'  => $this->make_hook('admin_job',  AUTH_PASSWD, 'admin'),
+            'admin/googleapps/user' => $this->make_hook('admin_user', AUTH_PASSWD, 'admin'),
         );
     }
 
@@ -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 {