Request 1904 (accepted)

Overview

Request 1904 (accepted)

pushing changes forward (php-sabre-dav, etc)

Created by dhoffend over 7 years ago
In state accepted
Open review for Admin

Submit iRony

Submit package Kolab:Winterfell / iRony to package Kolab:16 / iRony

iRony.spec Changed

add-sabre21-path-for-debian.patch Added

debian.changelog Changed

debian.control Changed

debian.rules Changed

debian.series Changed

iRony-0.4.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php Changed

@@ -77,6 +77,19 @@
         'assistant' => 'assistant',
     );
 
+    private $phonetypes = array(
+        'main'    => 'voice',
+        'homefax' => 'home,fax',
+        'workfax' => 'work,fax',
+        'mobile'  => 'cell',
+        'other'   => 'textphone',
+    );
+
+    private $improtocols = array(
+        'jabber' => 'xmpp',
+    );
+
+
     /**
      * Read available contact folders from server
      */
@@ -111,7 +124,6 @@
         return $this->sources;
     }
 
-
     /**
      * Getter for a kolab_storage_folder representing the address book for the given ID
      *
@@ -134,7 +146,6 @@
         }
     }
 
-
     /**
      * Returns the list of addressbooks for a specific user.
      *
@@ -541,7 +552,6 @@
         return false;
     }
 
-
     /**
      * Set User-Agent string of the connected client
      */
@@ -562,7 +572,6 @@
         }
     }
 
-
     /**
      * Find an object and the containing folder by UID
      *
@@ -610,26 +619,15 @@
 
     /**********  Data conversion utilities  ***********/
 
-    private $phonetypes = array(
-        'main'    => 'voice',
-        'homefax' => 'home,fax',
-        'workfax' => 'work,fax',
-        'mobile'  => 'cell',
-        'other'   => 'textphone',
-    );
-    
-    private $improtocols = array(
-        'jabber' => 'xmpp',
-    );
-
-
     /**
      * Parse the given VCard string into a hash array kolab_format_contact can handle
      *
      * @param string VCard data block
+     * @param string Contact UID
+     *
      * @return array Hash array with contact properties or null on failure
      */
-    private function parse_vcard($cardData, $uid)
+    public function parse_vcard($cardData, $uid = null)
     {
         try {
             // use already parsed object
@@ -658,7 +656,6 @@
         return null;
     }
 
-
     /**
      * Build a valid VCard format block from the given contact record
      *
@@ -821,10 +818,8 @@
 
         if (!empty($contact['photo'])) {
             $vc->PHOTO = $contact['photo'];
-            $vc->PHOTO['ENCODING'] = 'B';
-            if ($v4) {
-                $vc->PHOTO['TYPE'] = strtoupper(substr(rcube_mime::image_content_type($contact['photo']), 6));
-            }
+            $vc->PHOTO['ENCODING'] = 'b';
+            $vc->PHOTO['TYPE'] = strtoupper(substr(rcube_mime::image_content_type($contact['photo']), 6));
         }
 
         // add custom properties
@@ -1097,7 +1092,7 @@
             // translate custom properties with a matching prefix to labelled items
             foreach ((array)$contact['x-custom'] as $prop) {
                 $name = $prop[0];
-                if (strpos($name, $propname) === 0) {
+                if ($vc->{$name} && strpos($name, $propname) === 0) {
                     $label = strtolower(substr($name, strlen($propname)+1));
                     $this->_replace_with_labelled_prop($vc, $name, $propname, $label);
                 }
@@ -1168,5 +1163,4 @@
     {
         return sprintf('"%s-%d"', substr(md5($contact['uid']), 0, 16), $contact['_msguid']);
     }
-
 }

iRony-0.4.tar.gz/test/Resource/CardDAV/vcardput/6.vcf Changed

iRony-0.4.tar.gz/test/Unit Added

iRony-0.4.tar.gz/test/Unit/CardDAV Added

iRony-0.4.tar.gz/test/Unit/CardDAV/ContactsBackend.php Added

iRony-0.4.tar.gz/test/bootstrap.php Added

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * iRony, the Kolab WebDAV/CalDAV/CardDAV Server
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2013-2016, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (php_sapi_name() != 'cli') {
+    die("Not in shell mode (php-cli)");
+}
+
+// define some environment variables used throughout the app and libraries
+define('TESTS_DIR', __DIR__ . '/');
+define('KOLAB_DAV_ROOT', realpath('../'));
+define('KOLAB_DAV_VERSION', '0.4-dev');
+define('KOLAB_DAV_START', microtime(true));
+
+define('RCUBE_INSTALL_PATH', KOLAB_DAV_ROOT . '/');
+define('RCUBE_CONFIG_DIR',   KOLAB_DAV_ROOT . '/config/');
+define('RCUBE_PLUGINS_DIR',  KOLAB_DAV_ROOT . '/lib/plugins/');
+
+// suppress error notices
+ini_set('error_reporting', E_ALL &~ E_NOTICE &~ E_STRICT);
+
+// use composer's autoloader for dependencies
+$loader = require_once(KOLAB_DAV_ROOT . '/vendor/autoload.php');
+$loader->set('Kolab', array(KOLAB_DAV_ROOT . '/lib'));  // register iRony namespace(s)
+$loader->setUseIncludePath(true);  // enable include_path to load PEAR classes from their default location
+
+// load the Roundcube framework with its autoloader
+require_once KOLAB_DAV_ROOT . '/lib/Roundcube/bootstrap.php';

iRony-0.4.tar.gz/test/phpunit.xml Added

iRony.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 1904 0

Request History

dhoffend created request over 7 years ago

pushing changes forward (php-sabre-dav, etc)

vanmeeuwen accepted review over 7 years ago

vanmeeuwen accepted request over 7 years ago

Please add a comment