Merge commit 'origin/fusionax' into account

Conflicts:

	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --combined include/vcard.inc.php
index 1b67aee,dfdadaa..ddbc4dd
--- 1/include/vcard.inc.php
--- 2/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@@ -37,7 -37,7 +37,7 @@@ class VCard extends PlVCar
  
      public function addUser($user)
      {
 -        $user = User::getSilent($user);
 +        $user = Profile::get($user);
          if ($user) {
              $this->user_list[] = $user;
              $this->count++;
@@@ -59,7 -59,7 +59,7 @@@
      {
          global $globals;
          $login = $entry['value'];
 -        $user  = get_user_details($login->login());
 +        $user  = get_user_details($login->hrid());
  
          if (empty($user['nom_usage'])) {
              $entry = new PlVCardEntry($user['prenom'], $user['nom'], null, null, @$user['nickname']);
@@@ -111,32 -111,34 +111,34 @@@
          }
  
          // 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($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']);
+                 }
              }
          }
  
          // Melix
          $res = XDB::query(
                  "SELECT alias
 -                   FROM virtual
 -             INNER JOIN virtual_redirect USING(vid)
 +                   FROM virtual AS v
 +             INNER JOIN virtual_redirect AS vr ON (v.vid = vr.vid)
               INNER JOIN auth_user_quick  ON ( user_id = {?} AND emails_alias_pub = 'public' )
                    WHERE ( redirect={?} OR redirect={?} )
                          AND alias LIKE '%@{$globals->mail->alias_dom}'",