Request 1900 (superseded)

iRony.spec Changed

@@ -23,39 +23,33 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
-%if 0%{?plesk}
-%global httpd_group roundcube_sysgroup
-%global httpd_name httpd
-%global httpd_user roundcube_sysuser
-%else
 %global httpd_group apache
 %global httpd_name httpd
 %global httpd_user apache
 %endif
-%endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
-%global upstream_version 0.4.8
 
 Name:           iRony
-Version: 0.4.8.5
-Release:	    1%{?dist}
+Version: 0.4
+Release:	    0.20160321.git%{?dist}
 Summary:        DAV for Kolab Groupware
 
 Group:          Applications/Internet
 License:        AGPLv3+
 URL:            http://kolab.org
 
-# From 7ebe1adc8b7c0f818d837d682b2b85202aac9303
-Source0:        iRony-%{upstream_version}.tar.gz
+# From f7e4e0e36b62f10d2570d6fccef686c3e1c43af0
+Source0:        iRony-0.4.tar.gz
 Source1:        iRony.conf
 Source2:        iRony.logrotate
 
 BuildArch:      noarch
 
-Requires:       chwala >= 0.5.2
-Requires:       roundcubemail(core) >= 1.5
-
+Requires:       roundcubemail(core) >= 1.1
+Requires:       roundcubemail-plugin-kolab_auth >= 3.3
+Requires:       roundcubemail-plugin-kolab_folders >= 3.3
+Requires:       roundcubemail-plugin-libkolab >= 3.3
 %if 0%{?suse_version}
 Requires:       http_daemon
 %else
@@ -65,44 +59,52 @@
 # Build requirements needed of *SUSE, which otherwise bails over
 # dead-end symbolic links and/or files and directories not owned
 # by any package.
-BuildRequires:  chwala >= 0.5.2
-
-BuildRequires:  roundcubemail(core) >= 1.5
+BuildRequires:  chwala
+BuildRequires:  composer
+BuildRequires:  roundcubemail
+BuildRequires:  roundcubemail-plugins-kolab
+BuildRequires:  php-sabre-dav >= 2.1.3
+BuildRequires:  php-sabre-vobject >= 3.2.4
+
+Requires:       php-sabre-dav >= 2.1.3
+Requires:       php-sabre-vobject >= 3.2.4
+
+%if 0%{?fedora} >= 21
+# Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
+BuildRequires: qca
+%endif
 
 %description
 iRony is the CardDAV, CalDAV and WebDAV storage access provider for the
 Kolab Groupware solution.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q
 
 %build
+rm -rf composer.json
+mv composer.json-dist composer.json
+mkdir -p $HOME/.composer/
+echo '{}' > $HOME/.composer/composer.json
+composer -vvv dumpautoload --optimize
 
 %install
 mkdir -p \
-%if 0%{?plesk} < 1
     %{buildroot}/%{_ap_sysconfdir}/conf.d \
-%endif
     %{buildroot}/%{_sysconfdir}/%{name} \
     %{buildroot}/%{_datadir}/%{name} \
     %{buildroot}/%{_localstatedir}/cache/%{name} \
     %{buildroot}/%{_localstatedir}/lib/%{name} \
     %{buildroot}/%{_localstatedir}/log/%{name}
 
-%if 0%{?plesk} < 1
 install -pm 644 %{SOURCE1} %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf
-%endif
 
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/iRony
 
-sed -i \
-    -e 's/apache apache/%{httpd_user} %{httpd_group}/g' \
-    %{buildroot}%{_sysconfdir}/logrotate.d/iRony
-
 mkdir %{buildroot}/usr/share/%{name}/lib
 
-cp -a public_html %{buildroot}/usr/share/%{name}
+cp -a public_html vendor %{buildroot}/usr/share/%{name}
 cp -a lib/Kolab %{buildroot}/usr/share/%{name}/lib/
 
 pushd %{buildroot}/%{_datadir}/%{name}
@@ -117,8 +119,6 @@
 ln -s ../../../..%{_sysconfdir}/roundcubemail/config.inc.php
 popd
 
-ln -s ../roundcubemail/vendor vendor
-
 rm -rf lib/Roundcube
 pushd lib/
 ln -s ../../chwala/lib FileAPI
@@ -130,81 +130,25 @@
 
 install -pm 640 config/dav.inc.php.sample %{buildroot}/%{_sysconfdir}/%{name}/dav.inc.php
 
-%pretrans
-# upgrade path for `vendor` directory -> symlink change. It's a vendor directory, so we don't do the rpmmoved dance.
-if  -d "/usr/share/iRony/vendor" -a ! -L "/usr/share/iRony/vendor" ; then
-    rm -rf /usr/share/iRony/vendor
-fi
-
-
 %post
 if  -f "/etc/php.d/apc.ini" -o -f "%{php_inidir}/apcu.ini" ; then
-    if  ! -z "`grep ^apc.enabled=1 /etc/php.d/apc{,u}.ini 2>/dev/null`" ; then
+    if  ! -z "`grep ^apc.enabled=1 /etc/php.d/apc{,u}.ini`" ; then
         /sbin/service httpd condrestart
     fi
 fi
 
 %files
 %doc README.md
