X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvcard.inc.php;h=b62d09f43a33e1bd44d18f579a849d687ecb3bcb;hb=f2c150a0b20f222ddadabe7c0a307b60cec86a54;hp=0fc553ef539e7648a8b8f055f93bea0e2ffc9c38;hpb=5d42c993d85a2f1fa3595eb1591a921c0f89d8cd;p=platal.git

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index 0fc553e..b62d09f 100644
--- a/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@ -37,9 +37,9 @@ class VCard extends PlVCard
 
     public function addUser($user)
     {
-        $forlife = get_user_forlife($user, '_silent_user_callback');
-        if ($forlife) {
-            $this->user_list[] = get_user_forlife($user);
+        $user = User::getSilent($user);
+        if ($user) {
+            $this->user_list[] = $user;
             $this->count++;
         }
     }
@@ -52,14 +52,14 @@ class VCard extends PlVCard
 
     protected function fetch()
     {
-        return new PlArrayIterator($this->user_list);
+        return PlIteratorUtils::fromArray($this->user_list);
     }
 
     protected function buildEntry($entry)
     {
         global $globals;
         $login = $entry['value'];
-        $user  = get_user_details($login);
+        $user  = get_user_details($login->login());
 
         if (empty($user['nom_usage'])) {
             $entry = new PlVCardEntry($user['prenom'], $user['nom'], null, null, @$user['nickname']);
@@ -83,6 +83,7 @@ class VCard extends PlVCard
         }
 
         // Emails
+        // TODO: this logic is not hruid-compatible; replace it.
         $entry->addMail(null, $user['bestalias'] . '@' . $globals->mail->domain, true);
         $entry->addMail(null, $user['bestalias'] . '@' . $globals->mail->domain2);
         if ($user['bestalias'] != $user['forlife']) {
@@ -160,10 +161,9 @@ class VCard extends PlVCard
         // Photo
         if ($this->photos) {
             $res = XDB::query(
-                    "SELECT attach, attachmime
-                       FROM photo   AS p
-                 INNER JOIN aliases AS a ON (a.id = p.uid AND a.type = 'a_vie')
-                      WHERE a.alias = {?}", $login);
+                    "SELECT  attach, attachmime
+                       FROM  photo AS p
+                      WHERE  p.uid = {?}", $login->id());
             if ($res->numRows()) {
                 list($data, $type) = $res->fetchOneRow();
                 $entry->setPhoto($data, strtoupper($type));