Save answers.

[platal.git] / include / googleapps.inc.php

diff --git a/include/googleapps.inc.php b/include/googleapps.inc.php
index f551380..f4cc69c 100644 (file)
--- a/include/googleapps.inc.php
+++ b/include/googleapps.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -193,7 +193,6 @@ class GoogleAppsAccount
     // validation queue.
     private function load_pending_validations()
     {
-        require_once('validations.inc.php');
         $this->pending_validation_unsuspend =
             Validate::get_typed_requests_count($this->user->id(), 'gapps-unsuspend');
     }
@@ -341,7 +340,6 @@ class GoogleAppsAccount
         }
 
         if (!$this->pending_update_suspension && !$this->pending_validation_unsuspend) {
-            require_once('validations.inc.php');
             $unsuspend = new GoogleAppsUnsuspendReq($this->user);
             $unsuspend->submit();
             $this->pending_validation_unsuspend = true;
@@ -376,13 +374,12 @@ class GoogleAppsAccount
 
         if (!$this->pending_create) {
             // Retrieves information on the new account.
-            // TODO: retreive first_name and last_name from the profile.
-            if (!$user->hasProfile()) {
-                $prenom = $user->displayName();
-                $nom    = $user->fullName();
+            if (!$this->user->hasProfile()) {
+                $prenom = $this->user->displayName();
+                $nom    = $this->user->fullName();
             } else {
-                $prenom = $user->profile()->firstName();
-                $nom    = $user->profile()->lastName();
+                $prenom = $this->user->profile()->firstName();
+                $nom    = $this->user->profile()->lastName();
             }
 
             // Adds an 'unprovisioned' entry in the gapps_accounts table.