Fix address parasitic indentation in vcards

[platal.git] / modules / profile.php

diff --git a/modules/profile.php b/modules/profile.php
index 9f603ee..6e8479f 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -582,7 +582,7 @@ class ProfileModule extends PLModule
 
         require_once 'validations.inc.php';
         require_once 'xorg.misc.inc.php';
-        require_once 'diogenes/diogenes.flagset.inc.php';
+        require_once dirname(__FILE__).'/../classes/Flagset.php';
 
         $res = XDB::query(
                 "SELECT  u.nom, u.nom_usage, u.flags, e.alias
@@ -646,10 +646,11 @@ class ProfileModule extends PLModule
     {
         // $adr1, $adr2, $adr3, $postcode, $city, $region, $country
         extract($params['adr']);
-        $adr = $adr1;
+        $adr = trim($adr1);
         $adr = trim("$adr\n$adr2");
         $adr = trim("$adr\n$adr3");
-        return quoted_printable_encode(";;$adr;$city;$region;$postcode;$country");
+        $adr = explode("\n", quoted_printable_encode(";;$adr;$city;$region;$postcode;$country"));
+        return implode("\n", array_map('trim', $adr));
     }
 
     function handler_vcard(&$page, $x = null)