Implements the first API handler (/api/1/user/<user>/isRegistered). It

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

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index 16f1046..18364ba 100644 (file)
--- a/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@ -96,10 +96,10 @@ class VCard extends PlVCard
                                 $adr->hasFlag('current'), $adr->hasFlag('mail'), $adr->hasFlag('mail'));
             }
             foreach ($adr->phones() as $phone) {
-                if ($phone->type == Phone::TYPE_FIXED) {
+                if ($phone->linkType() == Phone::TYPE_FIXED) {
                     $entry->addTel($group, $phone->display, false, true, true, false, false,
                                    $adr->hasFlag('current') && empty($pf->mobile));
-                } else if ($phone->type == Phone::TYPE_FAX) {
+                } else if ($phone->linkType() == Phone::TYPE_FAX) {
                     $entry->addTel($group, $phone->display, true, false, false, false, false, false);
                 }
             }
@@ -119,9 +119,9 @@ class VCard extends PlVCard
                                          $adr->locality, $adr->administrativeArea, $adr->country);
             }
             foreach ($adr->phones() as $phone) {
-                if ($phone->type == Phone::TYPE_FIXED) {
+                if ($phone->linkType() == Phone::TYPE_FIXED) {
                     $entry->addTel($group, $phone->display);
-                } else if ($phone->type == Phone::TYPE_FAX) {
+                } else if ($phone->linkType() == Phone::TYPE_FAX) {
                     $entry->addTel($group, $phone->display, true);
                 }
             }
@@ -137,7 +137,7 @@ class VCard extends PlVCard
 
         // Custom fields
         if (!is_null($user)) {
-            $groups = $user->groups();
+            $groups = $user->groups(true, true);
             if (count($groups)) {
                 $gn = DirEnum::getOptions(DirEnum::GROUPESX);
                 $gns = array();
@@ -159,8 +159,7 @@ class VCard extends PlVCard
             $entry->set('X-BINETS', join(', ', $bns));
         }
         if (!empty($pf->section)) {
-            $sections = DirEnum::getOptions(DirEnum::SECTIONS);
-            $entry->set('X-SECTION', $sections[$pf->section]);
+            $entry->set('X-SECTION', $pf->section);
         }
 
         // Photo