[packaging] Branch 'ucs/3.1/kolab-2.3' - 2 commits - debian/changelog debian/patches

Christoph Wickert wickert at kolabsys.com
Fri Oct 24 18:19:14 CEST 2014


 debian/changelog                                                               |    6 +
 debian/patches/0001-Fix-import-of-vcard-contacts-array-string-conversion.patch |   49 ++++++++++
 debian/patches/series                                                          |    1 
 3 files changed, 56 insertions(+)

New commits:
commit 103fd589710425eb8a20008a253cab268a020b31
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Oct 24 17:46:00 2014 +0200

    3.0~horde-20130418git60ff6713-12: Update changelog

diff --git a/debian/changelog b/debian/changelog
index fc027ee..2615717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+roundcube-plugins-kolab (3.0~horde-20130418git60ff6713-12) unstable; urgency=low
+
+  * Fix import of vcard contacts (array -> string conversion) as  reposted in OTRS #1007441 + export photos
+
+ -- Christoph Wickert <wickert at kolabsys.com>  Fri, 24 Oct 2014 17:45:09 +0200
+
 roundcube-plugins-kolab (3.0~horde-20130418git60ff6713-11) unstable; urgency=low
 
   * Force setting internal object type to prevent type overwrite when


commit 5fb4c6758b88d3228366c0cae77ef232e339d6e7
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Oct 24 17:44:42 2014 +0200

    Fix import of vcard contacts (array -> string conversion) as
     reposted in OTRS #1007441 + export photos

diff --git a/debian/patches/0001-Fix-import-of-vcard-contacts-array-string-conversion.patch b/debian/patches/0001-Fix-import-of-vcard-contacts-array-string-conversion.patch
new file mode 100644
index 0000000..03ef3e5
--- /dev/null
+++ b/debian/patches/0001-Fix-import-of-vcard-contacts-array-string-conversion.patch
@@ -0,0 +1,49 @@
+From 3639055e92674942795f6780eef4d4242d83ee19 Mon Sep 17 00:00:00 2001
+From: Thomas Bruederli <bruederli at kolabsys.com>
+Date: Thu, 23 Oct 2014 16:21:49 +0200
+Subject: [PATCH] Fix import of vcard contacts (array -> string conversion) as
+ reposted in OTRS #1007441 + export photos
+
+---
+ plugins/kolab_addressbook/lib/rcube_kolab_contacts.php |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+index 16a8811..17a29a5 100644
+--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
++++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+@@ -65,7 +65,7 @@ class rcube_kolab_contacts extends rcube_addressbook
+                                 'label' => 'kolab_addressbook.pgppublickey'),
+       'pkcs7publickey' => array('type' => 'textarea', 'size' => 70, 'rows' => 10, 'limit' => 1,
+                                 'label' => 'kolab_addressbook.pkcs7publickey'),
+-      'notes'        => array(),
++      'notes'        => array('limit' => 1),
+       'photo'        => array(),
+       // TODO: define more Kolab-specific fields such as: language, latitude, longitude, crypto settings
+     );
+@@ -1086,7 +1086,7 @@ class rcube_kolab_contacts extends rcube_addressbook
+         // photo is stored as separate attachment
+         if ($record['photo'] && strlen($record['photo']) < 255 && ($att = $record['_attachments'][$record['photo']])) {
+             // only fetch photo content if requested
+-            if ($this->action == 'photo')
++            if ($this->action == 'photo' || $this->action == 'export')
+                 $record['photo'] = $att['content'] ? $att['content'] : $this->storagefolder->get_attachment($record['uid'], $att['id']);
+         }
+ 
+@@ -1158,6 +1158,13 @@ class rcube_kolab_contacts extends rcube_addressbook
+             unset($contact['address:'.$type]);
+         }
+ 
++        // convert array values into single strings (OTRS #1007441)
++        foreach ($this->coltypes as $col => $props) {
++            if ($props['limit'] === 1 && is_array($contact[$col])) {
++                $contact[$col] = $contact[$col][0];
++            }
++        }
++
+         $contact['website'] = $websites;
+         $contact['phone']   = $phones;
+         $contact['address'] = $addresses;
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 6f923ef..dfc94aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ kolab_addressbook-treelist.diff
 update-kolab_auth.patch
 0001-Convert-array-values-from-vcard-import-into-string-O.patch
 0001-Force-setting-internal-object-type-to-prevent-type-o.patch
+0001-Fix-import-of-vcard-contacts-array-string-conversion.patch




More information about the packaging-commits mailing list