X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fgoogleapps.inc.php;h=bc1549c7a2f322263bc9e44dba02e0fbf2a14732;hb=90c614cd296ec8ead5b30e28ab7d44e9d49fcc4a;hp=45337d43d9be7d794ec56a064ef9bfc7cd329919;hpb=bb749d55509e1ea442cf67ad03975a2f4535aa90;p=platal.git

diff --git a/include/googleapps.inc.php b/include/googleapps.inc.php
index 45337d4..bc1549c 100644
--- a/include/googleapps.inc.php
+++ b/include/googleapps.inc.php
@@ -35,7 +35,7 @@ function post_queue_u_create($job) {
     $account = new GoogleAppsAccount($user);
     if ($account->activate_mail_redirection) {
         require_once('emails.inc.php');
-        $storage = new EmailStorage($user->id(), 'googleapps');
+        $storage = new EmailStorage($user, 'googleapps');
         $storage->activate();
     }
 
@@ -74,7 +74,7 @@ function post_queue_u_update($job) {
         if ($account->active()) {
             // Re-adds the email redirection (if the user did request it).
             if ($account->activate_mail_redirection) {
-                $storage = new EmailStorage($user->id, 'googleapps');
+                $storage = new EmailStorage($user, 'googleapps');
                 $storage->activate();
             }
 
@@ -101,7 +101,7 @@ function post_queue_u_update($job) {
 // TODO(vincent.zanotti): add the url of gappsd, when available.
 class GoogleAppsAccount
 {
-    // User identification: user id, and forlife.
+    // User identification: user id, and hruid.
     private $user;
     public $g_account_name;
 
@@ -336,7 +336,7 @@ class GoogleAppsAccount
 
         if (!$this->pending_update_suspension && !$this->pending_validation_unsuspend) {
             require_once('validations.inc.php');
-            $unsuspend = new GoogleAppsUnsuspendReq($this->user->id());
+            $unsuspend = new GoogleAppsUnsuspendReq($this->user);
             $unsuspend->submit();
             $this->pending_validation_unsuspend = true;
         }