-%if 0%{?plesk} < 1
-%config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
-%endif
-%attr(0755,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
-%attr(0644,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/dav.inc.php
+%{_ap_sysconfdir}/conf.d/%{name}.conf
+%attr(0750,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/dav.inc.php
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-
 %{_datadir}/%{name}
-
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/cache/%{name}
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/lib/%{name}
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
-* Mon Dec 19 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 0.4.6-3
-- Updated tarball
-
-* Sat Feb 12 2022 Christoph Erhardt <kolab@sicherha.de> - 0.4.6-2
-- Fix transaction error on upgrade
-
-* Sat Dec 25 2021 Christian Mollekopf <mollekopf@kolabsys.com> - 0.4.5-2
-- Fixed configuration directory permissions
-- Link to roundcubemail vendor directory in ootpa
-
-* Mon Oct 19 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.5-1
-- Release of version 0.4.5
-
-* Fri Oct 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.4-1
-- Release of version 0.4.4
-
-* Thu Jan 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.3-1
-- Release of version 0.4.3
-
-* Tue Apr 23 2019 Christian Mollekopf (Kolab Systems) <mollekopf@kolabsys.com> - 0.4.2-4
-- Support shortlogins via the username_domain configuration option
-
-* Thu Apr 11 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.4.2-2
-- Avoid referring to kolab_auth if it isn't actually installed
-
-* Thu Mar 14 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.4.2-1
-- Release 0.4.2
-
-* Wed Jun 20 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.1-2
-- Fix marking httpd's conf.d/iRony.conf file as a configuration file not
-  to be replaced by package updates
-- Require a more narrow range of Sabre packages
-
-* Wed Jun 13 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.1-1
-- Release of version 0.4.1
-
-* Thu May 25 2017 Timotheus Pokorra <tp@tbits.net> - 0.4.0-3
-- Fix build error on Fedora 25, composer needs php-justinrainbow-json-schema4
-
-* Wed May 10 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.0-2
-- Fix log rotation on Plesk
-
-* Tue May  2 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.0-1
-- Release of version 0.4.0
-
 * Thu Jan  8 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.3.0-1
 - Release of version 0.3.0

buildtarball.sh Deleted

debian.changelog Changed

@@ -1,141 +1,3 @@
-irony (0.4.8.5-1~kolab1) unstable; urgency=low
-
-  * New release
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Fri, 24 Feb 2023 12:12:13 +0100
-
-irony (0.4.7-1~kolab1) unstable; urgency=low
-
-  * Disable unauthenticated access
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Sun, 15 Jan 2023 12:12:13 +0100
-
-irony (0.4.6-7~kolab1) unstable; urgency=low
-
-  * sabre/vobject 4 compatiblity
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Fri, 30 Dec 2022 12:12:13 +0100
-
-irony (0.4.6-6~kolab1) unstable; urgency=low
-
-  * Remove type declaration from property
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Fri, 30 Dec 2022 12:12:13 +0100
-
-irony (0.4.6-5~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.6
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Mon, 19 Dec 2022 12:12:13 +0100
-
-irony (0.4.6-1~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.6
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue, 11 Jan 2022 12:12:13 +0100
-
-irony (0.4.5-1~kolab2) unstable; urgency=low
-
-  * Release of version 0.4.5
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon, 19 Oct 2020 12:12:13 +0100
-
-irony (0.4.4-1~kolab2) unstable; urgency=low
-
-  * Release of version 0.4.4
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri, 16 Oct 2020 12:12:13 +0100
-
-irony (0.4.3-1~kolab2) unstable; urgency=low
-
-  * Release of version 0.4.3
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Thu, 16 Jan 2020 12:12:13 +0100
-
-irony (0.4.2-1~kolab6) unstable; urgency=low
-
-  * Support shortlogins via the username_domain configuration option.
-
- -- Christian Mollekopf (Kolab Systems) <mollekopf@kolabys.com>  Tue, 23 Apr 2019 12:12:12 +0100
-
-irony (0.4.2-1~kolab3) unstable; urgency=low
-
-  * Adjusted iRony.logrotate according to new filenames
-
- -- Christian Mollekopf (Kolab Systems) <mollekopf@kolabys.com>  Mon, 15 Apr 2019 12:12:12 +0100
-
-irony (0.4.2-1~kolab2) unstable; urgency=low
-
-  * Avoid referring to kolab_auth if it isn't actually installed
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 11 Apr 2019 12:12:13 +0100
-
-irony (0.4.2-1~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.2
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 14 Mar 2019 12:12:13 +0100
-
-irony (0.4.1-2~kolab1) unstable; urgency=low
-
-  * Narrow the requirements on specific sabre packages
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 20 Jun 2018 12:12:13 +0100
-
-irony (0.4.1-1~kolab1) unstable; urgency=low
-
-  * Fix autoloader mess, again
-
- -- Christoph Erhardt <kolab@sicherha.de>  Fri, 15 Jun 2018 17:33:17 +0200
-
-irony (0.4.1-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.1
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 13 Jun 2018 12:12:13 +0100
-
-irony (0.4.0-0~kolab4) unstable; urgency=low
-
-  * Smoothen upgrade path
-
- -- Christoph Erhardt <kolab@sicherha.de>  Sun, 04 Jun 2017 11:27:27 +0200
-
-irony (0.4.0-0~kolab3) unstable; urgency=low
-
-  * Fix iRony apache site configuration
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 11 May 2017 12:12:13 +0100
-
-irony (0.4.0-0~kolab2) unstable; urgency=low
-
-  * Fix log rotation on Plesk
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 10 May 2017 12:12:13 +0100
-
-irony (0.4.0-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.0
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  2 May 2017 12:12:13 +0100
-
-irony (0.4~dev20160321-0~kolab4.1) unstable; urgency=low
-
-  * Enhance packaging
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  7 Feb 2017 12:12:13 +0100
-
-irony (0.4~dev20160321-0~kolab4) unstable; urgency=low
-
-  * Updated Autoloader again
-
- -- Daniel Hoffend <dh@dotlan.net>  Wed, 09 Dec 2016 00:15:00 +0100
-
-irony (0.4~dev20160321-0~kolab3) unstable; urgency=low
-
-  * Updated Autoloader Composer Path
-
- -- Daniel Hoffend <dh@dotlan.net>  Wed, 06 Dec 2016 23:23:00 +0100
-
 irony (0.4~dev20160321-0~kolab2) unstable; urgency=low
 
   * Changed Requirements from sabre-vobject to sabre-vobject-3, sabre-av

debian.control Changed

debian.rules Changed

@@ -1,28 +1,21 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+#export DH_OPTIONS=-v
+#export DH_VERBOSE=1
 
 %:
 	dh $@
 
-override_dh_auto_configure:
-	if  -f "/etc/plesk-release" ; then \
-		sed -i -e 's/www-data adm/roundcube_sysuser roundcube_sysgroup/g' debian/irony.logrotate ; \
-	fi
-
 override_dh_install:
-	dh_install -X.arcconfig -X.gitignore
-
-	if  ! -f "/etc/plesk-release" ; then \
-		mkdir -p $(CURDIR)/debian/irony/etc/apache2/sites-available ; \
-		install -pm 644 $(CURDIR)/debian/iRony.conf \
-			$(CURDIR)/debian/irony/etc/apache2/sites-available/iRony.conf ; \
-	fi
-
+	if  -f composer.json-dist ; then rm -rf composer.json; mv composer.json-dist composer.json; fi
+	mkdir -p $HOME/.composer/
+	echo '{}' > $HOME/.composer/composer.json
+	composer.sh -vvv dumpautoload --optimize
 	mkdir -p $(CURDIR)/debian/irony/etc/iRony/
+	cp -a $(CURDIR)/debian/iRony.conf $(CURDIR)/debian/irony/etc/iRony/apache.conf
 	cp -a config/dav.inc.php.sample $(CURDIR)/debian/irony/etc/iRony/dav.inc.php
 	mkdir -p $(CURDIR)/debian/irony/usr/share/iRony/config
 	mkdir -p $(CURDIR)/debian/irony/usr/share/iRony/lib
 	cp -a lib/Kolab $(CURDIR)/debian/irony/usr/share/iRony/lib
 	cp -a public_html $(CURDIR)/debian/irony/usr/share/iRony/
+	cp -a vendor $(CURDIR)/debian/irony/usr/share/iRony/

debian.tar.gz/links Changed

@@ -1,9 +1,9 @@
-etc/iRony/dav.inc.php /usr/share/iRony/config/dav.inc.php
-etc/roundcubemail/defaults.inc.php /usr/share/iRony/config/defaults.inc.php
-etc/roundcubemail/config.inc.php /usr/share/iRony/config/config.inc.php
-usr/share/chwala/lib /usr/share/iRony/lib/FileAPI
-usr/share/roundcubemail/program/lib/Roundcube /usr/share/iRony/lib/Roundcube
-usr/share/roundcubemail/plugins /usr/share/iRony/lib/plugins
-usr/share/roundcubemail/vendor /usr/share/iRony/vendor
-var/cache/iRony /usr/share/iRony/temp
-var/log/iRony /usr/share/iRony/logs
+etc/iRony/apache.conf etc/apache2/sites-available/iRony.conf
+etc/iRony/dav.inc.php usr/share/iRony/config/dav.inc.php
+etc/roundcubemail/defaults.inc.php usr/share/iRony/config/defaults.inc.php
+etc/roundcubemail/config.inc.php usr/share/iRony/config/config.inc.php
+usr/share/chwala/lib usr/share/iRony/lib/FileAPI
+usr/share/roundcubemail/program/lib/Roundcube usr/share/iRony/lib/Roundcube
+usr/share/roundcubemail/plugins usr/share/iRony/lib/plugins
+var/cache/iRony usr/share/iRony/temp
+var/log/iRony usr/share/iRony/logs

debian.tar.gz/postinst Changed

debian.tar.gz/preinst Changed

@@ -14,7 +14,7 @@
 
 case "$1" in
     upgrade|install)
-        # rename old apache/http sites from sitename to sitename.conf
+        # rename old apache/http sites rom sitename to sitename.conf
         if  -e /etc/apache2/sites-available/iRony -a ! -e /etc/apache2/sites-available/iRony.conf ; then
             if  -h /etc/apache2/sites-enabled/iRony ; then
                 a2dissite iRony
@@ -23,18 +23,8 @@
             a2ensite iRony.conf
             reload_apache
         fi
-        # fixup accidental creation of irony.conf in 0.4.0-0~kolab1
-        if  -e /etc/apache2/sites-available/irony.conf -a ! -e /etc/apache2/sites-available/iRony.conf ; then
-            if  -h /etc/apache2/sites-enabled/irony.conf ; then
-                a2dissite irony.conf
-            fi
-            mv /etc/apache2/sites-available/irony.conf /etc/apache2/sites-available/iRony.conf
-            a2ensite iRony.conf
-            reload_apache
-        fi
-        # Remove vendor directory so it can be replaced with a symlink
-        rm -rf /usr/share/iRony/vendor
     ;;
 esac
 
 exit 0
+

iRony-0.4.8.tar.gz/.arcconfig Deleted

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/LDAPResources.php Deleted

@@ -1,61 +0,0 @@
-<?php
-
-/**
- * CardDAV Directory class providing read-only access
- * to an LDAP-based resources address book.
- */
-
-namespace Kolab\CardDAV;
-
-use \rcube;
-use Sabre\CardDAV;
-
-class LDAPResources extends LDAPDirectory
-{
-    const DIRECTORY_NAME = 'ldap-resources';
-
-    /**
-     * Default constructor
-     */
-    function __construct($config, $principalUri, $carddavBackend = null)
-    {
-        $this->config = $config;
-        $this->principalUri = $principalUri;
-
-        $this->addressBookInfo = array(
-            'id' => self::DIRECTORY_NAME,
-            'uri' => self::DIRECTORY_NAME,
-            '{DAV:}displayname' => $config'name' ?: "LDAP Resources", 
-            '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new CardDAV\Xml\Property\SupportedAddressData(),
-            'principaluri' => $principalUri,
-        );
-
-        // used for vcard serialization
-        $this->carddavBackend = $carddavBackend ?: new ContactsBackend();
-        $this->carddavBackend->ldap_resources = $this;
-
-        // initialize cache. We need a different address space from GAL
-        // so don't mix our caches
-        $rcube = rcube::get_instance();
-        if ($rcube->config->get('kolabdav_res_cache')) {
-            $this->cache = $rcube->get_cache_shared('kolabdav_res');
-
-            // expunge cache every now and then
-            if (rand(0,10) === 0) {
-                $this->cache->expunge();
-            }
-        }
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    function getName()
-    {
-        return self::DIRECTORY_NAME;
-    }
-}

iRony-0.4.8.tar.gz/phpstan.neon Deleted

iRony-0.4.8.tar.gz/autogen.sh -> iRony-0.4.tar.gz/autogen.sh Changed

iRony-0.4.8.tar.gz/composer.json -> iRony-0.4.tar.gz/composer.json Changed

@@ -1,21 +1,28 @@
 {
-    "name": "kolab/irony",
-    "description": "iRony - The Kolab WebDAV/CalDAV/CardDAV Server",
-    "license": "AGPL-3.0",
-    "version": "0.4-dev",
-    "require": {
-        "php": ">=7.2",
-        "sabre/dav" : "~4.5.1"
-    },
-    "require-dev": {
-        "pear/pear-core-minimal": "~1.10.1",
-        "pear/net_socket": "~1.2.1",
-        "pear/auth_sasl": "~1.1.0",
-        "pear/net_idna2": "~0.2.0",
-        "pear/mail_mime": "~1.10.0",
-        "pear/net_smtp": "~1.7.1",
-        "pear/net_ldap2": "~2.2.0",
-        "kolab/net_ldap3": "dev-master",
-        "phpunit/phpunit": "^9.6"
-    }
+	"name": "kolab/irony",
+	"description": "iRony - The Kolab WebDAV/CalDAV/CardDAV Server",
+	"license": "AGPL-3.0",
+	"version": "0.4-dev",
+	"repositories": 
+		{
+			"type": "pear",
+			"url": "http://pear.php.net/"
+		},
+		{
+			"type": "vcs",
+			"url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
+		}
+	,
+	"require": {
+		"php": ">=5.4.1",
+		"sabre/dav" : "2.1.*"
+	},
+	"require-dev": {
+		"pear/mail_mime": ">=1.8.9",
+		"pear/mail_mime-decode": "~1.5.5",
+		"pear-pear.php.net/net_idna2": ">=0.1.1",
+		"pear-pear.php.net/net_ldap2": ">=2.0.12",
+		"kolab/Net_LDAP3": "dev-master"
+	},
+	"minimum-stability": "dev"
 }

iRony-0.4.8.tar.gz/composer.json-dist -> iRony-0.4.tar.gz/composer.json-dist Changed

iRony-0.4.8.tar.gz/config/dav.inc.php.sample -> iRony-0.4.tar.gz/config/dav.inc.php.sample Changed

@@ -42,6 +42,9 @@
 // by http requests. This will write log to /var/log/iRony/console
 $config'kolabdav_console' = false;
 
+// enable per-user debugging if /var/log/iRony/<username>/ folder exists
+$config'kolabdav_user_debug' = false;
+
 // enable logging of full HTTP payload
 // (bitmask of these values: 2 = HTTP Requests, 4 = HTTP Responses)
 $config'kolabdav_http_log' = 0;
@@ -56,7 +59,6 @@
 // Enables the CardDAV Directory Gateway Extension by exposing an
 // LDAP-based address book in the pricipals address book collection.
 // Properties of this option are the same as for $config'ldap_public' entries.
-// NOTE: Mapping of (additional) 'uid' and 'changed' fields is required!
 /*
 $config'kolabdav_ldap_directory' = array(
     'name'           => 'Global Address Book',
@@ -113,45 +115,6 @@
         'changed'           => 'modifytimestamp',
     ),
 );
-
-// Expose all resources as an LDAP-based address book in the pricipals address book collection.
-// This enables Non-Kolab-Clients to add resources to an event.
-// Properties of this option are the same as for $config'kolabdav_ldap_directory' entries.
-$config'kolabdav_ldap_resources'  = array(
-    'name'           => 'Global Resources',
-    'hosts'          => 'localhost',
-    'port'           => 389,
-    'use_tls'        => false,
-    'user_specific'  => false,
-    'search_base_dn' => 'ou=People,dc=example,dc=org',
-    'search_bind_dn' => 'uid=kolab-service,ou=Special Users,dc=example,dc=org',
-    'search_bind_pw' => 'Welcome2KolabSystems',
-    'search_filter'  => '(&(objectClass=inetOrgPerson)(mail=%fu))',
-    'base_dn'        => 'ou=Resources,dc=example,dc=org',
-    'bind_dn'        => 'uid=kolab-service,ou=Special Users,dc=example,dc=org',
-    'bind_pass'      => 'Welcome2KolabSystems',
-    'ldap_version'   => 3,
-    'filter'         => '(|(objectclass=groupofuniquenames)(objectclass=groupofurls)(objectclass=kolabsharedfolder))',
-    'search_fields'  => array('displayname', 'mail'),
-    'sort'           => array('displayname', 'sn', 'givenname', 'cn'),
-    'scope'          => 'sub',
-    'searchonly'     => false,  // Set to false to enable listing
-    'sizelimit'      => '1000',
-    'timelimit'      => '0',
-    'fieldmap'       => array(
-        // Internal         => LDAP
-        'name'              => 'cn',
-        'email'             => 'mail',
-        'owner'             => 'owner',
-        'description'       => 'description',
-        'attributes'        => 'kolabdescattribute',
-        'members'           => 'uniquemember',
-        // these mappings are required for owner display
-        'phone'             => 'telephoneNumber',
-        'mobile'            => 'mobile',
-    ),
-);
-
 */
 
 // Enable caching for LDAP directory data.

iRony-0.4.8.tar.gz/lib/Kolab/CalDAV/Calendar.php -> iRony-0.4.tar.gz/lib/Kolab/CalDAV/Calendar.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php -> iRony-0.4.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php Changed

@@ -23,7 +23,9 @@
 
 namespace Kolab\CalDAV;
 
+use \PEAR;
 use \rcube;
+use \rcube_charset;
 use \rcube_message;
 use \kolab_storage;
 use \kolab_storage_config;
@@ -74,8 +76,8 @@
                 '{DAV:}displayname' => html_entity_decode($folder->get_name(), ENT_COMPAT, RCUBE_CHARSET),
                 '{http://apple.com/ns/ical/}calendar-color' => '#' . $folder->get_color('FF0000') . 'FF',
                 '{http://calendarserver.org/ns/}getctag' => sprintf('%d-%d-%d', $fdata'UIDVALIDITY', $fdata'HIGHESTMODSEQ', $fdata'UIDNEXT'),
-                '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(array(DAVBackend::$caldav_type_component_map$folder->type)),
-                '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('opaque'),
+                '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new CalDAV\Property\SupportedCalendarComponentSet(array(DAVBackend::$caldav_type_component_map$folder->type)),
+                '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Property\ScheduleCalendarTransp('opaque'),
                 '{http://apple.com/ns/ical/}calendar-order' => $order++,
             );
 
@@ -112,11 +114,11 @@
     public function get_storage_folder($id)
     {
         // resolve alias name
-        if (!empty($this->aliases$id)) {
+        if ($this->aliases$id) {
             $id = $this->aliases$id;
         }
 
-        if (!empty($this->folders$id)) {
+        if ($this->folders$id) {
             DAVBackend::check_storage_folder($this->folders$id);
             return $this->folders$id;
         }
@@ -150,11 +152,6 @@
             return array();
         }
 
-        // Reset imap cache so we work with up-to-date folders list
-        // We do this only when a client requests list of calendars,
-        // and we assume clients do not ask for list too often (Bifrost#T175679)
-        rcube::get_instance()->get_storage()->clear_cache('mailboxes', true);
-
         $this->_read_calendars();
 
         $calendars = array();
@@ -180,11 +177,11 @@
         $id = $calendarUri;
 
         // resolve aliases (calendar by folder name)
-        if (!empty($this->aliases$calendarUri)) {
+        if ($this->aliases$calendarUri) {
             $id = $this->aliases$calendarUri;
         }
 
-        if (!empty($this->calendars$id) && empty($this->calendars$id'principaluri')) {
+        if ($this->calendars$id && empty($this->calendars$id'principaluri')) {
             $this->calendars$id'principaluri' = 'principals/' . HTTPBasic::$current_user;
         }
 
@@ -237,7 +234,7 @@
         console(__METHOD__, $calendarId, $propPatch);
 
         if ($folder = $this->get_storage_folder($calendarId)) {
-            DAVBackend::handle_proppatch($folder, $propPatch);
+            DAVBackend::handle_propatch($folder, $propPatch);
         }
     }
 
@@ -292,17 +289,12 @@
         $query = $this->_event_filter_query();
         $storage = $this->get_storage_folder($calendarId);
         if ($storage) {
-            foreach ($storage->select($query, true) as $event) {
+            foreach ($storage->select($query) as $event) {
                 // post-filter events to suppress declined invitations
                 if (!$this->_event_filter_compare($event)) {
                     continue;
                 }
 
-                // Make sure to not return invalid objects
-                if (empty($event) || empty($event'uid')) {
-                    continue;
-                }
-
                 // get tags/categories from relations
                 $this->load_tags($event);
 
@@ -347,7 +339,7 @@
 
         if ($storage && ($event = $storage->get_object($uid))) {
             // deliver attachment content directly
-            if (!empty($part) && !empty($event'_attachments')) {
+            if ($part && !empty($event'_attachments')) {
                 foreach ($event'_attachments' as $attachment) {
                     if ($attachment'id' == $part) {
                         header('Content-Type: ' . $attachment'mimetype');
@@ -423,7 +415,7 @@
         }
 
         // map attachments attribute
-        $object'_attachments' = !empty($object'attachments') ? $object'attachments' : array();
+        $object'_attachments' = $object'attachments';
         unset($object'attachments');
 
         // remove categories from object data (only for tasks yet)
@@ -636,7 +628,7 @@
 
       $results = array();
       if ($storage = $this->get_storage_folder($calendarId)) {
-          foreach ($storage->select($query, true) as $event) {
+          foreach ($storage->select($query) as $event) {
               // post-filter events to suppress declined invitations
               if ($this->_event_filter_compare($event)) {
                   $results = VObjectUtils::uid2uri($event'uid', '.ics');
@@ -870,7 +862,6 @@
                 if ($update) {
                     // map attachments attribute
                     $object'_attachments' = $object'attachments';
-                    // @phpstan-ignore-next-line
                     unset($object'attachments');
 
                     $success = $storage->save($object, $object'_type', $existing'uid');
@@ -972,8 +963,7 @@
      * Checks if specified message part is a vcalendar data
      *
      * @param rcube_message_part Part object
-     *
-     * @return bool True if part is of type vcard
+     * @return boolean True if part is of type vcard
      */
     protected static function part_is_itip($part)
     {
@@ -1026,7 +1016,6 @@
      * Parse the given iCal string into a hash array kolab_format_event can handle
      *
      * @param string iCal data block
-     *
      * @return array Hash array with event properties or null on failure
      */
     private function parse_calendar_data($calendarData, $uid)
@@ -1113,8 +1102,7 @@
     /**
      * Provide basic query for kolab_storage_folder::select()
      *
-     * @param bool Filter for inbox events (i.e. status=NEEDS-ACTION)
-     *
+     * @param boolean Filter for inbox events (i.e. status=NEEDS-ACTION)
      * @return array  List of query parameters for kolab_storage_folder::select()
      */
     private function _event_filter_query($inbox = false)
@@ -1144,10 +1132,9 @@
     /**
      * Check the given event if it matches the filter
      *
-     * @param array Hash array with event properties
-     * @param bool  Filter for inbox events (i.e. status=NEEDS-ACTION)
-     *
-     * @return bool True if matches, false if not
+     * @param array    Hash array with event properties
+     * @param boolean  Filter for inbox events (i.e. status=NEEDS-ACTION)
+     * @return boolean True if matches, false if not
      */
     private function _event_filter_compare($event, $inbox = false)
     {
@@ -1157,14 +1144,13 @@
             $user_emails = $this->get_user_emails();
         }
 
-        if (!empty($event'attendees') && is_array($event'attendees')) {
+        if (is_array($event'attendees')) {
             foreach ($event'attendees' as $attendee) {
                 if (in_array($attendee'email', $user_emails)) {
-                    $status = !empty($attendee'status') ? $attendee'status' : null;
-                    if ($status == 'DECLINED') {
+                    if ($attendee'status' == 'DECLINED') {
                         return false;
                     }
-                    if ($inbox && $status == 'NEEDS-ACTION') {
+                    else if ($inbox && $attendee'status' == 'NEEDS-ACTION') {
                         return true;
                     }
                 }
@@ -1178,7 +1164,6 @@
      * Generate an Etag string from the given event data
      *
      * @param array Hash array with event properties from libkolab
-     *
      * @return string Etag string
      */
     private static function _get_etag($event)

iRony-0.4.8.tar.gz/lib/Kolab/CalDAV/IMipPlugin.php -> iRony-0.4.tar.gz/lib/Kolab/CalDAV/IMipPlugin.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/CalDAV/Plugin.php -> iRony-0.4.tar.gz/lib/Kolab/CalDAV/Plugin.php Changed

@@ -27,7 +27,7 @@
 use Sabre\CalDAV;
 use Sabre\VObject;
 use Sabre\HTTP;
-use Sabre\Uri;
+use Sabre\HTTP\URLUtil;
 use Kolab\DAV\Auth\HTTPBasic;
 
 
@@ -117,7 +117,7 @@
                 // keep the parsed object in memory for later processing
                 if ($vobj->name == 'VCALENDAR') {
                     self::$parsed_vcalendar = $vobj;
-                    foreach ($vobj->getComponents() as $vevent) {
+                    foreach ($vobj->getBaseComponents() ?: $vobj->getComponents() as $vevent) {
                         if ($vevent->name == 'VEVENT' || $vevent->name == 'VTODO') {
                             self::$parsed_vevent = $vevent;
                             break;
@@ -137,7 +137,7 @@
         $sCCS = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
 
         // Get the Supported Components for the target calendar
-        list($parentPath) = Uri\split($path);
+        list($parentPath) = URLUtil::splitPath($path);
         $calendarProperties = $this->server->getProperties($parentPath, $sCCS);
 
         if (isset($calendarProperties$sCCS)) {
@@ -226,24 +226,4 @@
         return $features;
     }
 
-    /**
-     * PropFind
-     *
-     * This method handler is invoked before any after properties for a
-     * resource are fetched. This allows us to add in any CalDAV specific
-     * properties.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @return void
-     */
-    function propFind(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        $propFind->handle('{' . self::NS_CALDAV . '}calendar-home-set', function() {
-            $user = HTTPBasic::$current_user;
-            return new DAV\Xml\Property\Href($this->getCalendarHomeForPrincipal("/principals/$user") . '/');
-        });
-
-        parent::propFind($propFind, $node);
-    }
-}
+}
\ No newline at end of file

iRony-0.4.8.tar.gz/lib/Kolab/CalDAV/SchedulePlugin.php -> iRony-0.4.tar.gz/lib/Kolab/CalDAV/SchedulePlugin.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/AddressBook.php -> iRony-0.4.tar.gz/lib/Kolab/CardDAV/AddressBook.php Changed

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

@@ -47,7 +47,6 @@
     );
 
     public $ldap_directory;
-    public $ldap_resources;
 
     private $sources;
     private $folders;
@@ -113,7 +112,7 @@
                 'uri' => $id,
                 '{DAV:}displayname' => html_entity_decode($folder->get_name(), ENT_COMPAT, RCUBE_CHARSET),
                 '{http://calendarserver.org/ns/}getctag' => sprintf('%d-%d-%d', $fdata'UIDVALIDITY', $fdata'HIGHESTMODSEQ', $fdata'UIDNEXT'),
-                '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new CardDAV\Xml\Property\SupportedAddressData(self::$supported_address_data),
+                '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new CardDAV\Property\SupportedAddressData(self::$supported_address_data),
             );
             $this->aliases$folder->name = $id;
 
@@ -134,16 +133,17 @@
     public function get_storage_folder($id)
     {
         // resolve alias name
-        if (!empty($this->aliases$id)) {
+        if ($this->aliases$id) {
             $id = $this->aliases$id;
         }
 
-        if (!empty($this->folders$id)) {
+        if ($this->folders$id) {
             DAVBackend::check_storage_folder($this->folders$id);
             return $this->folders$id;
         }
-
-        return DAVBackend::get_storage_folder($id, 'contact');
+        else {
+            return DAVBackend::get_storage_folder($id, 'contact');
+        }
     }
 
     /**
@@ -156,11 +156,6 @@
     {
         console(__METHOD__, $principalUri, $this->useragent);
 
-        // Reset imap cache so we work with up-to-date folders list
-        // We do this only when a client requests list of address books,
-        // and we assume clients do not ask for list too often (Bifrost#T175679)
-        rcube::get_instance()->get_storage()->clear_cache('mailboxes', true);
-
         $this->_read_sources();
 
         // special case for the apple address book which only supports one (!) address book
@@ -204,12 +199,12 @@
                 'uri' => '__all__',
                 '{DAV:}displayname' => 'All',
                 '{http://calendarserver.org/ns/}getctag' => join(':', $ctags),
-                '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new CardDAV\Xml\Property\SupportedAddressData(self::$supported_address_data),
+                '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new CardDAV\Property\SupportedAddressData(self::$supported_address_data),
             );
         }
 
         // resolve aliases (addressbook by folder name)
-        if (!empty($this->aliases$addressBookUri)) {
+        if ($this->aliases$addressBookUri) {
             $id = $this->aliases$addressBookUri;
         }
 
@@ -247,7 +242,7 @@
             return false;
 
         if ($folder = $this->get_storage_folder($addressBookId)) {
-            DAVBackend::handle_proppatch($folder, $propPatch);
+            DAVBackend::handle_propatch($folder, $propPatch);
         }
     }
 
@@ -323,7 +318,7 @@
         $query = array(array('type', '=', $groups_support ? array('contact','distribution-list') : 'contact'));
         $cards = array();
         if ($storage = $this->get_storage_folder($addressBookId)) {
-            foreach ($storage->select($query, true) as $contact) {
+            foreach ($storage->select($query) as $contact) {
                 $cards = array(
                     'id' => $contact'uid',
                     'uri' => VObjectUtils::uid2uri($contact'uid', '.vcf'),
@@ -363,12 +358,6 @@
                 $contact = $this->ldap_directory->getContactObject($uid);
             }
         }
-        // read card data from LDAP resources
-        else if ($addressBookId == LDAPResources::DIRECTORY_NAME) {
-            if (is_object($this->ldap_resources)) {
-                $contact = $this->ldap_resources->getContactObject($uid);
-            }
-        }
         else {
             $storage = $this->get_storage_folder($addressBookId);
             $contact = $storage->get_object($uid, '*');
@@ -681,12 +670,12 @@
         $vc = new VObject\Component\VCard();
         $vc->VERSION = '3.0';  // always set to 3.0 and let Sabre/DAV convert to 4.0 if necessary
         $vc->PRODID = '-//Kolab//iRony DAV Server ' . KOLAB_DAV_VERSION . '//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN';
-        $vc->UID = $contact'uid';
 
+        $vc->add('UID', $contact'uid');
         $vc->add('FN', $contact'name');
 
         // distlists are KIND:group
-        if (isset($contact'_type') && $contact'_type' == 'distribution-list') {
+        if ($contact'_type' == 'distribution-list') {
             // group cards are actually vcard version 4
             if (!$this->is_apple()) {
                 $vc->version = '4.0';
@@ -709,18 +698,10 @@
                 $vc->add($prop_prefix . 'MEMBER', $value);
             }
         }
-        else {
-            $allname = ($contact'surname' ?? '')
-                . ($contact'firstname' ?? '')
-                . ($contact'middlename' ?? '')
-                . ($contact'prefix' ?? '')
-                . ($contact'suffix' ?? '');
-
-            if ($allname != '') {
-                $n = $vc->create('N');
-                $n->setParts(array($contact'surname' ?? '', $contact'firstname' ?? '', $contact'middlename' ?? '', $contact'prefix' ?? '', $contact'suffix' ?? ''));
-                $vc->add($n);
-            }
+        else if ($contact'surname' . $contact'firstname' . $contact'middlename' . $contact'prefix' . $contact'suffix' != '') {
+            $n = $vc->create('N');
+            $n->setParts(array(strval($contact'surname'), strval($contact'firstname'), strval($contact'middlename'), strval($contact'prefix'), strval($contact'suffix')));
+            $vc->add($n);
         }
 
         if (!empty($contact'nickname'))
@@ -759,48 +740,36 @@
             }
         }
 
-        if (!empty($contact'email')) {
-            foreach ((array)$contact'email' as $email) {
-                $types = array('INTERNET');
-                if (!empty($email'type'))
-                    $types = array_merge($types, explode(',', strtoupper($email'type')));
-                $vc->add('EMAIL', $email'address', array('type' => $types));
-            }
+        foreach ((array)$contact'email' as $email) {
+            $types = array('INTERNET');
+            if (!empty($email'type'))
+                $types = array_merge($types, explode(',', strtoupper($email'type')));
+            $vc->add('EMAIL', $email'address', array('type' => $types));
         }
 
-        if (!empty($contact'phone')) {
-            foreach ((array)$contact'phone' as $phone) {
-                $type = $this->phonetypes$phone'type' ?? $phone'type';
-                $params = !empty($type) ? array('type' => explode(',', strtoupper($type))) : array();
-                $vc->add('TEL', $phone'number', $params);
-            }
+        foreach ((array)$contact'phone' as $phone) {
+            $type = $this->phonetypes$phone'type' ?: $phone'type';
+            $params = !empty($type) ? array('type' => explode(',', strtoupper($type))) : array();
+            $vc->add('TEL', $phone'number', $params);
         }
 
-        if (!empty($contact'website')) {
-            if (!empty($contact'website')) {
-                foreach ((array)$contact'website' as $website) {
-                    $params = !empty($website'type') ? array('type' => explode(',', strtoupper($website'type'))) : array();
-                    $vc->add('URL', $website'url', $params);
-                }
-            }
+        foreach ((array)$contact'website' as $website) {
+            $params = !empty($website'type') ? array('type' => explode(',', strtoupper($website'type'))) : array();
+            $vc->add('URL', $website'url', $params);
         }
 
-        if (!empty($contact'im')) {
-            $improtocolmap = array_flip($this->improtocols);
-            foreach ((array)$contact'im' as $im) {
-                list($prot, $val) = explode(':', $im, 2);
-                if ($val && !$v4) $vc->add('x-' . ($improtocolmap$prot ?: $prot), $val);
-                else              $vc->add('IMPP', $im);
-            }
+        $improtocolmap = array_flip($this->improtocols);
+        foreach ((array)$contact'im' as $im) {
+            list($prot, $val) = explode(':', $im, 2);
+            if ($val && !$v4) $vc->add('x-' . ($improtocolmap$prot ?: $prot), $val);
+            else              $vc->add('IMPP', $im);
         }
 
-        if (!empty($contact'address')) {
-            foreach ((array)$contact'address' as $adr) {
-                $params = !empty($adr'type') ? array('type' => strtoupper($adr'type')) : array();
-                $vadr = $vc->create('ADR', null, $params);
-                $vadr->setParts(array('','', $adr'street', $adr'locality', $adr'region', $adr'code', $adr'country'));
-                $vc->add($vadr);
-            }
+        foreach ((array)$contact'address' as $adr) {
+            $params = !empty($adr'type') ? array('type' => strtoupper($adr'type')) : array();
+            $vadr = $vc->create('ADR', null, $params);
+            $vadr->setParts(array('','', $adr'street', $adr'locality', $adr'region', $adr'code', $adr'country'));
+            $vc->add($vadr);
         }
 
         if (!empty($contact'notes'))
@@ -841,7 +810,7 @@
             $vc->add('FBURL', $contact'freebusyurl');
         }
 
-        if (!empty($contact'lang') && is_array($contact'lang')) {
+        if (is_array($contact'lang')) {
             foreach ($contact'lang' as $value) {
                 $vc->add('LANG', $value);
             }
@@ -854,10 +823,8 @@
         }
 
         // add custom properties
-        if (!empty($contact'x-custom')) {
-            foreach ((array)$contact'x-custom' as $prop) {
-                $vc->add($prop0, $prop1);
-            }
+        foreach ((array)$contact'x-custom' as $prop) {
+            $vc->add($prop0, $prop1);
         }
 
         // send some known fields as itemN.X-AB* for Apple clients
@@ -904,7 +871,7 @@
         $phonetypemap'fax,work' = 'workfax';
 
         // map attributes to internal fields
-        foreach ($vc->children() as $prop) {
+        foreach ($vc->children as $prop) {
             if (!($prop instanceof VObject\Property))
                 continue;
 
@@ -961,20 +928,14 @@
                     break;
 
                 case 'BDAY':
+                    $contact'birthday' = new \DateTime($value);
+                    $contact'birthday'->_dateonly = true;
+                    break;
+
                 case 'ANNIVERSARY':
                 case 'X-ANNIVERSARY':
-                    // We use getDateTime() method to support partial date format from vCard 4
-                    // and to not throw exceptions on invalid input (T2492)
-                    if (method_exists($prop, 'getDateTime')) {
-                        $key = $prop->name == 'BDAY' ? 'birthday' : 'anniversary';
-                        try {
-                            $contact$key = $prop->getDateTime();
-                            $contact$key->_dateonly = true;
-                        }
-                        catch (\Exception $e) {
-                            // ignore
-                        }
-                    }
+                    $contact'anniversary' = new \DateTime($value);
+                    $contact'anniversary'->_dateonly = true;
                     break;
 
                 case 'SEX':
@@ -1021,12 +982,10 @@
                     break;
 
                 case 'PHOTO':
-                    if ($prop instanceof VObject\Property\Binary && $value) {
+                    $param = $prop->offsetGet('encoding') ?: $prop->parameters0;
+                    if (($pvalue = $param->getValue()) && (strtolower($pvalue) == 'b' || strtolower($pvalue) == 'base64') || strtolower($param->name) == 'base64') {
                         $contact'photo' = $value;
                     }
-                    else if ($prop instanceof VObject\Property\Uri && preg_match('|^data:image/a-z+;base64,|i', $value, $m)) {
-                        $contact'photo' = base64_decode(substr($value, strlen($m0)));
-                    }
                     break;
 
                 // VCard 4.0 properties
@@ -1087,9 +1046,8 @@
             }
         }
 
-        if (isset($contact'im') && is_array($contact'im')) {
+        if (is_array($contact'im'))
             $contact'im' = array_unique($contact'im');
-        }
 
         return $contact;
     }
@@ -1164,9 +1122,9 @@
     /**
      * Extract array values by a filter
      *
-     * @param array        $arr     Array to filter
-     * @param array|string $values  Array or comma separated list of values to keep
-     * @param bool         $inverse Invert key selection: remove the listed values
+     * @param array Array to filter
+     * @param keys Array or comma separated list of values to keep
+     * @param boolean Invert key selection: remove the listed values
      *
      * @return array The filtered array
      */
@@ -1176,15 +1134,15 @@
             $values = explode(',', $values);
         }
 
+        // explode single, comma-separated value
+        if (count($arr) == 1 && strpos($arr0, ',')) {
+            $arr = explode(',', $arr0);
+        }
+
         $result = array();
         $keep   = array_flip((array)$values);
 
         if (!empty($arr)) {
-            // explode single, comma-separated value
-            if (count($arr) == 1 && strpos($arr0, ',')) {
-                $arr = explode(',', $arr0);
-            }
-
             foreach ($arr as $key => $val) {
                 if ($inverse != isset($keepstrtolower($val))) {
                     $result$key = $val;

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/LDAPCard.php -> iRony-0.4.tar.gz/lib/Kolab/CardDAV/LDAPCard.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/LDAPDirectory.php -> iRony-0.4.tar.gz/lib/Kolab/CardDAV/LDAPDirectory.php Changed

@@ -32,7 +32,7 @@
 use \rcube_ldap_generic;
 use Sabre\DAV;
 use Sabre\DAVACL;
-use Sabre\CardDAV;
+use Sabre\CardDAV\Property;
 use Kolab\Utils\VObjectUtils;
 
 /**
@@ -42,14 +42,14 @@
 {
     const DIRECTORY_NAME = 'ldap-directory';
 
-    protected $config;
-    protected $ldap;
-    protected $carddavBackend;
-    protected $principalUri;
-    protected $addressBookInfo = array();
-    protected $cache;
-    protected $query;
-    protected $filter;
+    private $config;
+    private $ldap;
+    private $carddavBackend;
+    private $principalUri;
+    private $addressBookInfo = array();
+    private $cache;
+    private $query;
+    private $filter;
 
     /**
      * Default constructor
@@ -62,8 +62,8 @@
         $this->addressBookInfo = array(
             'id' => self::DIRECTORY_NAME,
             'uri' => self::DIRECTORY_NAME,
-            '{DAV:}displayname' => !empty($config'name') ? $config'name' : "LDAP Directory",
-            '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new CardDAV\Xml\Property\SupportedAddressData(),
+            '{DAV:}displayname' => $config'name' ?: "LDAP Directory",
+            '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new Property\SupportedAddressData(),
             'principaluri' => $principalUri,
         );
 
@@ -85,22 +85,21 @@
 
     private function connect()
     {
-        if (!isset($this->ldap)) {
-            $this->ldap = new rcube_ldap($this->config, $this->config'debug');
-            $this->ldap->set_pagesize(!empty($this->config'sizelimit') ? $this->config'sizelimit' : 10000);
-        }
+      if (!isset($this->ldap)) {
+        $this->ldap = new rcube_ldap($this->config, $this->config'debug');
+        $this->ldap->set_pagesize($this->config'sizelimit' ?: 10000);
+      }
 
-        return $this->ldap->ready ? $this->ldap : null;
+      return $this->ldap->ready ? $this->ldap : null;
     }
 
     /**
      * Set parsed addressbook-query object for filtering
-     * @param Sabre\CardDAV\Xml\Request\AddressBookQueryReport $report
      */
-    function setAddressbookQuery($report)
+    function setAddressbookQuery($query)
     {
-        $this->query = $report;
-        $this->filter = $this->addressbook_query2ldap_filter($report);
+        $this->query = $query;
+        $this->filter = $this->addressbook_query2ldap_filter($query);
     }
 
     /**
@@ -199,7 +198,7 @@
         $children = array();
 
         // return cached index
-        if (!$this->query && empty($this->config'searchonly') && $this->cache && ($cached_index = $this->cache->get('index'))) {
+        if (!$this->query && !$this->config'searchonly' && $this->cache && ($cached_index = $this->cache->get('index'))) {
             foreach ($cached_index as $uid => $c) {
                 $obj = array(
                     'id'   => $uid,
@@ -214,7 +213,7 @@
         }
 
         // query LDAP if we have a search query or listing is allowed
-        if (($this->query || empty($this->config'searchonly')) && ($ldap = $this->connect())) {
+        if (($this->query || !$this->config'searchonly') && ($ldap = $this->connect())) {
             // set pagesize from query limit attribute
             if ($this->query && $this->query->limit) {
                 $this->ldap->set_pagesize(intval($this->query->limit));
@@ -285,7 +284,7 @@
                 $response$propertyName = $this->addressBookInfo$propertyName;
             }
             else if ($propertyName == '{DAV:}getlastmodified') {
-                $response$propertyName = new DAV\Xml\Property\GetLastModified($this->getLastModified());
+                $response$propertyName = new DAV\Property\GetLastModified($this->getLastModified());
             }
         }
 
@@ -418,12 +417,10 @@
         }
         else if (!empty($contact'changed')) {
             try {
-                //                                      2018   05     14     06     22     31    .0Z     2018-05-14T06:22:31
-                $contact'changed' = preg_replace('/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\.0Z$/', '$1-$2-$3T$4:$5:$6', $contact'changed');
                 $contact'changed' = new \DateTime($contact'changed');
                 $contact'_timestamp' = intval($contact'changed'->format('U'));
             }
-            catch (\Exception $e) {
+            catch (Exception $e) {
                 $contact'changed' = null;
             }
         }
@@ -464,7 +461,6 @@
 
     /**
      * Translate the given AddressBookQueryParser object into an LDAP filter
-     * @param Sabre\CardDAV\Xml\Request\AddressBookQueryReport $report
      */
     private function addressbook_query2ldap_filter($query)
     {

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/Plugin.php -> iRony-0.4.tar.gz/lib/Kolab/CardDAV/Plugin.php Changed

@@ -27,7 +27,6 @@
 use Sabre\DAVACL;
 use Sabre\CardDAV;
 use Sabre\VObject;
-use Kolab\DAV\Auth\HTTPBasic;
 
 
 /**
@@ -68,20 +67,11 @@
      */
     public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node)
     {
-        // publish global ldap address book and resources list for this principal
-        if ($node instanceof DAVACL\IPrincipal && empty($this->directories)) {
-            if (\rcube::get_instance()->config->get('kolabdav_ldap_directory')) {
-                $this->directories = self::ADDRESSBOOK_ROOT . '/' . $node->getName() . '/' . LDAPDirectory::DIRECTORY_NAME;
-            }
-            if (\rcube::get_instance()->config->get('kolabdav_ldap_resources')) {
-                $this->directories = self::ADDRESSBOOK_ROOT . '/' . $node->getName() . '/' . LDAPResources::DIRECTORY_NAME;
-            }
+        // publish global ldap address book for this principal
+        if ($node instanceof DAVACL\IPrincipal && empty($this->directories) && \rcube::get_instance()->config->get('kolabdav_ldap_directory')) {
+            $this->directories = self::ADDRESSBOOK_ROOT . '/' . $node->getName() . '/' . LDAPDirectory::DIRECTORY_NAME;
         }
 
-        $propFind->handle('{' . self::NS_CARDDAV . '}addressbook-home-set', function() {
-            return new DAV\Xml\Property\Href($this->getAddressBookHomeForPrincipal(HTTPBasic::$current_user) . '/');
-        });
-
         parent::propFindEarly($propFind, $node);
     }
 
@@ -129,30 +119,23 @@
      * An exception is thrown if it's not.
      *
      * @param resource|string $data
-     * @param bool $modified Should be set to true, if this event handler
-     *                       changed &$data.
      * @return void
      */
-    protected function validateVCard(&$data, &$modified)
+    protected function validateVCard(&$data)
     {
         // If it's a stream, we convert it to a string first.
         if (is_resource($data)) {
             $data = stream_get_contents($data);
         }
 
-        $before = md5($data);
-
         // Converting the data to unicode, if needed.
         $data = DAV\StringUtil::ensureUTF8($data);
 
-        if (md5($data) !== $before) $modified = true;
-
         try {
             $vobj = VObject\Reader::read($data, VObject\Reader::OPTION_FORGIVING | VObject\Reader::OPTION_IGNORE_INVALID_LINES);
 
-            if ($vobj->name == 'VCARD') {
+            if ($vobj->name == 'VCARD')
                 $this->parsed_vcard = $vobj;
-            }
         }
         catch (VObject\ParseException $e) {
             throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid vcard data. Parse error: ' . $e->getMessage());
@@ -181,12 +164,11 @@
      *
      * (optimized version that skips parsing and re-serialization if possible)
      *
-     * @param string|resource $data
+     * @param string $data
      * @param string $target
-     * @param array $propertiesFilter
      * @return string
      */
-    protected function convertVCard($data, $target, $propertiesFilter = array())
+    protected function convertVCard($data, $target)
     {
         $version = 'vcard3';
         if (is_string($data) && preg_match('/VERSION:(\d)/', $data, $m)) {
@@ -194,14 +176,11 @@
         }
 
         // no conversion needed
-        if ($target == $version && empty($propertiesFilter)) {
-            if (is_resource($data)) {
-                $data = stream_get_contents($data);
-            }
+        if ($target == $version) {
             return $data;
         }
 
-        return parent::convertVCard($data, $target, $propertiesFilter);
+        return parent::convertVCard($data, $target);
     }
 
     /**
@@ -210,55 +189,55 @@
      * This report is used by the client to filter an addressbook based on a
      * complex query.
      *
-     * @param \Sabre\CardDAV\Xml\Request\AddressBookQueryReport $report
+     * @param \DOMNode $dom
      * @return void
      */
-    protected function addressbookQueryReport($report)
+    protected function addressbookQueryReport($dom)
     {
-        $uri = $this->server->getRequestUri();
-        $node = $this->server->tree->getNodeForPath($uri);
+        $node = $this->server->tree->getNodeForPath(($uri = $this->server->getRequestUri()));
         console(__METHOD__, $uri);
 
-        // TODO: port to new API if still required.
         // fix some bogus parameters in queries sent by the SOGo connector.
         // issue submitted in http://www.sogo.nu/bugs/view.php?id=2655
-        // $xpath = new \DOMXPath($dom);
-        // $xpath->registerNameSpace('card', Plugin::NS_CARDDAV);
-
-        // $filters = $xpath->query('/card:addressbook-query/card:filter');
-        // if ($filters->length === 1) {
-        //     $filter = $filters->item(0);
-        //     $propFilters = $xpath->query('card:prop-filter', $filter);
-        //     for ($ii=0; $ii < $propFilters->length; $ii++) {
-        //         $propFilter = $propFilters->item($ii);
-        //         $name = $propFilter->getAttribute('name');
-
-        //         // attribute 'mail' => EMAIL
-        //         if ($name == 'mail') {
-        //             $propFilter->setAttribute('name', 'EMAIL');
-        //         }
-
-        //         $textMatches = $xpath->query('card:text-match', $propFilter);
-        //         for ($jj=0; $jj < $textMatches->length; $jj++) {
-        //             $textMatch = $textMatches->item($jj);
-        //             $collation = $textMatch->getAttribute('collation');
-
-        //             // 'i;unicasemap' is a non-standard collation
-        //             if ($collation == 'i;unicasemap') {
-        //                 $textMatch->setAttribute('collation', 'i;unicode-casemap');
-        //             }
-        //         }
-        //     }
-        // }
+        $xpath = new \DOMXPath($dom);
+        $xpath->registerNameSpace('card', Plugin::NS_CARDDAV);
+
+        $filters = $xpath->query('/card:addressbook-query/card:filter');
+        if ($filters->length === 1) {
+            $filter = $filters->item(0);
+            $propFilters = $xpath->query('card:prop-filter', $filter);
+            for ($ii=0; $ii < $propFilters->length; $ii++) {
+                $propFilter = $propFilters->item($ii);
+                $name = $propFilter->getAttribute('name');
+
+                // attribute 'mail' => EMAIL
+                if ($name == 'mail') {
+                    $propFilter->setAttribute('name', 'EMAIL');
+                }
+
+                $textMatches = $xpath->query('card:text-match', $propFilter);
+                for ($jj=0; $jj < $textMatches->length; $jj++) {
+                    $textMatch = $textMatches->item($jj);
+                    $collation = $textMatch->getAttribute('collation');
+
+                    // 'i;unicasemap' is a non-standard collation
+                    if ($collation == 'i;unicasemap') {
+                        $textMatch->setAttribute('collation', 'i;unicode-casemap');
+                    }
+                }
+            }
+        }
 
         // query on LDAP node: pass along filter query
-        if ($node instanceof LDAPDirectory || $node instanceof LDAPResources) {
+        if ($node instanceof LDAPDirectory) {
+            $query = new CardDAV\AddressBookQueryParser($dom);
+            $query->parse();
 
             // set query and ...
-            $node->setAddressbookQuery($report);
+            $node->setAddressbookQuery($query);
         }
 
         // ... proceed with default action
-        parent::addressbookQueryReport($report);
+        parent::addressbookQueryReport($dom);
     }
-}
+}
\ No newline at end of file

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/UserAddressBooks.php -> iRony-0.4.tar.gz/lib/Kolab/CardDAV/UserAddressBooks.php Changed

@@ -33,11 +33,10 @@
  *
  * The UserAddressBooks collection contains a list of addressbooks associated with a user
  */
-class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome implements DAV\IExtendedCollection, DAV\IProperties, DAVACL\IACL
+class UserAddressBooks extends \Sabre\CardDAV\UserAddressBooks implements DAV\IExtendedCollection, DAV\IProperties, DAVACL\IACL
 {
     // pseudo-singleton instance
     private $ldap_directory;
-    private $ldap_resources;
 
     /**
      * Returns a list of addressbooks
@@ -56,10 +55,6 @@
             $objs = $this->getLDAPDirectory();
         }
 
-        if (rcube::get_instance()->config->get('kolabdav_ldap_resources')) {
-            $objs = $this->getLDAPResources();
-        }
-
         return $objs;
     }
 
@@ -74,9 +69,6 @@
         if ($name == LDAPDirectory::DIRECTORY_NAME) {
             return $this->getLDAPDirectory();
         }
-        if ($name == LDAPResources::DIRECTORY_NAME) {
-            return $this->getLDAPResources();
-        }
 
         if ($addressbook = $this->carddavBackend->getAddressBookByName($name)) {
             $addressbook'principaluri' = $this->principalUri;
@@ -101,21 +93,6 @@
         return $this->ldap_directory;
     }
 
-    /**
-     * Getter for the singleton instance of the LDAP resources
-     */
-    private function getLDAPResources()
-    {
-        if (!$this->ldap_resources) {
-            $rcube = rcube::get_instance();
-            $config = $rcube->config->get('kolabdav_ldap_resources');
-            $config'debug' = $rcube->config->get('ldap_debug');
-            $this->ldap_resources = new LDAPResources($config, $this->principalUri, $this->carddavBackend);
-        }
-
-        return $this->ldap_resources;
-    }
-
 
     /**
      * Returns the list of properties
@@ -132,7 +109,7 @@
         foreach ($requestedProperties as $prop) {
             switch($prop) {
                 case '{urn:ietf:params:xml:ns:carddav}supported-address-data':
-                    $response$prop = new CardDAV\Xml\Property\SupportedAddressData(ContactsBackend::$supported_address_data);
+                    $response$prop = new CardDAV\Property\SupportedAddressData(ContactsBackend::$supported_address_data);
                     break;
             }
         }

iRony-0.4.8.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php -> iRony-0.4.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php Changed

@@ -28,8 +28,6 @@
 use \rcube_user;
 use \rcube_utils;
 use Sabre\DAV;
-use Sabre\HTTP\RequestInterface;
-use Sabre\HTTP\ResponseInterface;
 
 /**
  *
@@ -66,17 +64,17 @@
                 'pass'  => $password,
             ));
 
-            if ($cache && !$auth'abort' && empty($auth'no-cache')) {
+            if ($cache && !$auth'abort') {
                 $cache->set($cache_key, array(
                     'user'  => $auth'user',
                     'host'  => $auth'host',
-                    'dn'    => $_SESSION'kolab_dn' ?? null,
-                    'vars'  => $_SESSION'kolab_auth_vars' ?? null,
+                    'dn'    => $_SESSION'kolab_dn',
+                    'vars'  => $_SESSION'kolab_auth_vars',
                 ));
             }
 
             // LDAP server failure... send 503 error
-            if (!empty($auth'kolab_ldap_error')) {
+            if ($auth'kolab_ldap_error') {
                 throw new ServiceUnavailable('The service is temporarily unavailable (LDAP failure)');
             }
         }
@@ -88,26 +86,15 @@
         }
 
         // authenticate user against the IMAP server
-        $error = null;
-        $user_id = !empty($auth'abort') ? 0 : $this->_login($auth'user', $auth'pass', $auth'host', $error);
+        $user_id = $auth'abort' ? 0 : $this->_login($auth'user', $auth'pass', $auth'host', $error);
 
         if ($user_id) {
             self::$current_user = $auth'user';
             self::$current_pass = $auth'pass';
 
-            $plugin = $rcube->plugins->exec_hook('ready', array('task' => 'iRony'));
-
             return true;
         }
 
-        if (class_exists('kolab_auth')) {
-            if ($error) {
-                $error_str = rcube::get_instance()->get_storage()->get_error_str();
-            }
-
-            \kolab_auth::log_login_error($auth'user', $error_str ?? null);
-        }
-
         // IMAP server failure... send 503 error
         if ($error == rcube_imap_generic::ERROR_BAD) {
             throw new ServiceUnavailable('The service is temporarily unavailable (Storage failure)');
@@ -130,28 +117,6 @@
     }
 
     /**
-     * When this method is called, the backend must check if authentication was
-     * successful.
-     *
-     * The returned value must be one of the following
-     *
-     * true, "principals/username"
-     * false, "reason for failure"
-     *
-     * @return array
-     */
-    public function check(RequestInterface $request, ResponseInterface $response)
-    {
-        $result = parent::check($request, $response);
-    
-        if ($result0) {
-            $result1 = $this->principalPrefix . $this->getCurrentUser();
-        }
-    
-        return $result;
-    }
-
-    /**
      * Storage host selection
      */
     protected function _select_host($username)
@@ -179,10 +144,8 @@
 
             // take the first entry if $host is not found
             if (is_array($host)) {
-                foreach($host as $key => $val) {
-                    $host = is_numeric($key) ? $val : $key;
-                    break;
-                }
+                list($key, $val) = each($default_host);
+                $host = is_numeric($key) ? $val : $key;
             }
         }
 
@@ -202,7 +165,6 @@
         $storage      = $rcube->get_storage();
         $login_lc     = $rcube->config->get('login_lc');
         $default_port = $rcube->config->get('default_port', 143);
-        $username_domain = $rcube->config->get('username_domain');
 
         // parse $host
         $a_host = parse_url($host);
@@ -217,28 +179,10 @@
             }
         }
 
-        if (empty($port)) {
+        if (!$port) {
             $port = $default_port;
         }
 
-        // Check if we need to add/force domain to username
-        if (!empty($username_domain)) {
-            $domain = is_array($username_domain) ? $username_domain$host : $username_domain;
-
-            if ($domain = rcube_utils::parse_host((string)$domain, $host)) {
-                $pos = strpos($username, '@');
-
-                // force configured domains
-                if ($pos !== false && $rcube->config->get('username_domain_forced')) {
-                    $username = substr($username, 0, $pos) . '@' . $domain;
-                }
-                // just add domain if not specified
-                else if ($pos === false) {
-                    $username .= '@' . $domain;
-                }
-            }
-        }
-
         // Convert username to lowercase. If storage backend
         // is case-insensitive we need to store always the same username
         if ($login_lc) {

iRony-0.4.8.tar.gz/lib/Kolab/DAV/Collection.php -> iRony-0.4.tar.gz/lib/Kolab/DAV/Collection.php Changed

@@ -46,7 +46,8 @@
         $this->children = array();
 
         try {
-            $folders = $this->backend->folder_list($this->path, 1);
+            // @TODO: This should be cached too (out of this class)
+            $folders = $this->backend->folder_list();
             $folders = $folders'list';
         }
         catch (Exception $e) {
@@ -56,8 +57,6 @@
         // get subfolders
         foreach ($folders as $folder) {
             // need root-folders or subfolders of specified folder
-            // TODO: This check at some point can be removed, as chwala
-            // API added support for this
             if (!$path_len || strpos($folder, $this->path . '/') === 0) {
                 $virtual = false;
 
@@ -92,7 +91,7 @@
             catch (Exception $e) {
             }
 
-            foreach ((array) $files as $filename => $file) {
+            foreach ($files as $filename => $file) {
                 $path = Collection::ROOT_DIRECTORY . '/' . $filename;
                 // remove path prefix
                 $filename = substr($filename, $path_len + 1);
@@ -214,7 +213,7 @@
             throw new \Sabre\DAV\Exception\Forbidden('Hidden files are not accepted');
         }
 
-        $folder = (strlen($this->path) ? $this->path . '/' : '') . $name;
+        $folder = $this->path . '/' . $name;
 
         try {
             $this->backend->folder_create($folder);

iRony-0.4.8.tar.gz/lib/Kolab/DAV/File.php -> iRony-0.4.tar.gz/lib/Kolab/DAV/File.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/DAV/Locks/Chwala.php -> iRony-0.4.tar.gz/lib/Kolab/DAV/Locks/Chwala.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/DAV/Node.php -> iRony-0.4.tar.gz/lib/Kolab/DAV/Node.php Changed

@@ -91,7 +91,7 @@
      */
     public function getLastModified()
     {
-        return !empty($this->data'modified') ? $this->data'modified' : null;
+        return $this->data'modified' ? $this->data'modified' : null;
     }
 
     /**
@@ -170,6 +170,8 @@
 
         // $data can be a resource or a string
         if (is_resource($data)) {
+            rewind($data);
+
             // $data can be php://input or php://temp
             // php://input is not seekable, we need to "convert"
             // it to seekable resource, fstat/rewind later will work
@@ -180,9 +182,6 @@
                 rewind($new_data);
                 $data = $new_data;
             }
-            else {
-                rewind($data);
-            }
         }
 
         $filedata = array(
@@ -207,7 +206,7 @@
         if ($error == \file_storage::ERROR_UNAVAILABLE) {
             throw new \Sabre\DAV\Exception\ServiceUnavailable($msg);
         }
-        else if ($error == \file_storage::ERROR_FORBIDDEN) {
+        else if ($error == \kolab_storage::ERROR_FORBIDDEN) {
             throw new \Sabre\DAV\Exception\Forbidden($msg);
         }

iRony-0.4.8.tar.gz/lib/Kolab/DAV/TempFilesPlugin.php -> iRony-0.4.tar.gz/lib/Kolab/DAV/TempFilesPlugin.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/DAVACL/PrincipalBackend.php -> iRony-0.4.tar.gz/lib/Kolab/DAVACL/PrincipalBackend.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/Utils/DAVBackend.php -> iRony-0.4.tar.gz/lib/Kolab/Utils/DAVBackend.php Changed

@@ -39,9 +39,8 @@
     /**
      * Getter for a kolab_storage_folder with the given UID
      *
-     * @param string Folder UID (saved in annotation)
-     * @param string Kolab folder type (for selecting candidates)
-     *
+     * @param string  Folder UID (saved in annotation)
+     * @param string  Kolab folder type (for selecting candidates)
      * @return object \kolab_storage_folder instance
      */
     public static function get_storage_folder($uid, $type)
@@ -53,7 +52,7 @@
             }
         }
 
-        throw new DAV\Exception\NotFound('The requested collection was not found');
+        self::check_storage_folder(null);
     }
 
     /**
@@ -62,7 +61,7 @@
      */
     public static function check_storage_folder($folder)
     {
-        if (empty($folder)) {
+        if ($folder == null) {
             throw new DAV\Exception\NotFound('The requested collection was not found');
         }
 
@@ -110,12 +109,12 @@
     }
 
     /**
-     * Callback handler for property changes on the given folder
+     * Set callback handler for property changes on the given folder
      *
-     * @param kolab_storage_folder $folder    Folder object
-     * @param \Sabre\DAV\PropPatch $propPatch Property updates
+     * @param object $folder kolab_storage_folder instance to operate on
+     * @param oject $propPatch PropPatch instance with the property updates
      */
-    public static function handle_proppatch($folder, \Sabre\DAV\PropPatch $propPatch)
+    public static function handle_propatch($folder, \Sabre\DAV\PropPatch $propPatch)
     {
         $propPatch->handle(
             array('{DAV:}displayname','{http://apple.com/ns/ical/}calendar-color'),
@@ -155,8 +154,7 @@
      *
      * @param object $folder kolab_storage_folder instance to operate on
      * @param object $mutations Hash array with propeties to change
-     *
-     * @return bool|array
+     * @return void
      */
     public static function folder_update($folder, array $mutations)
     {
@@ -170,21 +168,9 @@
                     if ($val == html_entity_decode($folder->get_name(), ENT_COMPAT, RCUBE_CHARSET)) {
                         break;
                     }
-
-                    // This is to fix potential MacOS client bug where
-                    // it sets the calendar name to the folder uid
-                    if ($val === $folder->get_uid()) {
-                        break;
-                    }
-
                     // restrict renaming to personal folders only
                     if ($folder->get_namespace() == 'personal') {
-                        // Sanity check, displayname can't be deleted
-                        if ($val === null) {
-                            break;
-                        }
-
-                        $parts = preg_split('!(*UTF8)(\s*/\s*|\s+»:\s+)!', $val);
+                        $parts = preg_split('!(\s*/\s*|\s+»:\s+)!', $val);
                         $updates'oldname' = $folder->name;
                         $updates'name' = array_pop($parts);
                         $updates'parent' = join('/', $parts);
@@ -224,8 +210,7 @@
                     'file' => __FILE__, 'line' => __LINE__,
                     'message' => "Error updating properties for folder $folder->name:" . kolab_storage::$last_error),
                     true, false);
-
-                throw new DAV\Exception('Internal Server Error');
+                return false;
             }
         }
 
@@ -238,13 +223,12 @@
      * If the creation was a success, an id must be returned that can be used to reference
      * this resource in other methods.
      *
-     * @param array  $properties
+     * @param array $properties
      * @param string $type
      * @param string $uid
-     *
      * @return false|string
      */
-    public static function folder_create($type, array $properties, $uid)
+    public function folder_create($type, array $properties, $uid)
     {
         $props = array(
             'type' => $type,
@@ -290,8 +274,7 @@
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Error creating a new $type folder '$propsname':" . kolab_storage::$last_error),
                 true, false);
-
-            throw new DAV\Exception('Internal Server Error');
+            return false;
         }
 
         // save UID in folder annotations

iRony-0.4.8.tar.gz/lib/Kolab/Utils/DAVLogger.php -> iRony-0.4.tar.gz/lib/Kolab/Utils/DAVLogger.php Changed

@@ -33,8 +33,8 @@
  */
 class DAVLogger extends DAV\ServerPlugin
 {
-    const CONSOLE       = 1;
-    const HTTP_REQUEST  = 2;
+    const CONSOLE = 1;
+    const HTTP_REQUEST = 2;
     const HTTP_RESPONSE = 4;
 
     private $rcube;
@@ -48,7 +48,7 @@
      */
     public function __construct($level = 1)
     {
-        $this->rcube    = rcube::get_instance();
+        $this->rcube = rcube::get_instance();
         $this->loglevel = $level;
     }
 
@@ -78,9 +78,8 @@
         $this->method = $request->getMethod();
 
         // turn on per-user http logging if the destination file exists
-        if ($this->loglevel < 2 && $this->rcube->config->get('per_user_logging', false)
-            && ($log_dir = $this->user_log_dir()) && file_exists($log_dir . '/httpraw')
-        ) {
+        if ($this->loglevel < 2 && $this->rcube->config->get('kolabdav_user_debug', false)
+            && ($log_dir = $this->user_log_dir()) && file_exists($log_dir . '/httpraw')) {
             $this->loglevel |= (self::HTTP_REQUEST | self::HTTP_RESPONSE);
         }
 
@@ -108,13 +107,13 @@
                 $http_headers$hdr = "$hdr: $value";
             }
 
-            rcube::write_log('httpraw', $request->getMethod() . ' ' . $request->getUrl() . ' ' . $_SERVER'SERVER_PROTOCOL' . "\n" .
+            $this->write_log('httpraw', $request->getMethod() . ' ' . $request->getUrl() . ' ' . $_SERVER'SERVER_PROTOCOL' . "\n" .
                join("\n", $http_headers) . "\n\n" . $http_body);
         }
 
         // log to console
         if ($this->loglevel & self::CONSOLE) {
-            rcube::write_log('console', $this->method . ' ' . $request->getUrl());
+           $this->write_log('console', $this->method . ' ' . $request->getUrl());
         }
     }
 
@@ -158,24 +157,20 @@
      */
     public function _exit()
     {
-        // log full HTTP reponse
-        if ($this->loglevel & self::HTTP_RESPONSE) {
-            rcube::write_log('httpraw', "RESPONSE: " . $this->server->httpResponse->dump());
-        }
-
-        if (($this->loglevel & self::CONSOLE) || $this->rcube->config->get('performance_stats')) {
+        if ($this->loglevel & self::CONSOLE) {
             $time = microtime(true) - KOLAB_DAV_START;
 
             if (function_exists('memory_get_usage'))
-                $mem = round(memory_get_usage() / 1024 / 1024, 1);
+               $mem = round(memory_get_usage() / 1024 / 1024, 1) . 'MB';
             if (function_exists('memory_get_peak_usage'))
-                $mem .= '/' . round(memory_get_peak_usage() / 1024 / 1024, 1);
+               $mem .= '/' . round(memory_get_peak_usage() / 1024 / 1024, 1) . 'MB';
 
-            // we have to disable per_user_logging to make sure stats end up in the main console log
-            $this->rcube->config->set('per_user_logging', false);
+            $this->write_log('console', sprintf("/%s: %0.4f sec; %s", $this->method, $time, $mem));
+        }
 
-            rcube::write_log('console', sprintf("%s:%s %s %0.4f sec",
-                $this->method ?: $_SERVER'REQUEST_METHOD', $_SERVER'REQUEST_URI', $mem, $time));
+        // log full HTTP reponse
+        if ($this->loglevel & self::HTTP_RESPONSE) {
+            $this->write_log('httpraw', "RESPONSE: " . $this->server->httpResponse->dump());
         }
     }
 
@@ -190,11 +185,29 @@
                 $msg = !is_string($arg) ? var_export($arg, true) : $arg;
             }
 
-            rcube::write_log('console', join(";\n", $msg));
+            $this->write_log('console', join(";\n", $msg));
         }
     }
 
     /**
+     * Wrapper for rcube::write_log() that can write per-user logs
+     */
+    public function write_log($filename, $msg)
+    {
+        // dump data per user
+        if ($this->rcube->config->get('kolabdav_user_debug', false)) {
+            if ($this->user_log_dir()) {
+               $filename = HTTPBasic::$current_user . '/' . $filename;
+            }
+            else {
+               return;  // don't log
+            }
+        }
+
+        rcube::write_log($filename, $msg);
+    }
+
+    /**
      * Get the per-user log directory
      */
     private function user_log_dir()
@@ -204,4 +217,4 @@
 
         return HTTPBasic::$current_user && is_writable($user_log_dir) ? $user_log_dir : false;
     }
-}
+} 
\ No newline at end of file

iRony-0.4.8.tar.gz/public_html/index.php -> iRony-0.4.tar.gz/public_html/index.php Changed

@@ -26,7 +26,7 @@
 
 // define some environment variables used throughout the app and libraries
 define('KOLAB_DAV_ROOT', realpath('../'));
-define('KOLAB_DAV_VERSION', '0.4.3');
+define('KOLAB_DAV_VERSION', '0.4-dev');
 define('KOLAB_DAV_START', microtime(true));
 
 define('RCUBE_INSTALL_PATH', KOLAB_DAV_ROOT . '/');
@@ -69,7 +69,7 @@
 $rcube->plugins->load_plugins($plugins, $required);
 
 // enable logger
-if ($rcube->config->get('kolabdav_console') || $rcube->config->get('per_user_logging')) {
+if ($rcube->config->get('kolabdav_console') || $rcube->config->get('kolabdav_user_debug')) {
     $logger = new \Kolab\Utils\DAVLogger((\Kolab\Utils\DAVLogger::CONSOLE | $rcube->config->get('kolabdav_http_log', 0)));
 }
 
@@ -123,12 +123,12 @@
 
     if ($services'CALDAV') {
         $caldav_backend = new \Kolab\CalDAV\CalendarBackend();
-        $caldav_backend->setUserAgent($_SERVER'HTTP_USER_AGENT' ?? '');
+        $caldav_backend->setUserAgent($_SERVER'HTTP_USER_AGENT');
         $nodes = new \Kolab\CalDAV\CalendarRootNode($principal_backend, $caldav_backend);
     }
     if ($services'CARDDAV') {
         $carddav_backend = new \Kolab\CardDAV\ContactsBackend();
-        $carddav_backend->setUserAgent($_SERVER'HTTP_USER_AGENT' ?? '');
+        $carddav_backend->setUserAgent($_SERVER'HTTP_USER_AGENT');
         $nodes = new \Kolab\CardDAV\AddressBookRoot($principal_backend, $carddav_backend);
     }
     if ($services'WEBDAV') {
@@ -145,16 +145,13 @@
 $server->setBaseUri($base_uri);
 
 // connect logger
-if (isset($logger) && is_object($logger)) {
+if (is_object($logger)) {
     $server->addPlugin($logger);
 }
 
 // register some plugins
 $server->addPlugin(new \Sabre\DAV\Auth\Plugin($auth_backend, 'KolabDAV'));
-// Unauthenticated access doesn't work for us since we require credentials to get access to the data in the first place.
-$aclPlugin = new \Sabre\DAVACL\Plugin();
-$aclPlugin->allowUnauthenticatedAccess = false;
-$server->addPlugin($aclPlugin);
+$server->addPlugin(new \Sabre\DAVACL\Plugin());
 
 if ($services'CALDAV') {
     $server->addPlugin(new \Kolab\CalDAV\Plugin());

iRony-0.4.8.tar.gz/test/Unit/CardDAV/ContactsBackend.php -> iRony-0.4.tar.gz/test/Unit/CardDAV/ContactsBackend.php Changed

@@ -1,118 +1,28 @@
 <?php
 
 use Kolab\CardDAV\ContactsBackend;
-use PHPUnit\Framework\TestCase;
 
-class ContactsBackendTest extends TestCase
+class ContactsBackendTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * Test vCard PHOTO (T1082)
-     */
-    function test_T1082()
-    {
-        $backend = new ContactsBackend;
-        $contact = array(
-            'uid'   => '',
-            'name'  => 'Test',
-            'photo' => base64_decode('R0lGODlhDwAPAIAAAMDAwAAAACH5BAEAAAAALAAAAAAPAA8AQAINhI+py+0Po5y02otnAQA7'),
-        );
-
-        $vcard = $backend->to_vcard($contact);
-
-        $this->assertMatchesRegularExpression('/PHOTO;ENCODING=b;TYPE=GIF:R0l/', $vcard);
-    }
-
-    /**
-     * Test vCard PHOTO (T2043)
-     *
-     * @dataProvider data_T2043
-     */
-    function test_T2043($input, $output, $version)
+    function setUp()
     {
-        $backend = new ContactsBackend;
-        $vcard   = "BEGIN:VCARD\nVERSION:$version\nN:Thompson;Default;;;\nUID:1\n$input\nEND:VCARD";
-        $contact = $backend->parse_vcard($vcard);
-
-        $this->assertSame($output, $contact'photo' ?? null);
     }
 
-    function data_T2043()
-    {
-        return array(
-            array('PHOTO;JPEG;ENCODING=BASE64:' . base64_encode('abc'), 'abc', '2.1'),
-            array('PHOTO;TYPE=JPEG;ENCODING=b:' . base64_encode('abc'), 'abc', '3.0'),
-            array('PHOTO:data:image/jpeg;base64,'. base64_encode('abc'), 'abc', '4.0'),
-            // As we do not support photo URLs yet we expect NULL here
-            //array('PHOTO;JPEG:http://example.com/photo.jpg', null, '2.1'), // invalid?
-            array('PHOTO;TYPE=JPEG;VALUE=URI:http://example.com/photo.jpg', null, '3.0'),
-            array('PHOTO;MEDIATYPE=image/jpeg:http://example.com/photo.jpg', null, '4.0'),
-        );
-    }
 
     /**
-     * Test vCard BDAY/ANNIVERSARY input (T2492)
-     *
-     * @dataProvider data_T2492
+     * Test vCard PHOTO (T1082)
      */
-    function test_T2492($input, $output, $key)
+    function test_T1082()
     {
         $backend = new ContactsBackend;
-        $vcard   = "BEGIN:VCARD\nVERSION:4.0\nN:Thompson;Default;;;\nUID:1\n$input\nEND:VCARD";
-        $contact = $backend->parse_vcard($vcard);
-
-        if ($result = ($contact$key ?? null)) {
-            $result = $result->format('Ymd');
-        }
-
-        $this->assertSame($output, $result);
-    }
-
-    function data_T2492()
-    {
-        return array(
-            array("BDAY:19960415", "19960415", 'birthday'),
-            array("BDAY:19960415T231000Z", "19960415", 'birthday'),
-            array("BDAY:--0415", date('Y')."0415", 'birthday'),
-            array("BDAY;VALUE=text:circa 1800", null, 'birthday'),
-            array("ANNIVERSARY:19960415", "19960415", 'anniversary'),
-            array("ANNIVERSARY:19960415T231000Z", "19960415", 'anniversary'),
-            array("ANNIVERSARY:--0415", date('Y')."0415", 'anniversary'),
-            array("ANNIVERSARY;VALUE=text:circa 1800", null, 'anniversary'),
-        );
-    }
-
-    /**
-     * Test basic vCard generation
-     */
-    function test_to_vcard()
-    {
-        $backend = new ContactsBackend();
         $contact = array(
-            'uid'   => '123',
+            'uid'   => '',
             'name'  => 'Test',
-            'phone' => array(
-                array (
-                    'number' => '+48',
-                    'type' => 'home',
-                ),
-            ),
+            'photo' => base64_decode('R0lGODlhDwAPAIAAAMDAwAAAACH5BAEAAAAALAAAAAAPAA8AQAINhI+py+0Po5y02otnAQA7'),
         );
 
         $vcard = $backend->to_vcard($contact);
 
-        $prodid = '-//Kolab//iRony DAV Server ' . KOLAB_DAV_VERSION . '//Sabre//Sabre VObject ' . Sabre\VObject\Version::VERSION . '//EN';
-        $expected = <<<EOF
-            BEGIN:VCARD\r
-            VERSION:3.0\r
-            PRODID:$prodid\r
-            UID:123\r
-            FN:Test\r
-            TEL;TYPE=HOME:+48\r
-            END:VCARD\r
-            EOF;
-
-        $this->assertSame(trim($expected), trim($vcard));
-
-        // TODO: Test all contact/group properties
+        $this->assertRegexp('/PHOTO;ENCODING=b;TYPE=GIF:R0l/', $vcard);
     }
 }

iRony-0.4.8.tar.gz/test/bootstrap.php -> iRony-0.4.tar.gz/test/bootstrap.php Changed

iRony.dsc Changed

iRony.logrotate Changed

Overview

Request 1900 (superseded)

Request History