Adds verification for 'Prénom' and 'Nom patronymique' so that they remain close enoug...

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

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index d16dae6..a755fcd 100644 (file)
--- a/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -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']) {
@@ -162,7 +163,7 @@ class VCard extends PlVCard
             $res = XDB::query(
                     "SELECT  attach, attachmime
                        FROM  photo AS p
-                      WHERE  u.user_id = {?}", $login->id());
+                      WHERE  p.uid = {?}", $login->id());
             if ($res->numRows()) {
                 list($data, $type) = $res->fetchOneRow();
                 $entry->setPhoto($data, strtoupper($type));