Merge branch 'platal-0.10.0'

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

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index 844d45f..59eb6f5 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   *
@@ -111,24 +111,26 @@ class VCard extends PlVCard
         }
 
         // Pro
-        foreach ($user['adr_pro'] as $pro) {
-            $street = array($adr['adr1']);
-            if (!empty($pro['adr2'])) {
-                $street[] = $pro['adr2'];
-            }
-            if (!empty($pro['adr3'])) {
-                $street[] = $pro['adr3'];
-            }
-            $group = $entry->addWork($pro['entreprise'], null, $pro['poste'], $pro['fonction'],
-                                     $street, null, null, $pro['postcode'], $pro['city'], $pro['region'], @$pro['country']);
-            if (!empty($pro['tel'])) {
-                $entry->addTel($group, $pro['tel']);
-            }
-            if (!empty($pro['fax'])) {
-                $entry->addTel($group, $pro['fax'], true);
-            }
-            if (!empty($pro['email'])) {
-                $entry->addMail($group, $pro['email']);
+        if (!empty($user['adr_pro'])) {
+            foreach ($user['adr_pro'] as $pro) {
+                $street = array($pro['adr1']);
+                if (!empty($pro['adr2'])) {
+                    $street[] = $pro['adr2'];
+                }
+                if (!empty($pro['adr3'])) {
+                    $street[] = $pro['adr3'];
+                }
+                $group = $entry->addWork($pro['entreprise'], null, $pro['poste'], $pro['fonction'],
+                                         $street, null, null, $pro['postcode'], $pro['city'], $pro['region'], @$pro['country']);
+                if (!empty($pro['tel'])) {
+                    $entry->addTel($group, $pro['tel']);
+                }
+                if (!empty($pro['fax'])) {
+                    $entry->addTel($group, $pro['fax'], true);
+                }
+                if (!empty($pro['email'])) {
+                    $entry->addMail($group, $pro['email']);
+                }
             }
         }
 
@@ -163,7 +165,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));