Changeset 5752 in subversion

Timestamp:

Jan 10, 2012 4:42:06 PM (17 months ago)

Author:

thomasb

Message:

Allow plugins to extend the vcard fieldmap for contact data

File:

• trunk/roundcubemail/program/include/rcube_contacts.php (modified) (3 diffs)

trunk/roundcubemail/program/include/rcube_contacts.php

@@ -32 +32 @@
     protected $db_groups = 'contactgroups';
     protected $db_groupmembers = 'contactgroupmembers';
+    protected $vcard_fieldmap = array();
 
     /**
@@ -693 +694 @@
         if ($sql_arr['vcard']) {
             unset($sql_arr['email']);
-            $vcard = new rcube_vcard($sql_arr['vcard']);
+            $vcard = new rcube_vcard($sql_arr['vcard'], RCMAIL_CHARSET, false, $this->vcard_fieldmap);
             $record += $vcard->get_assoc() + $sql_arr;
         }
@@ -712 +713 @@
 
         // copy values into vcard object
-        $vcard = new rcube_vcard($record['vcard'] ? $record['vcard'] : $save_data['vcard']);
+        $vcard = new rcube_vcard($record['vcard'] ? $record['vcard'] : $save_data['vcard'], RCMAIL_CHARSET, false, $this->vcard_fieldmap);
         $vcard->reset();
         foreach ($save_data as $key => $values) {