Kolab Groupware OBS

Changes of Revision 30

iRony.spec Changed

@@ -37,7 +37,7 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:           iRony
-Version:        0.4.5
+Version:        0.4.6
 Release:	    1%{?dist}
 Summary:        DAV for Kolab Groupware
 
@@ -53,12 +53,6 @@
 BuildArch:      noarch
 
 Requires:       chwala >= 0.5.2
-%if 0%{?rhel} < 8
-Requires:       php-sabre-dav >= 2.1.11
-Requires:       php-sabre-event >= 2.0.2
-Requires:       php-sabre-http >= 3.0.5
-Requires:       php-sabre-vobject >= 3.5.3
-%endif
 Requires:       roundcubemail(core) >= 1.3
 %if 0%{?plesk} < 1
 Requires:       roundcubemail-plugin-kolab_auth >= 3.3.6
@@ -109,19 +103,6 @@
 %setup -q
 
 %build
-rm -rvf vendor/sabre
-
-%if 0%{?rhel} < 8
-rm -rf composer.json
-mv composer.json-dist composer.json
-mkdir -p $HOME/.composer/
-echo '{}' > $HOME/.composer/composer.json
-%if 0%{?fedora} >= 25
-# workaround for misbehaving Kolab modules for PHP7, probably a swig issue
-export USE_ZEND_ALLOC=0
-%endif
-composer -vvv dumpautoload --optimize
-%endif
 
 %install
 mkdir -p \
@@ -162,6 +143,11 @@
 ln -s ../../../..%{_sysconfdir}/roundcubemail/config.inc.php
 popd
 
+%if 0%{?rhel} < 8
+rm -rf vendor
+ln -s ../roundcubemail/vendor vendor
+%endif
+
 rm -rf lib/Roundcube
 pushd lib/
 ln -s ../../chwala/lib FileAPI
@@ -185,8 +171,8 @@
 %if 0%{?plesk} < 1
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
 %endif
-%attr(0750,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
-%attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/dav.inc.php
+%attr(0755,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
+%attr(0644,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}
@@ -194,6 +180,10 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Sat Dec 25 2020 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

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

debian.changelog Changed

debian.rules Changed

debian.series Changed

iRony-0.4.5.tar.gz/composer.lock -> iRony-0.4.6.tar.gz/composer.lock Changed

@@ -78,6 +78,11 @@
                 "framework",
                 "iCalendar"
             ,
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/dav/issues",
+                "source": "https://github.com/fruux/sabre-dav"
+            },
             "time": "2016-10-07T03:29:06+00:00"
         },
         {
@@ -129,6 +134,11 @@
                 "promise",
                 "signal"
             ,
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/event/issues",
+                "source": "https://github.com/fruux/sabre-event"
+            },
             "time": "2015-05-19T10:24:22+00:00"
         },
         {
@@ -180,6 +190,11 @@
             "keywords": 
                 "http"
             ,
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/http/issues",
+                "source": "https://github.com/fruux/sabre-http"
+            },
             "time": "2015-05-11T15:25:57+00:00"
         },
         {
@@ -246,42 +261,42 @@
                 "jCard",
                 "vCard"
             ,
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/vobject/issues",
+                "source": "https://github.com/fruux/sabre-vobject"
+            },
             "time": "2016-10-07T03:20:40+00:00"
         }
     ,
     "packages-dev": 
         {
             "name": "doctrine/instantiator",
-            "version": "1.3.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
-                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
+                "doctrine/coding-standard": "^8.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-shim": "^0.11",
-                "phpunit/phpunit": "^7.0"
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@@ -295,7 +310,7 @@
                 {
                     "name": "Marco Pivetta",
                     "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "homepage": "https://ocramius.github.io/"
                 }
             ,
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
@@ -304,6 +319,10 @@
                 "constructor",
                 "instantiate"
             ,
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
             "funding": 
                 {
                     "url": "https://www.doctrine-project.org/sponsorship.html",
@@ -318,7 +337,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2020-05-29T17:27:14+00:00"
+            "time": "2020-11-10T18:47:58+00:00"
         },
         {
             "name": "kolab/net_ldap3",
@@ -326,12 +345,13 @@
             "source": {
                 "type": "git",
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
-                "reference": "e1835e36fa5d3434f9804670fc3cdd16992ec66a"
+                "reference": "ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
                 "php": ">=5.3.3"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
                 "classmap": 
@@ -365,7 +385,7 @@
                 "pear",
                 "vlv"
             ,
-            "time": "2019-10-21T11:18:59+00:00"
+            "time": "2021-11-11T09:02:56+00:00"
         },
         {
             "name": "pear/auth_sasl",
@@ -418,6 +438,10 @@
                 }
             ,
             "description": "Abstraction of various SASL mechanism responses",
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Auth_SASL",
+                "source": "https://github.com/pear/Auth_SASL"
+            },
             "time": "2017-03-07T14:37:05+00:00"
         },
         {
@@ -465,24 +489,29 @@
                 }
             ,
             "description": "More info available on: http://pear.php.net/package/Console_Getopt",
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Console_Getopt",
+                "source": "https://github.com/pear/Console_Getopt"
+            },
             "time": "2019-11-20T18:27:48+00:00"
         },
         {
             "name": "pear/mail_mime",
-            "version": "1.10.9",
+            "version": "1.10.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail_Mime.git",
-                "reference": "1e7ae4e5258b6c0d385a8e76add567934245d38d"
+                "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/1e7ae4e5258b6c0d385a8e76add567934245d38d",
-                "reference": "1e7ae4e5258b6c0d385a8e76add567934245d38d",
+                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/d4fb9ce61201593d0f8c6db629c45e29c3409c14",
+                "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14",
                 "shasum": ""
             },
             "require": {
-                "pear/pear-core-minimal": "*"
+                "pear/pear-core-minimal": "*",
+                "php": ">=5.2.0"
             },
             "type": "library",
             "autoload": {
@@ -495,7 +524,7 @@
                 "./"
             ,
             "license": 
-                "BSD-3-clause"
+                "BSD-3-Clause"
             ,
             "authors": 
                 {
@@ -511,7 +540,11 @@
             ,
             "description": "Mail_Mime provides classes to create MIME messages",
             "homepage": "http://pear.php.net/package/Mail_Mime",
-            "time": "2020-06-27T08:35:27+00:00"
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Mail_Mime",
+                "source": "https://github.com/pear/Mail_Mime"
+            },
+            "time": "2021-09-05T08:42:45+00:00"
         },
         {
             "name": "pear/net_idna2",
@@ -559,6 +592,10 @@
                 }
             ,
             "description": "More info available on: https://pear.php.net/package/Net_IDNA2",
+            "support": {
+                "issues": "https://pear.php.net/bugs/search.php?cmd=display&package_name=Net_IDNA2",
+                "source": "https://github.com/pear/Net_IDNA2"
+            },
             "time": "2017-03-06T20:46:41+00:00"
         },
         {
@@ -598,6 +635,10 @@
                 "PEAR",
                 "ldap"
             ,
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Net_LDAP2",
+                "source": "https://github.com/pear/Net_LDAP2"
+            },
             "time": "2015-10-30T20:34:22+00:00"
         },
         {
@@ -658,6 +699,10 @@
                 "mail",
                 "smtp"
             ,
+            "support": {
+                "issues": "https://github.com/pear/Net_SMTP/issues",
+                "source": "https://github.com/pear/Net_SMTP"
+            },
             "time": "2017-01-14T18:19:55+00:00"
         },
         {
@@ -711,20 +756,24 @@
                 }
             ,
             "description": "More info available on: http://pear.php.net/package/Net_Socket",
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Net_Socket",
+                "source": "https://github.com/pear/Net_Socket"
+            },
             "time": "2015-03-22T15:48:19+00:00"
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.10",
+            "version": "v1.10.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "625a3c429d9b2c1546438679074cac1b089116a7"
+                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7",
-                "reference": "625a3c429d9b2c1546438679074cac1b089116a7",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d",
+                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d",
                 "shasum": ""
             },
             "require": {
@@ -755,27 +804,31 @@
                 }
             ,
             "description": "Minimal set of PEAR core files to be used as composer dependency",
-            "time": "2019-11-19T19:00:24+00:00"
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=PEAR",
+                "source": "https://github.com/pear/pear-core-minimal"
+            },
+            "time": "2021-08-10T22:31:03+00:00"
         },
         {
             "name": "pear/pear_exception",
-            "version": "v1.0.1",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/PEAR_Exception.git",
-                "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7"
+                "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
-                "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
+                "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/b14fbe2ddb0b9f94f5b24cf08783d599f776fff0",
+                "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=4.4.0"
+                "php": ">=5.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "<9"
             },
             "type": "class",
             "extra": {
@@ -810,7 +863,11 @@
             "keywords": 
                 "exception"
             ,
-            "time": "2019-12-10T10:24:42+00:00"
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=PEAR_Exception",
+                "source": "https://github.com/pear/PEAR_Exception"
+            },
+            "time": "2021-03-21T15:43:46+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -872,6 +929,11 @@
                 "testing",
                 "xunit"
             ,
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/2.2"
+            },
             "time": "2015-10-06T15:47:00+00:00"
         },
         {
@@ -917,6 +979,11 @@
                 "filesystem",
                 "iterator"
             ,
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.3.4"
+            },
             "time": "2013-10-10T15:34:57+00:00"
         },
         {
@@ -958,6 +1025,10 @@
             "keywords": 
                 "template"
             ,
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
@@ -1007,6 +1078,10 @@
             "keywords": 
                 "timer"
             ,
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
             "time": "2017-02-26T11:10:40+00:00"
         },
         {
@@ -1056,6 +1131,10 @@
             "keywords": 
                 "tokenizer"
             ,
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/1.4"
+            },
             "abandoned": true,
             "time": "2017-12-04T08:55:13+00:00"
         },
@@ -1129,6 +1208,11 @@
                 "testing",
                 "xunit"
             ,
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/4.4.5"
+            },
             "time": "2015-01-27T16:06:15+00:00"
         },
         {
@@ -1185,6 +1269,11 @@
                 "mock",
                 "xunit"
             ,
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/2.3"
+            },
             "abandoned": true,
             "time": "2015-10-02T06:51:40+00:00"
         },
@@ -1250,6 +1339,10 @@
                 "compare",
                 "equality"
             ,
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/1.2"
+            },
             "time": "2017-01-29T09:50:25+00:00"
         },
         {
@@ -1302,6 +1395,10 @@
             "keywords": 
                 "diff"
             ,
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/1.4"
+            },
             "time": "2017-05-22T07:24:03+00:00"
         },
         {
@@ -1352,6 +1449,10 @@
                 "environment",
                 "hhvm"
             ,
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/1.3"
+            },
             "time": "2016-08-18T05:49:44+00:00"
         },
         {
@@ -1419,6 +1520,10 @@
                 "export",
                 "exporter"
             ,
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/master"
+            },
             "time": "2016-06-17T09:04:28+00:00"
         },
         {
@@ -1470,6 +1575,10 @@
             "keywords": 
                 "global state"
             ,
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/1.1.1"
+            },
             "time": "2015-10-12T03:26:01+00:00"
         },
         {
@@ -1523,6 +1632,10 @@
             ,
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/master"
+            },
             "time": "2016-10-03T07:41:43+00:00"
         },
         {
@@ -1558,24 +1671,31 @@
             ,
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/1.0.6"
+            },
             "time": "2015-06-21T13:59:46+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
@@ -1583,7 +1703,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1620,6 +1740,9 @@
                 "polyfill",
                 "portable"
             ,
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
+            },
             "funding": 
                 {
                     "url": "https://symfony.com/sponsor",
@@ -1634,7 +1757,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -1684,6 +1807,9 @@
             ,
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v2.8.52"
+            },
             "time": "2018-11-11T11:18:13+00:00"
         }
     ,
@@ -1698,5 +1824,5 @@
         "php": ">=5.4.1"
     },
     "platform-dev": ,
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.2.0"
 }

iRony-0.4.5.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php -> iRony-0.4.6.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php Changed

iRony-0.4.5.tar.gz/lib/Roundcube/bootstrap.php -> iRony-0.4.6.tar.gz/lib/Roundcube/bootstrap.php Changed

iRony-0.4.5.tar.gz/lib/Roundcube/rcube_imap.php -> iRony-0.4.6.tar.gz/lib/Roundcube/rcube_imap.php Changed

iRony-0.4.5.tar.gz/lib/Roundcube/rcube_ldap.php -> iRony-0.4.6.tar.gz/lib/Roundcube/rcube_ldap.php Changed

iRony-0.4.5.tar.gz/lib/Roundcube/rcube_message.php -> iRony-0.4.6.tar.gz/lib/Roundcube/rcube_message.php Changed

@@ -49,6 +49,7 @@
     private $mime;
     private $opt = array();
     private $parse_alternative = false;
+    private $tnef_decode = false;
 
     public $uid;
     public $folder;
@@ -104,6 +105,8 @@
             return;
         }
 
+        $this->tnef_decode = (bool) $this->app->config->get('tnef_decode', true);
+
         $this->set_safe($is_safe || $_SESSION'safe_messages'$this->folder.':'.$uid);
         $this->opt = array(
             'safe'        => $this->is_safe,
@@ -378,7 +381,13 @@
                     $last      = $parent->real_mimetype ?: $parent->mimetype;
 
                     if (!preg_match('/^multipart\/(alternative|related|signed|encrypted|mixed)$/', $last)
-                        || ($last == 'multipart/mixed' && $parent_depth < $max_delta)) {
+                        || ($last == 'multipart/mixed' && $parent_depth < $max_delta)
+                    ) {
+                        // The HTML body part extracted from a winmail.dat attachment part
+                        if (strpos($part->mime_id, 'winmail.') === 0) {
+                            return true;
+                        }
+
                         continue 2;
                     }
                 }
@@ -817,11 +826,35 @@
                     continue;
                 }
                 // part is Microsoft Outlook TNEF (winmail.dat)
-                else if ($part_mimetype == 'application/ms-tnef') {
+                else if ($part_mimetype == 'application/ms-tnef' && $this->tnef_decode) {
                     $tnef_parts = (array) $this->tnef_decode($mail_part);
+                    $tnef_body  = '';
+
                     foreach ($tnef_parts as $tpart) {
                         $this->mime_parts$tpart->mime_id = $tpart;
-                        $this->add_part($tpart, 'attachment');
+
+                        if (strpos($tpart->mime_id, '.html')) {
+                            $tnef_body = $tpart->body;
+                            if ($this->opt'prefer_html') {
+                                $tpart->type = 'content';
+
+                                // Reset type on the plain text part that usually is added to winmail.dat messages
+                                // (on the same level in the structure as the attachment itself)
+                                $level = count(explode('.', $mail_part->mime_id));
+                                foreach ($this->parts as $p) {
+                                    if ($p->type == 'content' && $p->mimetype == 'text/plain'
+                                        && count(explode('.', $p->mime_id)) == $level
+                                    ) {
+                                        $p->type = null;
+                                    }
+                                }
+                            }
+                            $this->add_part($tpart);
+                        }
+                        else {
+                            $inline = !empty($tpart->content_id) && strpos($tnef_body, "cid:{$tpart->content_id}") !== false;
+                            $this->add_part($tpart, $inline ? 'inline' : 'attachment');
+                        }
                     }
 
                     // add winmail.dat to the list if it's content is unknown
@@ -1002,6 +1035,26 @@
 
         unset($body);
 
+        // HTML body
+        if (
+            !empty($tnef_arr'message')
+            && !empty($tnef_arr'message''size')
+            && $tnef_arr'message''subtype' == 'html'
+        ) {
+            $tpart = new rcube_message_part;
+
+            $tpart->encoding        = 'stream';
+            $tpart->ctype_primary   = 'text';
+            $tpart->ctype_secondary = 'html';
+            $tpart->mimetype        = 'text/html';
+            $tpart->mime_id         = 'winmail.' . $part->mime_id . '.html';
+            $tpart->size            = $tnef_arr'message''size';
+            $tpart->body            = $tnef_arr'message''stream';
+
+            $parts = $tpart;
+        }
+
+        // Attachments
         foreach ($tnef_arr'attachments' as $pid => $winatt) {
             $tpart = new rcube_message_part;
 
@@ -1014,6 +1067,10 @@
             $tpart->size            = $winatt'size';
             $tpart->body            = $winatt'stream';
 
+            if (!empty($winatt'content-id')) {
+                $tpart->content_id = $winatt'content-id';
+            }
+
             $parts = $tpart;
             unset($tnef_arr$pid);
         }

iRony-0.4.5.tar.gz/lib/Roundcube/rcube_string_replacer.php -> iRony-0.4.6.tar.gz/lib/Roundcube/rcube_string_replacer.php Changed

@@ -25,7 +25,7 @@
  */
 class rcube_string_replacer
 {
-    public static $pattern = '/##str_replacement_(\d+)##/';
+    public $pattern;
     public $mailto_pattern;
     public $link_pattern;
     public $linkref_index;
@@ -45,6 +45,10 @@
      */
     function __construct($options = array())
     {
+        // Create hard-to-guess replacement string
+        $uniq_ident    = sprintf('%010d%010d', mt_rand(), mt_rand());
+        $this->pattern = '/##' . $uniq_ident . '##(\d+)##/';
+
         // Simplified domain expression for UTF8 characters handling
         // Support unicode/punycode in top-level domain part
         $utf_domain = '^?&@"\'\\/()<>\s\r\t\n+\\.?(^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f{2,}|xn--a-zA-Z0-9{2,})';
@@ -55,7 +59,7 @@
         $link_prefix = "(\w+:\/\/|{$this->noword}WwWwWw\.|^WwWwWw\.)";
 
         $this->options         = $options;
-        $this->linkref_index   = '/\(^\#+)\(:?\s*##str_replacement_(\d+)##)/';
+        $this->linkref_index   = '/\(^\#+)\(:?\s*' . substr($this->pattern, 1, -1) . ')/';
         $this->linkref_pattern = '/\(^\#+)\/';
         $this->link_pattern    = "/$link_prefix($utf_domain($url1*$url2+)*)/";
         $this->mailto_pattern  = "/("
@@ -88,7 +92,7 @@
      */
     public function get_replacement($i)
     {
-        return '##str_replacement_' . $i . '##';
+        return str_replace('(\d+)', $i, substr($this->pattern, 1, -1));
     }
 
     /**
@@ -135,7 +139,7 @@
     public function linkref_addindex($matches)
     {
         $key = $matches1;
-        $this->linkrefs$key = $this->urls$matches3;
+        $this->linkrefs$key = isset($this->urls$matches3) ? $this->urls$matches3 : null;
 
         return $this->get_replacement($this->add(''.$key.'')) . $matches2;
     }
@@ -185,7 +189,7 @@
      */
     public function replace_callback($matches)
     {
-        return $this->values$matches1;
+        return isset($this->values$matches1) ? $this->values$matches1 : null;
     }
 
     /**
@@ -216,7 +220,7 @@
      */
     public function resolve($str)
     {
-        return preg_replace_callback(self::$pattern, array($this, 'replace_callback'), $str);
+        return preg_replace_callback($this->pattern, array($this, 'replace_callback'), $str);
     }
 
     /**

iRony-0.4.5.tar.gz/lib/Roundcube/rcube_tnef_decoder.php -> iRony-0.4.6.tar.gz/lib/Roundcube/rcube_tnef_decoder.php Changed

iRony-0.4.5.tar.gz/lib/Roundcube/rcube_utils.php -> iRony-0.4.6.tar.gz/lib/Roundcube/rcube_utils.php Changed

@@ -399,7 +399,7 @@
             $styles = preg_replace('/position^a-z*:\s\r\n*fixed/i', 'position: absolute', $styles);
 
             // Remove 'page' attributes (#7604)
-            $styles = preg_replace('/(^|\n\s;)page:^;+;*/im', '', $styles);
+            $styles = preg_replace('/((^|\n\s;)page:)^;+;*/im', '\\1 unset;', $styles);
 
             // check every line of a style block...
             if ($allow_remote) {
@@ -435,10 +435,10 @@
 
         // add #container to each tag selector and prefix to id/class identifiers
         if ($container_id || $prefix) {
-            // (?!##str) below is to not match with ##str_replacement_0##
-            // from rcube_string_replacer used above, this is needed for
-            // cases like @media { body { position: fixed; } } (#5811)
-            $regexp   = '/(^\s*|,\s*|\}\s*|\{\s*)((?!##str):?a-z0-9\._#\*\a-z0-9\._:#=~ \\"\|\>\+\$\^-*)/im';
+            // Exclude rcube_string_replacer pattern matches, this is needed
+            // for cases like @media { body { position: fixed; } } (#5811)
+            $excl     = '(?!' . substr($replacements->pattern, 1, -1) . ')';
+            $regexp   = '/(^\s*|,\s*|\}\s*|\{\s*)(' . $excl . ':?a-z0-9\._#\*\a-z0-9\._:#=~ \\"\|\>\+\$\^-*)/im';
             $callback = function($matches) use ($container_id, $prefix) {
                 $replace = $matches2;

iRony-0.4.5.tar.gz/lib/Roundcube/spellchecker/googie.php -> iRony-0.4.6.tar.gz/lib/Roundcube/spellchecker/googie.php Changed

iRony-0.4.5.tar.gz/lib/plugins/calendar/calendar.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/calendar.php Changed

@@ -25,3573 +25,3947 @@
 
 class calendar extends rcube_plugin
 {
-  const FREEBUSY_UNKNOWN = 0;
-  const FREEBUSY_FREE = 1;
-  const FREEBUSY_BUSY = 2;
-  const FREEBUSY_TENTATIVE = 3;
-  const FREEBUSY_OOF = 4;
-
-  const SESSION_KEY = 'calendar_temp';
-
-  public $task = '?(?!logout).*';
-  public $rc;
-  public $lib;
-  public $resources_dir;
-  public $home;  // declare public to be used in other classes
-  public $urlbase;
-  public $timezone;
-  public $timezone_offset;
-  public $gmt_offset;
-  public $ui;
-
-  public $defaults = array(
-    'calendar_default_view' => "agendaWeek",
-    'calendar_timeslots'    => 2,
-    'calendar_work_start'   => 6,
-    'calendar_work_end'     => 18,
-    'calendar_agenda_range' => 60,
-    'calendar_event_coloring'  => 0,
-    'calendar_time_indicator'  => true,
-    'calendar_allow_invite_shared' => false,
-    'calendar_itip_send_option'    => 3,
-    'calendar_itip_after_action'   => 0,
-  );
-
-// These are implemented with __get()
-//  private $ical;
-//  private $itip;
-//  private $driver;
-
-
-  /**
-   * Plugin initialization.
-   */
-  function init()
-  {
-    $this->rc = rcube::get_instance();
-
-    $this->register_task('calendar', 'calendar');
-
-    // load calendar configuration
-    $this->load_config();
-
-    // catch iTIP confirmation requests that don're require a valid session
-    if ($this->rc->action == 'attend' && !empty($_REQUEST'_t')) {
-      $this->add_hook('startup', array($this, 'itip_attend_response'));
-    }
-    else if ($this->rc->action == 'feed' && !empty($_REQUEST'_cal')) {
-      $this->add_hook('startup', array($this, 'ical_feed_export'));
-    }
-    else if ($this->rc->task != 'login') {
-      // default startup routine
-      $this->add_hook('startup', array($this, 'startup'));
-    }
-
-    $this->add_hook('user_delete', array($this, 'user_delete'));
-  }
-
-  /**
-   * Setup basic plugin environment and UI
-   */
-  protected function setup()
-  {
-    $this->require_plugin('libcalendaring');
-    $this->require_plugin('libkolab');
-
-    $this->lib             = libcalendaring::get_instance();
-    $this->timezone        = $this->lib->timezone;
-    $this->gmt_offset      = $this->lib->gmt_offset;
-    $this->dst_active      = $this->lib->dst_active;
-    $this->timezone_offset = $this->gmt_offset / 3600 - $this->dst_active;
-
-    // load localizations
-    $this->add_texts('localization/', $this->rc->task == 'calendar' && (!$this->rc->action || $this->rc->action == 'print'));
-
-    require($this->home . '/lib/calendar_ui.php');
-    $this->ui = new calendar_ui($this);
-  }
-
-  /**
-   * Startup hook
-   */
-  public function startup($args)
-  {
-    // the calendar module can be enabled/disabled by the kolab_auth plugin
-    if ($this->rc->config->get('calendar_disabled', false) || !$this->rc->config->get('calendar_enabled', true))
-        return;
-
-    $this->setup();
-
-    // load Calendar user interface
-    if (!$this->rc->output->ajax_call && (!$this->rc->output->env'framed' || $args'action' == 'preview')) {
-      $this->ui->init();
-
-      // settings are required in (almost) every GUI step
-      if ($args'action' != 'attend')
-        $this->rc->output->set_env('calendar_settings', $this->load_settings());
+    const FREEBUSY_UNKNOWN   = 0;
+    const FREEBUSY_FREE      = 1;
+    const FREEBUSY_BUSY      = 2;
+    const FREEBUSY_TENTATIVE = 3;
+    const FREEBUSY_OOF       = 4;
+
+    const SESSION_KEY = 'calendar_temp';
+
+    public $task = '?(?!logout).*';
+    public $rc;
+    public $lib;
+    public $resources_dir;
+    public $home;  // declare public to be used in other classes
+    public $urlbase;
+    public $timezone;
+    public $timezone_offset;
+    public $gmt_offset;
+    public $ui;
+
+    public $defaults = 
+        'calendar_default_view' => "agendaWeek",
+        'calendar_timeslots'    => 2,
+        'calendar_work_start'   => 6,
+        'calendar_work_end'     => 18,
+        'calendar_agenda_range' => 60,
+        'calendar_show_weekno'  => 0,
+        'calendar_first_day'    => 1,
+        'calendar_first_hour'   => 6,
+        'calendar_time_format'  => null,
+        'calendar_event_coloring'      => 0,
+        'calendar_time_indicator'      => true,
+        'calendar_allow_invite_shared' => false,
+        'calendar_itip_send_option'    => 3,
+        'calendar_itip_after_action'   => 0,
+    ;
+
+    // These are implemented with __get()
+    //  private $ical;
+    //  private $itip;
+    //  private $driver;
+
+
+    /**
+     * Plugin initialization.
+     */
+    function init()
+    {
+        $this->rc = rcube::get_instance();
+
+        $this->register_task('calendar', 'calendar');
+
+        // load calendar configuration
+        $this->load_config();
+
+        // catch iTIP confirmation requests that don're require a valid session
+        if ($this->rc->action == 'attend' && !empty($_REQUEST'_t')) {
+            $this->add_hook('startup', $this, 'itip_attend_response');
+        }
+        else if ($this->rc->action == 'feed' && !empty($_REQUEST'_cal')) {
+            $this->add_hook('startup', $this, 'ical_feed_export');
+        }
+        else if ($this->rc->task != 'login') {
+            // default startup routine
+            $this->add_hook('startup', $this, 'startup');
+        }
+
+        $this->add_hook('user_delete', $this, 'user_delete');
+    }
+
+    /**
+     * Setup basic plugin environment and UI
+     */
+    protected function setup()
+    {
+        $this->require_plugin('libcalendaring');
+        $this->require_plugin('libkolab');
+
+        $this->lib             = libcalendaring::get_instance();
+        $this->timezone        = $this->lib->timezone;
+        $this->gmt_offset      = $this->lib->gmt_offset;
+        $this->dst_active      = $this->lib->dst_active;
+        $this->timezone_offset = $this->gmt_offset / 3600 - $this->dst_active;
+
+        // load localizations
+        $this->add_texts('localization/', $this->rc->task == 'calendar' && (!$this->rc->action || $this->rc->action == 'print'));
+
+        require($this->home . '/lib/calendar_ui.php');
+        $this->ui = new calendar_ui($this);
+    }
+
+    /**
+     * Startup hook
+     */
+    public function startup($args)
+    {
+        // the calendar module can be enabled/disabled by the kolab_auth plugin
+        if ($this->rc->config->get('calendar_disabled', false)
+            || !$this->rc->config->get('calendar_enabled', true)
+        ) {
+            return;
+        }
+
+        $this->setup();
+
+        // load Calendar user interface
+        if (!$this->rc->output->ajax_call
+            && (empty($this->rc->output->env'framed') || $args'action' == 'preview')
+        ) {
+            $this->ui->init();
+
+            // settings are required in (almost) every GUI step
+            if ($args'action' != 'attend') {
+                $this->rc->output->set_env('calendar_settings', $this->load_settings());
+            }
+        }
+
+        if ($args'task' == 'calendar' && $args'action' != 'save-pref') {
+            if ($args'action' != 'upload') {
+                $this->load_driver();
+            }
+
+            // register calendar actions
+            $this->register_action('index', $this, 'calendar_view');
+            $this->register_action('event', $this, 'event_action');
+            $this->register_action('calendar', $this, 'calendar_action');
+            $this->register_action('count', $this, 'count_events');
+            $this->register_action('load_events', $this, 'load_events');
+            $this->register_action('export_events', $this, 'export_events');
+            $this->register_action('import_events', $this, 'import_events');
+            $this->register_action('upload', $this, 'attachment_upload');
+            $this->register_action('get-attachment', $this, 'attachment_get');
+            $this->register_action('freebusy-status', $this, 'freebusy_status');
+            $this->register_action('freebusy-times', $this, 'freebusy_times');
+            $this->register_action('randomdata', $this, 'generate_randomdata');
+            $this->register_action('print', $this,'print_view');
+            $this->register_action('mailimportitip', $this, 'mail_import_itip');
+            $this->register_action('mailimportattach', $this, 'mail_import_attachment');
+            $this->register_action('dialog-ui', $this, 'mail_message2event');
+            $this->register_action('check-recent', $this, 'check_recent');
+            $this->register_action('itip-status', $this, 'event_itip_status');
+            $this->register_action('itip-remove', $this, 'event_itip_remove');
+            $this->register_action('itip-decline-reply', $this, 'mail_itip_decline_reply');
+            $this->register_action('itip-delegate', $this, 'mail_itip_delegate');
+            $this->register_action('resources-list', $this, 'resources_list');
+            $this->register_action('resources-owner', $this, 'resources_owner');
+            $this->register_action('resources-calendar', $this, 'resources_calendar');
+            $this->register_action('resources-autocomplete', $this, 'resources_autocomplete');
+            $this->add_hook('refresh', $this, 'refresh');
+
+            // remove undo information...
+            if (!empty($_SESSION'calendar_event_undo')) {
+                $undo = $_SESSION'calendar_event_undo';
+                // ...after timeout
+                $undo_time = $this->rc->config->get('undo_timeout', 0);
+                if ($undo'ts' < time() - $undo_time) {
+                    $this->rc->session->remove('calendar_event_undo');
+                    // @TODO: do EXPUNGE on kolab objects?
+                }
+            }
+        }
+        else if ($args'task' == 'settings') {
+            // add hooks for Calendar settings
+            $this->add_hook('preferences_sections_list', $this, 'preferences_sections_list');
+            $this->add_hook('preferences_list', $this, 'preferences_list');
+            $this->add_hook('preferences_save', $this, 'preferences_save');
+        }
+        else if ($args'task' == 'mail') {
+            // hooks to catch event invitations on incoming mails
+            if ($args'action' == 'show' || $args'action' == 'preview') {
+                $this->add_hook('template_object_messagebody', $this, 'mail_messagebody_html');
+            }
+
+            // add 'Create event' item to message menu
+            if ($this->api->output->type == 'html' && (empty($_GET'_rel') || $_GET'_rel' != 'event')) {
+                $this->api->output->add_label('calendar.createfrommail');
+                $this->api->add_content(
+                    html::tag('li', 'role' => 'menuitem',
+                        $this->api->output->button(
+                            'command'  => 'calendar-create-from-mail',
+                            'label'    => 'calendar.createfrommail',
+                            'type'     => 'link',
+                            'classact' => 'icon calendarlink active',
+                            'class'    => 'icon calendarlink disabled',
+                            'innerclass' => 'icon calendar',
+                        )
+                    ),
+                    'messagemenu'
+                );
+            }
+
+            $this->add_hook('messages_list', $this, 'mail_messages_list');
+            $this->add_hook('message_compose', $this, 'mail_message_compose');
+        }
+        else if ($args'task' == 'addressbook') {
+            if ($this->rc->config->get('calendar_contact_birthdays')) {
+                $this->add_hook('contact_update', $this, 'contact_update');
+                $this->add_hook('contact_create', $this, 'contact_update');
+            }
+        }
+
+        // add hooks to display alarms
+        $this->add_hook('pending_alarms', $this, 'pending_alarms');
+        $this->add_hook('dismiss_alarms', $this, 'dismiss_alarms');
     }
 
-    if ($args'task' == 'calendar' && $args'action' != 'save-pref') {
-      if ($args'action' != 'upload') {
-        $this->load_driver();
-      }
+    /**
+     * Helper method to load the backend driver according to local config
+     */
+    private function load_driver()
+    {
+        if (!empty($this->driver)) {
+            return;
+        }
 
-      // register calendar actions
-      $this->register_action('index', array($this, 'calendar_view'));
-      $this->register_action('event', array($this, 'event_action'));
-      $this->register_action('calendar', array($this, 'calendar_action'));
-      $this->register_action('count', array($this, 'count_events'));
-      $this->register_action('load_events', array($this, 'load_events'));
-      $this->register_action('export_events', array($this, 'export_events'));
-      $this->register_action('import_events', array($this, 'import_events'));
-      $this->register_action('upload', array($this, 'attachment_upload'));
-      $this->register_action('get-attachment', array($this, 'attachment_get'));
-      $this->register_action('freebusy-status', array($this, 'freebusy_status'));
-      $this->register_action('freebusy-times', array($this, 'freebusy_times'));
-      $this->register_action('randomdata', array($this, 'generate_randomdata'));
-      $this->register_action('print', array($this,'print_view'));
-      $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
-      $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
-      $this->register_action('dialog-ui', array($this, 'mail_message2event'));
-      $this->register_action('check-recent', array($this, 'check_recent'));
-      $this->register_action('itip-status', array($this, 'event_itip_status'));
-      $this->register_action('itip-remove', array($this, 'event_itip_remove'));
-      $this->register_action('itip-decline-reply', array($this, 'mail_itip_decline_reply'));
-      $this->register_action('itip-delegate', array($this, 'mail_itip_delegate'));
-      $this->register_action('resources-list', array($this, 'resources_list'));
-      $this->register_action('resources-owner', array($this, 'resources_owner'));
-      $this->register_action('resources-calendar', array($this, 'resources_calendar'));
-      $this->register_action('resources-autocomplete', array($this, 'resources_autocomplete'));
-      $this->add_hook('refresh', array($this, 'refresh'));
-
-      // remove undo information...
-      if ($undo = $_SESSION'calendar_event_undo') {
-        // ...after timeout
-        $undo_time = $this->rc->config->get('undo_timeout', 0);
-        if ($undo'ts' < time() - $undo_time) {
-          $this->rc->session->remove('calendar_event_undo');
-          // @TODO: do EXPUNGE on kolab objects?
-        }
-      }
-    }
-    else if ($args'task' == 'settings') {
-      // add hooks for Calendar settings
-      $this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list'));
-      $this->add_hook('preferences_list', array($this, 'preferences_list'));
-      $this->add_hook('preferences_save', array($this, 'preferences_save')); 
-    }
-    else if ($args'task' == 'mail') {
-      // hooks to catch event invitations on incoming mails
-      if ($args'action' == 'show' || $args'action' == 'preview') {
-        $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
-      }
-
-      // add 'Create event' item to message menu
-      if ($this->api->output->type == 'html' && $_GET'_rel' != 'event') {
-        $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
-          $this->api->output->button(array(
-            'command'  => 'calendar-create-from-mail',
-            'label'    => 'calendar.createfrommail',
-            'type'     => 'link',
-            'classact' => 'icon calendarlink active',
-            'class'    => 'icon calendarlink disabled',
-            'innerclass' => 'icon calendar',
-          ))),
-          'messagemenu');
-
-        $this->api->output->add_label('calendar.createfrommail');
-      }
-
-      $this->add_hook('messages_list', array($this, 'mail_messages_list'));
-      $this->add_hook('message_compose', array($this, 'mail_message_compose'));
-    }
-    else if ($args'task' == 'addressbook') {
-      if ($this->rc->config->get('calendar_contact_birthdays')) {
-        $this->add_hook('contact_update', array($this, 'contact_update'));
-        $this->add_hook('contact_create', array($this, 'contact_update'));
-      }
-    }
-
-    // add hooks to display alarms
-    $this->add_hook('pending_alarms', array($this, 'pending_alarms'));
-    $this->add_hook('dismiss_alarms', array($this, 'dismiss_alarms'));
-  }
-
-  /**
-   * Helper method to load the backend driver according to local config
-   */
-  private function load_driver()
-  {
-    if (is_object($this->driver))
-      return;
-
-    $driver_name = $this->rc->config->get('calendar_driver', 'database');
-    $driver_class = $driver_name . '_driver';
-
-    require_once($this->home . '/drivers/calendar_driver.php');
-    require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
-
-    $this->driver = new $driver_class($this);
-
-    if ($this->driver->undelete)
-      $this->driver->undelete = $this->rc->config->get('undo_timeout', 0) > 0;
-  }
-
-  /**
-   * Load iTIP functions
-   */
-  private function load_itip()
-  {
-    if (!$this->itip) {
-      require_once($this->home . '/lib/calendar_itip.php');
-      $this->itip = new calendar_itip($this);
-      
-      if ($this->rc->config->get('kolab_invitation_calendars'))
-        $this->itip->set_rsvp_actions(array('accepted','tentative','declined','delegated','needs-action'));
-    }
-
-    return $this->itip;
-  }
-
-  /**
-   * Load iCalendar functions
-   */
-  public function get_ical()
-  {
-    if (!$this->ical) {
-      $this->ical = libcalendaring::get_ical();
-    }
-    
-    return $this->ical;
-  }
-
-  /**
-   * Get properties of the calendar this user has specified as default
-   */
-  public function get_default_calendar($sensitivity = null, $calendars = null)
-  {
-    if ($calendars === null) {
-      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_WRITEABLE);
-    }
-
-    $default_id = $this->rc->config->get('calendar_default_calendar');
-    $calendar   = $calendars$default_id ?: null;
-
-    if (!$calendar || $sensitivity) {
-      foreach ($calendars as $cal) {
-        if ($sensitivity && $cal'subtype' == $sensitivity) {
-          $calendar = $cal;
-          break;
-        }
-        if ($cal'default' && $cal'editable') {
-          $calendar = $cal;
-        }
-        if ($cal'editable') {
-          $first = $cal;
-        }
-      }
-    }
-
-    return $calendar ?: $first;
-  }
-
-  /**
-   * Render the main calendar view from skin template
-   */
-  function calendar_view()
-  {
-    $this->rc->output->set_pagetitle($this->gettext('calendar'));
-
-    // Add JS files to the page header
-    $this->ui->addJS();
-
-    $this->ui->init_templates();
-    $this->rc->output->add_label('lowest','low','normal','high','highest','delete','cancel','uploading','noemailwarning','close');
-
-    // initialize attendees autocompletion
-    $this->rc->autocomplete_init();
-
-    $this->rc->output->set_env('timezone', $this->timezone->getName());
-    $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
-    $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver'));
-    $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array(
-        'id'         => 'edit-identities-list',
-        'aria-label' => $this->gettext('roleorganizer'),
-        'class'      => 'form-control custom-select',
-    )));
-
-    $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
-    if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'list')))
-      $this->rc->output->set_env('view', $view);
-
-    if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC))
-      $this->rc->output->set_env('date', $date);
-
-    if ($msgref = rcube_utils::get_input_value('itip', rcube_utils::INPUT_GPC))
-      $this->rc->output->set_env('itip_events', $this->itip_events($msgref));
-
-    $this->rc->output->send("calendar.calendar");
-  }
-
-  /**
-   * Handler for preferences_sections_list hook.
-   * Adds Calendar settings sections into preferences sections list.
-   *
-   * @param array Original parameters
-   * @return array Modified parameters
-   */
-  function preferences_sections_list($p)
-  {
-    $p'list''calendar' = array(
-      'id' => 'calendar', 'section' => $this->gettext('calendar'),
-    );
-
-    return $p;
-  }
-
-  /**
-   * Handler for preferences_list hook.
-   * Adds options blocks into Calendar settings sections in Preferences.
-   *
-   * @param array Original parameters
-   * @return array Modified parameters
-   */
-  function preferences_list($p)
-  {
-    if ($p'section' != 'calendar') {
-      return $p;
-    }
-
-    $no_override = array_flip((array)$this->rc->config->get('dont_override'));
-
-    $p'blocks''view''name' = $this->gettext('mainoptions');
-
-    if (!isset($no_override'calendar_default_view')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
-        return $p;
-      }
+        $driver_name = $this->rc->config->get('calendar_driver', 'database');
+        $driver_class = $driver_name . '_driver';
 
-      $field_id = 'rcmfd_default_view';
-      $view = $this->rc->config->get('calendar_default_view', $this->defaults'calendar_default_view');
-      $select = new html_select(array('name' => '_default_view', 'id' => $field_id));
-      $select->add($this->gettext('day'), "agendaDay");
-      $select->add($this->gettext('week'), "agendaWeek");
-      $select->add($this->gettext('month'), "month");
-      $select->add($this->gettext('agenda'), "list");
-      $p'blocks''view''options''default_view' = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('default_view'))),
-        'content' => $select->show($view == 'table' ? 'list' : $view),
-      );
-    }
-
-    if (!isset($no_override'calendar_timeslots')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
-        return $p;
-      }
+        require_once($this->home . '/drivers/calendar_driver.php');
+        require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
+
+        $this->driver = new $driver_class($this);
 
-      $field_id = 'rcmfd_timeslot';
-      $choices = array('1', '2', '3', '4', '6');
-      $select = new html_select(array('name' => '_timeslots', 'id' => $field_id));
-      $select->add($choices);
-      $p'blocks''view''options''timeslots' = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('timeslots'))),
-        'content' => $select->show(strval($this->rc->config->get('calendar_timeslots', $this->defaults'calendar_timeslots'))),
-      );
+        if ($this->driver->undelete) {
+            $this->driver->undelete = $this->rc->config->get('undo_timeout', 0) > 0;
+        }
     }
 
-    if (!isset($no_override'calendar_first_day')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
-        return $p;
-      }
+    /**
+     * Load iTIP functions
+     */
+    private function load_itip()
+    {
+        if (empty($this->itip)) {
+            require_once($this->home . '/lib/calendar_itip.php');
+            $this->itip = new calendar_itip($this);
 
-      $field_id = 'rcmfd_firstday';
-      $select = new html_select(array('name' => '_first_day', 'id' => $field_id));
-      $select->add($this->gettext('sunday'), '0');
-      $select->add($this->gettext('monday'), '1');
-      $select->add($this->gettext('tuesday'), '2');
-      $select->add($this->gettext('wednesday'), '3');
-      $select->add($this->gettext('thursday'), '4');
-      $select->add($this->gettext('friday'), '5');
-      $select->add($this->gettext('saturday'), '6');
-      $p'blocks''view''options''first_day' = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('first_day'))),
-        'content' => $select->show(strval($this->rc->config->get('calendar_first_day', $this->defaults'calendar_first_day'))),
-      );
-    }
-
-    if (!isset($no_override'calendar_first_hour')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
-        return $p;
-      }
+            if ($this->rc->config->get('kolab_invitation_calendars')) {
+                $this->itip->set_rsvp_actions('accepted','tentative','declined','delegated','needs-action');
+            }
+        }
 
-      $time_format = $this->rc->config->get('time_format', libcalendaring::to_php_date_format($this->rc->config->get('calendar_time_format', $this->defaults'calendar_time_format')));
-      $select_hours = new html_select();
-      for ($h = 0; $h < 24; $h++)
-        $select_hours->add(date($time_format, mktime($h, 0, 0)), $h);
-
-      $field_id = 'rcmfd_firsthour';
-      $p'blocks''view''options''first_hour' = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('first_hour'))),
-        'content' => $select_hours->show($this->rc->config->get('calendar_first_hour', $this->defaults'calendar_first_hour'), array('name' => '_first_hour', 'id' => $field_id)),
-      );
-    }
-
-    if (!isset($no_override'calendar_work_start')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
-        return $p;
-      }
+        return $this->itip;
+    }
 
-      $field_id   = 'rcmfd_workstart';
-      $work_start = $this->rc->config->get('calendar_work_start', $this->defaults'calendar_work_start');
-      $work_end   = $this->rc->config->get('calendar_work_end', $this->defaults'calendar_work_end');
-      $p'blocks''view''options''workinghours' = array(
-        'title'   => html::label($field_id, rcube::Q($this->gettext('workinghours'))),
-        'content' => html::div('input-group',
-          $select_hours->show($work_start, array('name' => '_work_start', 'id' => $field_id))
-          . html::span('input-group-append input-group-prepend', html::span('input-group-text',' &mdash; '))
-          . $select_hours->show($work_end, array('name' => '_work_end', 'id' => $field_id))
-        )
-      );
-    }
-
-    if (!isset($no_override'calendar_event_coloring')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
-        return $p;
-      }
+    /**
+     * Load iCalendar functions
+     */
+    public function get_ical()
+    {
+        if (empty($this->ical)) {
+            $this->ical = libcalendaring::get_ical();
+        }
+
+        return $this->ical;
+    }
+
+    /**
+     * Get properties of the calendar this user has specified as default
+     */
+    public function get_default_calendar($sensitivity = null, $calendars = null)
+    {
+        if ($calendars === null) {
+            $filter    = calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_WRITEABLE;
+            $calendars = $this->driver->list_calendars($filter);
+        }
+
+        $default_id = $this->rc->config->get('calendar_default_calendar');
+        $calendar   = !empty($calendars$default_id) ? $calendars$default_id : null;
+        $first      = null;
+
+        if (!$calendar || $sensitivity) {
+            foreach ($calendars as $cal) {
+                if ($sensitivity && !empty($cal'subtype') && $cal'subtype' == $sensitivity) {
+                    $calendar = $cal;
+                    break;
+                }
+                if (!empty($cal'default') && $cal'editable') {
+                    $calendar = $cal;
+                }
+                if ($cal'editable') {
+                    $first = $cal;
+                }
+            }
+        }
+
+        return $calendar ?: $first;
+    }
+
+    /**
+     * Render the main calendar view from skin template
+     */
+    function calendar_view()
+    {
+        $this->rc->output->set_pagetitle($this->gettext('calendar'));
+
+        // Add JS files to the page header
+        $this->ui->addJS();
+
+        $this->ui->init_templates();
+        $this->rc->output->add_label('lowest','low','normal','high','highest','delete',
+            'cancel','uploading','noemailwarning','close'
+        );
+
+        // initialize attendees autocompletion
+        $this->rc->autocomplete_init();
+
+        $this->rc->output->set_env('timezone', $this->timezone->getName());
+        $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
+        $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver'));
+        $this->rc->output->set_env('identities-selector', $this->ui->identity_select(
+                'id'         => 'edit-identities-list',
+                'aria-label' => $this->gettext('roleorganizer'),
+                'class'      => 'form-control custom-select',
+        ));
+
+        $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
+        if (in_array($view, 'agendaWeek', 'agendaDay', 'month', 'list')) {
+            $this->rc->output->set_env('view', $view);
+        }
+
+        if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC)) {
+            $this->rc->output->set_env('date', $date);
+        }
+
+        if ($msgref = rcube_utils::get_input_value('itip', rcube_utils::INPUT_GPC)) {
+            $this->rc->output->set_env('itip_events', $this->itip_events($msgref));
+        }
+
+        $this->rc->output->send('calendar.calendar');
+    }
+
+    /**
+     * Handler for preferences_sections_list hook.
+     * Adds Calendar settings sections into preferences sections list.
+     *
+     * @param array Original parameters
+     *
+     * @return array Modified parameters
+     */
+    function preferences_sections_list($p)
+    {
+        $p'list''calendar' = 
+            'id'      => 'calendar',
+            'section' => $this->gettext('calendar'),
+        ;
 
-      $field_id = 'rcmfd_coloring';
-      $select_colors = new html_select(array('name' => '_event_coloring', 'id' => $field_id));
-      $select_colors->add($this->gettext('coloringmode0'), 0);
-      $select_colors->add($this->gettext('coloringmode1'), 1);
-      $select_colors->add($this->gettext('coloringmode2'), 2);
-      $select_colors->add($this->gettext('coloringmode3'), 3);
-
-      $p'blocks''view''options''eventcolors' = array(
-        'title'   => html::label($field_id, rcube::Q($this->gettext('eventcoloring'))),
-        'content' => $select_colors->show($this->rc->config->get('calendar_event_coloring', $this->defaults'calendar_event_coloring')),
-      );
-    }
-
-    // loading driver is expensive, don't do it if not needed
-    $this->load_driver();
-
-    if (!isset($no_override'calendar_default_alarm_type') || !isset($no_override'calendar_default_alarm_offset')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
         return $p;
-      }
+    }
+
+    /**
+     * Handler for preferences_list hook.
+     * Adds options blocks into Calendar settings sections in Preferences.
+     *
+     * @param array Original parameters
+     *
+     * @return array Modified parameters
+     */
+    function preferences_list($p)
+    {
+        if ($p'section' != 'calendar') {
+            return $p;
+        }
+
+        $no_override = array_flip((array) $this->rc->config->get('dont_override'));
+
+        $p'blocks''view''name' = $this->gettext('mainoptions');
+
+        if (!isset($no_override'calendar_default_view')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
 
-      $alarm_type = $alarm_offset = '';
+            $field_id = 'rcmfd_default_view';
+            $view = $this->rc->config->get('calendar_default_view', $this->defaults'calendar_default_view');
 
-      if (!isset($no_override'calendar_default_alarm_type')) {
-        $field_id    = 'rcmfd_alarm';
-        $select_type = new html_select(array('name' => '_alarm_type', 'id' => $field_id));
-        $select_type->add($this->gettext('none'), '');
+            $select = new html_select('name' => '_default_view', 'id' => $field_id);
+            $select->add($this->gettext('day'), "agendaDay");
+            $select->add($this->gettext('week'), "agendaWeek");
+            $select->add($this->gettext('month'), "month");
+            $select->add($this->gettext('agenda'), "list");
 
-        foreach ($this->driver->alarm_types as $type) {
-          $select_type->add($this->rc->gettext(strtolower("alarm{$type}option"), 'libcalendaring'), $type);
+            $p'blocks''view''options''default_view' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('default_view'))),
+                'content' => $select->show($view == 'table' ? 'list' : $view),
+            ;
         }
 
-        $alarm_type = $select_type->show($this->rc->config->get('calendar_default_alarm_type', ''));
-      }
+        if (!isset($no_override'calendar_timeslots')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
+
+            $field_id  = 'rcmfd_timeslot';
+            $choices   = '1', '2', '3', '4', '6';
+            $timeslots = $this->rc->config->get('calendar_timeslots', $this->defaults'calendar_timeslots');
 
-      if (!isset($no_override'calendar_default_alarm_offset')) {
-        $field_id      = 'rcmfd_alarm';
-        $input_value   = new html_inputfield(array('name' => '_alarm_value', 'id' => $field_id . 'value', 'size' => 3));
-        $select_offset = new html_select(array('name' => '_alarm_offset', 'id' => $field_id . 'offset'));
+            $select = new html_select('name' => '_timeslots', 'id' => $field_id);
+            $select->add($choices);
 
-        foreach (array('-M','-H','-D','+M','+H','+D') as $trigger) {
-          $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
+            $p'blocks''view''options''timeslots' = 
+                'title' => html::label($field_id, rcube::Q($this->gettext('timeslots'))),
+                'content' => $select->show(strval($timeslots)),
+            ;
         }
 
-        $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_default_alarm_offset', '-15M'));
-        $alarm_offset = $input_value->show($preset0) . ' ' . $select_offset->show($preset1);
-      }
+        if (!isset($no_override'calendar_first_day')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
 
-      $p'blocks''view''options''alarmtype' = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('defaultalarmtype'))),
-        'content' => html::div('input-group', $alarm_type . ' ' . $alarm_offset),
-      );
-    }
+            $field_id  = 'rcmfd_firstday';
+            $first_day = $this->rc->config->get('calendar_first_day', $this->defaults'calendar_first_day');
 
-    if (!isset($no_override'calendar_default_calendar')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
-        return $p;
-      }
-      // default calendar selection
-      $field_id   = 'rcmfd_default_calendar';
-      $filter     = calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_ACTIVE | calendar_driver::FILTER_INSERTABLE;
-      $select_cal = new html_select(array('name' => '_default_calendar', 'id' => $field_id, 'is_escaped' => true));
-      foreach ((array)$this->driver->list_calendars($filter) as $id => $prop) {
-        $select_cal->add($prop'name', strval($id));
-        if ($prop'default')
-          $default_calendar = $id;
-      }
-      $p'blocks''view''options''defaultcalendar' = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('defaultcalendar'))),
-        'content' => $select_cal->show($this->rc->config->get('calendar_default_calendar', $default_calendar)),
-      );
-    }
-
-    if (!isset($no_override'calendar_show_weekno')) {
-      if (!$p'current') {
-        $p'blocks''view''content' = true;
-        return $p;
-      }
+            $select = new html_select('name' => '_first_day', 'id' => $field_id);
+            $select->add($this->gettext('sunday'), '0');
+            $select->add($this->gettext('monday'), '1');
+            $select->add($this->gettext('tuesday'), '2');
+            $select->add($this->gettext('wednesday'), '3');
+            $select->add($this->gettext('thursday'), '4');
+            $select->add($this->gettext('friday'), '5');
+            $select->add($this->gettext('saturday'), '6');
 
-      $field_id   = 'rcmfd_show_weekno';
-      $select = new html_select(array('name' => '_show_weekno', 'id' => $field_id));
-      $select->add($this->gettext('weeknonone'), -1);
-      $select->add($this->gettext('weeknodatepicker'), 0);
-      $select->add($this->gettext('weeknoall'), 1);
-
-      $p'blocks''view''options''show_weekno' = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('showweekno'))),
-        'content' => $select->show(intval($this->rc->config->get('calendar_show_weekno'))),
-      );
-    }
-
-    $p'blocks''itip''name' = $this->gettext('itipoptions');
-
-    // Invitations handling
-    if (!isset($no_override'calendar_itip_after_action')) {
-      if (!$p'current') {
-        $p'blocks''itip''content' = true;
-        return $p;
-      }
+            $p'blocks''view''options''first_day' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('first_day'))),
+                'content' => $select->show(strval($first_day)),
+            ;
+        }
+
+        if (!isset($no_override'calendar_first_hour')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
+
+            $first_hour  = $this->rc->config->get('calendar_first_hour', $this->defaults'calendar_first_hour');
+            $time_format = $this->rc->config->get('calendar_time_format', $this->defaults'calendar_time_format');
+            $time_format = $this->rc->config->get('time_format', libcalendaring::to_php_date_format($time_format));
+            $field_id    = 'rcmfd_firsthour';
 
-      $field_id = 'rcmfd_after_action';
-      $select   = new html_select(array('name' => '_after_action', 'id' => $field_id,
-        'onchange' => "\$('#{$field_id}_select')this.value == 4 ? 'show' : 'hide'()"));
-
-      $select->add($this->gettext('afternothing'), '');
-      $select->add($this->gettext('aftertrash'), 1);
-      $select->add($this->gettext('afterdelete'), 2);
-      $select->add($this->gettext('afterflagdeleted'), 3);
-      $select->add($this->gettext('aftermoveto'), 4);
-
-      $val = $this->rc->config->get('calendar_itip_after_action', $this->defaults'calendar_itip_after_action');
-      if ($val !== null && $val !== '' && !is_int($val)) {
-        $folder = $val;
-        $val    = 4;
-      }
-
-      $folders = $this->rc->folder_selector(array(
-          'id'            => $field_id . '_select',
-          'name'          => '_after_action_folder',
-          'maxlength'     => 30,
-          'folder_filter' => 'mail',
-          'folder_rights' => 'w',
-          'style'         => $val !== 4 ? 'display:none' : '',
-      ));
-
-      $p'blocks''itip''options''after_action' = array(
-        'title'   => html::label($field_id, rcube::Q($this->gettext('afteraction'))),
-        'content' => html::div('input-group input-group-combo', $select->show($val) . $folders->show($folder)),
-      );
-    }
-
-    // category definitions
-    if (!$this->driver->nocategories && !isset($no_override'calendar_categories')) {
-        $p'blocks''categories''name' = $this->gettext('categories');
-
-        if (!$p'current') {
-          $p'blocks''categories''content' = true;
-          return $p;
-        }
-
-        $categories = (array) $this->driver->list_categories();
-        $categories_list = '';
-        foreach ($categories as $name => $color) {
-          $key = md5($name);
-          $field_class = 'rcmfd_category_' . str_replace(' ', '_', $name);
-          $category_remove = html::span('input-group-append', html::a(array(
-              'class'   => 'button icon delete input-group-text',
-              'onclick' => '$(this).parent().parent().remove()',
-              'title'   => $this->gettext('remove_category'),
-              'href'    => '#rcmfd_new_category',
-            ), html::span('inner', $this->gettext('delete'))
-          ));
-          $category_name  = new html_inputfield(array('name' => "_categories$key", 'class' => $field_class, 'size' => 30, 'disabled' => $this->driver->categoriesimmutable));
-          $category_color = new html_inputfield(array('name' => "_colors$key", 'class' => "$field_class colors", 'size' => 6));
-          $hidden = $this->driver->categoriesimmutable ? html::tag('input', array('type' => 'hidden', 'name' => "_categories$key", 'value' => $name)) : '';
-          $categories_list .= $hidden . html::div('input-group', $category_name->show($name) . $category_color->show($color) . $category_remove);
+            $select_hours = new html_select('name' => '_first_hour', 'id' => $field_id);
+            for ($h = 0; $h < 24; $h++) {
+                $select_hours->add(date($time_format, mktime($h, 0, 0)), $h);
+            }
+
+            $p'blocks''view''options''first_hour' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('first_hour'))),
+                'content' => $select_hours->show($first_hour),
+            ;
         }
 
-        $p'blocks''categories''options''category_' . $name = array(
-          'content' => html::div(array('id' => 'calendarcategories'), $categories_list),
-        );
+        if (!isset($no_override'calendar_work_start')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
 
-        $field_id = 'rcmfd_new_category';
-        $new_category = new html_inputfield(array('name' => '_new_category', 'id' => $field_id, 'size' => 30));
-        $add_category = html::span('input-group-append', html::a(array(
-            'type'    => 'button',
-            'class'   => 'button create input-group-text',
-            'title'   => $this->gettext('add_category'),
-            'onclick' => 'rcube_calendar_add_category()',
-            'href'    => '#rcmfd_new_category',
-          ), html::span('inner', $this->gettext('add_category'))
-        ));
-        $p'blocks''categories''options''categories' = array(
-          'content' => html::div('input-group', $new_category->show('') . $add_category),
-        );
+            $field_id   = 'rcmfd_workstart';
+            $work_start = $this->rc->config->get('calendar_work_start', $this->defaults'calendar_work_start');
+            $work_end   = $this->rc->config->get('calendar_work_end', $this->defaults'calendar_work_end');
 
-        $this->rc->output->add_label('delete', 'calendar.remove_category');
-        $this->rc->output->add_script('function rcube_calendar_add_category() {
-          var name = $("#rcmfd_new_category").val();
-          if (name.length) {
-            var button_label = rcmail.gettext("calendar.remove_category");
-            var input = $("<input>").attr({type: "text", name: "_categories", size: 30, "class": "form-control"}).val(name);
-            var color = $("<input>").attr({type: "text", name: "_colors", size: 6, "class": "colors form-control"}).val("000000");
-            var button = $("<a>").attr({"class": "button icon delete input-group-text", title: button_label, href: "#rcmfd_new_category"})
-              .click(function() { $(this).parent().parent().remove(); })
-              .append($("<span>").addClass("inner").text(rcmail.gettext("delete")));
-
-            $("<div>").addClass("input-group").append(input).append(color).append($("<span class=\'input-group-append\'>").append(button))
-              .appendTo("#calendarcategories");
-            color.minicolors(rcmail.env.minicolors_config || {});
-            $("#rcmfd_new_category").val("");
-          }
-        }', 'foot');
-
-        $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event) {
-          if (event.which == 13) {
-            rcube_calendar_add_category();
-            event.preventDefault();
-          }
-        });
-        ', 'docready');
-
-        // load miniColors js/css files
-        jqueryui::miniColors();
-    }
-
-    // virtual birthdays calendar
-    if (!isset($no_override'calendar_contact_birthdays')) {
-      $p'blocks''birthdays''name' = $this->gettext('birthdayscalendar');
+            $p'blocks''view''options''workinghours' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('workinghours'))),
+                'content' => html::div('input-group',
+                    $select_hours->show($work_start, 'name' => '_work_start', 'id' => $field_id)
+                    . html::span('input-group-append input-group-prepend', html::span('input-group-text',' &mdash; '))
+                    . $select_hours->show($work_end, 'name' => '_work_end', 'id' => $field_id)
+                )
+            ;
+        }
 
-      if (!$p'current') {
-        $p'blocks''birthdays''content' = true;
-        return $p;
-      }
+        if (!isset($no_override'calendar_event_coloring')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
 
-      $field_id = 'rcmfd_contact_birthdays';
-      $input    = new html_checkbox(array('name' => '_contact_birthdays', 'id' => $field_id, 'value' => 1, 'onclick' => '$(".calendar_birthday_props").prop("disabled",!this.checked)'));
+            $field_id = 'rcmfd_coloring';
+            $mode     = $this->rc->config->get('calendar_event_coloring', $this->defaults'calendar_event_coloring');
 
-      $p'blocks''birthdays''options''contact_birthdays' = array(
-        'title'   => html::label($field_id, $this->gettext('displaybirthdayscalendar')),
-        'content' => $input->show($this->rc->config->get('calendar_contact_birthdays')?1:0),
-      );
-
-      $input_attrib = array(
-        'class' => 'calendar_birthday_props',
-        'disabled' => !$this->rc->config->get('calendar_contact_birthdays'),
-      );
-
-      $sources = array();
-      $checkbox = new html_checkbox(array('name' => '_birthday_adressbooks') + $input_attrib);
-      foreach ($this->rc->get_address_sources(false, true) as $source) {
-        $active = in_array($source'id', (array)$this->rc->config->get('calendar_birthday_adressbooks', array())) ? $source'id' : '';
-        $sources = html::tag('li', null, html::label(null, $checkbox->show($active, array('value' => $source'id')) . rcube::Q($source'realname' ?: $source'name')));
-      }
-
-      $p'blocks''birthdays''options''birthday_adressbooks' = array(
-        'title'   => rcube::Q($this->gettext('birthdayscalendarsources')),
-        'content' => html::tag('ul', 'proplist', implode("\n", $sources)),
-      );
-
-      $field_id = 'rcmfd_birthdays_alarm';
-      $select_type = new html_select(array('name' => '_birthdays_alarm_type', 'id' => $field_id) + $input_attrib);
-      $select_type->add($this->gettext('none'), '');
-      foreach ($this->driver->alarm_types as $type) {
-        $select_type->add($this->rc->gettext(strtolower("alarm{$type}option"), 'libcalendaring'), $type);
-      }
-
-      $input_value = new html_inputfield(array('name' => '_birthdays_alarm_value', 'id' => $field_id . 'value', 'size' => 3) + $input_attrib);
-      $select_offset = new html_select(array('name' => '_birthdays_alarm_offset', 'id' => $field_id . 'offset') + $input_attrib);
-      foreach (array('-M','-H','-D') as $trigger)
-        $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
-
-      $preset      = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
-      $preset_type = $this->rc->config->get('calendar_birthdays_alarm_type', '');
-
-      $p'blocks''birthdays''options''birthdays_alarmoffset' = array(
-        'title'   => html::label($field_id, rcube::Q($this->gettext('showalarms'))),
-        'content' => html::div('input-group', $select_type->show($preset_type) . $input_value->show($preset0) . ' ' . $select_offset->show($preset1)),
-      );
-    }
-
-    return $p;
-  }
-
-  /**
-   * Handler for preferences_save hook.
-   * Executed on Calendar settings form submit.
-   *
-   * @param array Original parameters
-   * @return array Modified parameters
-   */
-  function preferences_save($p)
-  {
-    if ($p'section' == 'calendar') {
-      $this->load_driver();
-
-      // compose default alarm preset value
-      $alarm_offset  = rcube_utils::get_input_value('_alarm_offset', rcube_utils::INPUT_POST);
-      $alarm_value   = rcube_utils::get_input_value('_alarm_value', rcube_utils::INPUT_POST);
-      $default_alarm = $alarm_offset0 . intval($alarm_value) . $alarm_offset1;
-
-      $birthdays_alarm_offset = rcube_utils::get_input_value('_birthdays_alarm_offset', rcube_utils::INPUT_POST);
-      $birthdays_alarm_value  = rcube_utils::get_input_value('_birthdays_alarm_value', rcube_utils::INPUT_POST);
-      $birthdays_alarm_value  = $birthdays_alarm_offset0 . intval($birthdays_alarm_value) . $birthdays_alarm_offset1;
-
-      $p'prefs' = array(
-        'calendar_default_view' => rcube_utils::get_input_value('_default_view', rcube_utils::INPUT_POST),
-        'calendar_timeslots'    => intval(rcube_utils::get_input_value('_timeslots', rcube_utils::INPUT_POST)),
-        'calendar_first_day'    => intval(rcube_utils::get_input_value('_first_day', rcube_utils::INPUT_POST)),
-        'calendar_first_hour'   => intval(rcube_utils::get_input_value('_first_hour', rcube_utils::INPUT_POST)),
-        'calendar_work_start'   => intval(rcube_utils::get_input_value('_work_start', rcube_utils::INPUT_POST)),
-        'calendar_work_end'     => intval(rcube_utils::get_input_value('_work_end', rcube_utils::INPUT_POST)),
-        'calendar_show_weekno'  => intval(rcube_utils::get_input_value('_show_weekno', rcube_utils::INPUT_POST)),
-        'calendar_event_coloring'       => intval(rcube_utils::get_input_value('_event_coloring', rcube_utils::INPUT_POST)),
-        'calendar_default_alarm_type'   => rcube_utils::get_input_value('_alarm_type', rcube_utils::INPUT_POST),
-        'calendar_default_alarm_offset' => $default_alarm,
-        'calendar_default_calendar'     => rcube_utils::get_input_value('_default_calendar', rcube_utils::INPUT_POST),
-        'calendar_date_format' => null,  // clear previously saved values
-        'calendar_time_format' => null,
-        'calendar_contact_birthdays'    => rcube_utils::get_input_value('_contact_birthdays', rcube_utils::INPUT_POST) ? true : false,
-        'calendar_birthday_adressbooks' => (array) rcube_utils::get_input_value('_birthday_adressbooks', rcube_utils::INPUT_POST),
-        'calendar_birthdays_alarm_type'   => rcube_utils::get_input_value('_birthdays_alarm_type', rcube_utils::INPUT_POST),
-        'calendar_birthdays_alarm_offset' => $birthdays_alarm_value ?: null,
-        'calendar_itip_after_action'      => intval(rcube_utils::get_input_value('_after_action', rcube_utils::INPUT_POST)),
-      );
-
-      if ($p'prefs''calendar_itip_after_action' == 4) {
-        $p'prefs''calendar_itip_after_action' = rcube_utils::get_input_value('_after_action_folder', rcube_utils::INPUT_POST, true);
-      }
-
-      // categories
-      if (!$this->driver->nocategories) {
-        $old_categories = $new_categories = array();
-        foreach ($this->driver->list_categories() as $name => $color) {
-          $old_categoriesmd5($name) = $name;
-        }
-
-        $categories = (array) rcube_utils::get_input_value('_categories', rcube_utils::INPUT_POST);
-        $colors     = (array) rcube_utils::get_input_value('_colors', rcube_utils::INPUT_POST);
-
-        foreach ($categories as $key => $name) {
-          if (!isset($colors$key)) {
-            continue;
-          }
-
-          $color = preg_replace('/^#/', '', strval($colors$key));
-
-          // rename categories in existing events -> driver's job
-          if ($oldname = $old_categories$key) {
-            $this->driver->replace_category($oldname, $name, $color);
-            unset($old_categories$key);
-          }
-          else
-            $this->driver->add_category($name, $color);
-
-          $new_categories$name = $color;
-        }
-
-        // these old categories have been removed, alter events accordingly -> driver's job
-        foreach ((array)$old_categories$key as $key => $name) {
-          $this->driver->remove_category($name);
-        }
-
-        $p'prefs''calendar_categories' = $new_categories;
-      }
-    }
-
-    return $p;
-  }
-
-  /**
-   * Dispatcher for calendar actions initiated by the client
-   */
-  function calendar_action()
-  {
-    $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
-    $cal    = rcube_utils::get_input_value('c', rcube_utils::INPUT_GPC);
-    $success = $reload = false;
-
-    if (isset($cal'showalarms'))
-      $cal'showalarms' = intval($cal'showalarms');
-
-    switch ($action) {
-      case "form-new":
-      case "form-edit":
-        echo $this->ui->calendar_editform($action, $cal);
-        exit;
-      case "new":
-        $success = $this->driver->create_calendar($cal);
-        $reload = true;
-        break;
-      case "edit":
-        $success = $this->driver->edit_calendar($cal);
-        $reload = true;
-        break;
-      case "delete":
-        if ($success = $this->driver->delete_calendar($cal))
-          $this->rc->output->command('plugin.destroy_source', array('id' => $cal'id'));
-        break;
-      case "subscribe":
-        if (!$this->driver->subscribe_calendar($cal))
-          $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
-        else {
-          $calendars = $this->driver->list_calendars();
-          $calendar  = $calendars$cal'id';
+            $select_colors = new html_select('name' => '_event_coloring', 'id' => $field_id);
+            $select_colors->add($this->gettext('coloringmode0'), 0);
+            $select_colors->add($this->gettext('coloringmode1'), 1);
+            $select_colors->add($this->gettext('coloringmode2'), 2);
+            $select_colors->add($this->gettext('coloringmode3'), 3);
 
-          // find parent folder and check if it's a "user calendar"
-          // if it's also activated we need to refresh it (#5340)
-          while ($calendar'parent') {
-            if (isset($calendars$calendar'parent'))
-              $calendar = $calendars$calendar'parent';
-            else
-              break;
-          }
-
-          if ($calendar'id' != $cal'id' && $calendar'active' && $calendar'group' == "other user")
-            $this->rc->output->command('plugin.refresh_source', $calendar'id');
-        }
-        return;
-      case "search":
-        $results    = array();
-        $color_mode = $this->rc->config->get('calendar_event_coloring', $this->defaults'calendar_event_coloring');
-        $query      = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
-        $source     = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
-
-        foreach ((array) $this->driver->search_calendars($query, $source) as $id => $prop) {
-          $editname = $prop'editname';
-          unset($prop'editname');  // force full name to be displayed
-          $prop'active' = false;
-
-          // let the UI generate HTML and CSS representation for this calendar
-          $html = $this->ui->calendar_list_item($id, $prop, $jsenv);
-          $cal = $jsenv$id;
-          $cal'editname' = $editname;
-          $cal'html' = $html;
-          if (!empty($prop'color'))
-            $cal'css' = $this->ui->calendar_css_classes($id, $prop, $color_mode);
-
-          $results = $cal;
-        }
-        // report more results available
-        if ($this->driver->search_more_results)
-          $this->rc->output->show_message('autocompletemore', 'notice');
-
-        $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
-        return;
-    }
-
-    if ($success)
-      $this->rc->output->show_message('successfullysaved', 'confirmation');
-    else {
-      $error_msg = $this->gettext('errorsaving') . ($this->driver->last_error ? ': ' . $this->driver->last_error :'');
-      $this->rc->output->show_message($error_msg, 'error');
-    }
-
-    $this->rc->output->command('plugin.unlock_saving');
-
-    if ($success && $reload)
-      $this->rc->output->command('plugin.reload_view');
-  }
-
-
-  /**
-   * Dispatcher for event actions initiated by the client
-   */
-  function event_action()
-  {
-    $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
-    $event  = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);
-    $success = $reload = $got_msg = false;
-
-    // read old event data in order to find changes
-    if (($event'_notify' || $event'_decline') && $action != 'new') {
-      $old = $this->driver->get_event($event);
-
-      // load main event if savemode is 'all' or if deleting 'future' events
-      if (($event'_savemode' == 'all' || ($event'_savemode' == 'future' && $action == 'remove' && !$event'_decline')) && $old'recurrence_id') {
-        $old'id' = $old'recurrence_id';
-        $old = $this->driver->get_event($old);
-      }
-    }
-
-    switch ($action) {
-      case "new":
-        // create UID for new event
-        $event'uid' = $this->generate_uid();
-        if (!$this->write_preprocess($event, $action)) {
-          $got_msg = true;
-        }
-        else if ($success = $this->driver->new_event($event)) {
-          $event'id' = $event'uid';
-          $event'_savemode' = 'all';
-          $this->cleanup_event($event);
-          $this->event_save_success($event, null, $action, true);
-        }
-        $reload = $success && $event'recurrence' ? 2 : 1;
-        break;
-        
-      case "edit":
-        if (!$this->write_preprocess($event, $action)) {
-          $got_msg = true;
-        }
-        else if ($success = $this->driver->edit_event($event)) {
-          $this->cleanup_event($event);
-          $this->event_save_success($event, $old, $action, $success);
-        }
-        $reload = $success && ($event'recurrence' || $event'_savemode' || $event'_fromcalendar') ? 2 : 1;
-        break;
-      
-      case "resize":
-        if (!$this->write_preprocess($event, $action)) {
-          $got_msg = true;
-        }
-        else if ($success = $this->driver->resize_event($event)) {
-          $this->event_save_success($event, $old, $action, $success);
-        }
-        $reload = $event'_savemode' ? 2 : 1;
-        break;
-      
-      case "move":
-        if (!$this->write_preprocess($event, $action)) {
-          $got_msg = true;
-        }
-        else if ($success = $this->driver->move_event($event)) {
-          $this->event_save_success($event, $old, $action, $success);
-        }
-        $reload = $success && $event'_savemode' ? 2 : 1;
-        break;
-      
-      case "remove":
-        // remove previous deletes
-        $undo_time = $this->driver->undelete ? $this->rc->config->get('undo_timeout', 0) : 0;
+            $p'blocks''view''options''eventcolors' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('eventcoloring'))),
+                'content' => $select_colors->show($mode),
+            ;
+        }
 
-        // search for event if only UID is given
-        if (!isset($event'calendar') && $event'uid') {
-          if (!($event = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE))) {
-            break;
-          }
-          $undo_time = 0;
+        // loading driver is expensive, don't do it if not needed
+        $this->load_driver();
+
+        if (!isset($no_override'calendar_default_alarm_type') || !isset($no_override'calendar_default_alarm_offset')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
+
+            $alarm_type = $alarm_offset = '';
+
+            if (!isset($no_override'calendar_default_alarm_type')) {
+                $field_id    = 'rcmfd_alarm';
+                $select_type = new html_select('name' => '_alarm_type', 'id' => $field_id);
+                $select_type->add($this->gettext('none'), '');
+
+                foreach ($this->driver->alarm_types as $type) {
+                    $select_type->add($this->rc->gettext(strtolower("alarm{$type}option"), 'libcalendaring'), $type);
+                }
+
+                $alarm_type = $select_type->show($this->rc->config->get('calendar_default_alarm_type', ''));
+            }
+
+            if (!isset($no_override'calendar_default_alarm_offset')) {
+                $field_id      = 'rcmfd_alarm';
+                $input_value   = new html_inputfield('name' => '_alarm_value', 'id' => $field_id . 'value', 'size' => 3);
+                $select_offset = new html_select('name' => '_alarm_offset', 'id' => $field_id . 'offset');
+
+                foreach ('-M','-H','-D','+M','+H','+D' as $trigger) {
+                    $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
+                }
+
+                $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_default_alarm_offset', '-15M'));
+                $alarm_offset = $input_value->show($preset0) . ' ' . $select_offset->show($preset1);
+            }
+
+            $p'blocks''view''options''alarmtype' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('defaultalarmtype'))),
+                'content' => html::div('input-group', $alarm_type . ' ' . $alarm_offset),
+            ;
         }
 
-        // Note: the driver is responsible for setting $_SESSION'calendar_event_undo'
-        //       containing 'ts' and 'data' elements
-        $success = $this->driver->remove_event($event, $undo_time < 1);
-        $reload = (!$success || $event'_savemode') ? 2 : 1;
-
-        if ($undo_time > 0 && $success) {
-          // display message with Undo link.
-          $msg = html::span(null, $this->gettext('successremoval'))
-            . ' ' . html::a(array('onclick' => sprintf("%s.http_request('event', 'action=undo', %s.display_message('', 'loading'))",
-              rcmail_output::JS_OBJECT_NAME, rcmail_output::JS_OBJECT_NAME)), $this->gettext('undo'));
-          $this->rc->output->show_message($msg, 'confirmation', null, true, $undo_time);
-          $got_msg = true;
-        }
-        else if ($success) {
-          $this->rc->output->show_message('calendar.successremoval', 'confirmation');
-          $got_msg = true;
-        }
-
-        // send cancellation for the main event
-        if ($event'_savemode' == 'all') {
-          unset($old'_instance', $old'recurrence_date', $old'recurrence_id');
-        }
-        // send an update for the main event's recurrence rule instead of a cancellation message
-        else if ($event'_savemode' == 'future' && $success !== false && $success !== true) {
-          $event'_savemode' = 'all';  // force event_save_success() to load master event
-          $action = 'edit';
-          $success = true;
-        }
-
-        // send iTIP reply that participant has declined the event
-        if ($success && $event'_decline') {
-          $emails = $this->get_user_emails();
-          foreach ($old'attendees' as $i => $attendee) {
-            if ($attendee'role' == 'ORGANIZER')
-              $organizer = $attendee;
-            else if ($attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
-              $old'attendees'$i'status' = 'DECLINED';
-              $reply_sender = $attendee'email';
-            }
-          }
-
-          if ($event'_savemode' == 'future' && $event'id' != $old'id') {
-            $old'thisandfuture' = true;
-          }
-
-          $itip = $this->load_itip();
-          $itip->set_sender_email($reply_sender);
-          if ($organizer && $itip->send_itip_message($old, 'REPLY', $organizer, 'itipsubjectdeclined', 'itipmailbodydeclined'))
-            $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer'name' ? $organizer'name' : $organizer'email'))), 'confirmation');
-          else
-            $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+        if (!isset($no_override'calendar_default_calendar')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
+
+            // default calendar selection
+            $field_id   = 'rcmfd_default_calendar';
+            $filter     = calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_ACTIVE | calendar_driver::FILTER_INSERTABLE;
+            $select_cal = new html_select('name' => '_default_calendar', 'id' => $field_id, 'is_escaped' => true);
+
+            $default_calendar = null;
+            foreach ((array) $this->driver->list_calendars($filter) as $id => $prop) {
+                $select_cal->add($prop'name', strval($id));
+                if (!empty($prop'default')) {
+                    $default_calendar = $id;
+                }
+            }
+
+            $p'blocks''view''options''defaultcalendar' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('defaultcalendar'))),
+                'content' => $select_cal->show($this->rc->config->get('calendar_default_calendar', $default_calendar)),
+            ;
+        }
+
+        if (!isset($no_override'calendar_show_weekno')) {
+            if (empty($p'current')) {
+                $p'blocks''view''content' = true;
+                return $p;
+            }
+
+            $field_id   = 'rcmfd_show_weekno';
+            $select = new html_select('name' => '_show_weekno', 'id' => $field_id);
+            $select->add($this->gettext('weeknonone'), -1);
+            $select->add($this->gettext('weeknodatepicker'), 0);
+            $select->add($this->gettext('weeknoall'), 1);
+
+            $p'blocks''view''options''show_weekno' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('showweekno'))),
+                'content' => $select->show(intval($this->rc->config->get('calendar_show_weekno'))),
+            ;
+        }
+
+        $p'blocks''itip''name' = $this->gettext('itipoptions');
+
+        // Invitations handling
+        if (!isset($no_override'calendar_itip_after_action')) {
+            if (empty($p'current')) {
+                $p'blocks''itip''content' = true;
+                return $p;
+            }
+
+            $field_id = 'rcmfd_after_action';
+            $select   = new html_select(
+                    'name'     => '_after_action',
+                    'id'       => $field_id,
+                    'onchange' => "\$('#{$field_id}_select')this.value == 4 ? 'show' : 'hide'()"
+            );
+
+            $select->add($this->gettext('afternothing'), '');
+            $select->add($this->gettext('aftertrash'), 1);
+            $select->add($this->gettext('afterdelete'), 2);
+            $select->add($this->gettext('afterflagdeleted'), 3);
+            $select->add($this->gettext('aftermoveto'), 4);
+
+            $val    = $this->rc->config->get('calendar_itip_after_action', $this->defaults'calendar_itip_after_action');
+            $folder = null;
+
+            if ($val !== null && $val !== '' && !is_int($val)) {
+                $folder = $val;
+                $val    = 4;
+            }
+
+            $folders = $this->rc->folder_selector(
+                    'id'            => $field_id . '_select',
+                    'name'          => '_after_action_folder',
+                    'maxlength'     => 30,
+                    'folder_filter' => 'mail',
+                    'folder_rights' => 'w',
+                    'style'         => $val !== 4 ? 'display:none' : '',
+            );
+
+            $p'blocks''itip''options''after_action' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('afteraction'))),
+                'content' => html::div(
+                    'input-group input-group-combo',
+                    $select->show($val) . $folders->show($folder)
+                ),
+            ;
+        }
+
+        // category definitions
+        if (empty($this->driver->nocategories) && !isset($no_override'calendar_categories')) {
+            $p'blocks''categories''name' = $this->gettext('categories');
+
+            if (empty($p'current')) {
+                $p'blocks''categories''content' = true;
+                return $p;
+            }
+
+            $categories      = (array) $this->driver->list_categories();
+            $categories_list = '';
+
+            foreach ($categories as $name => $color) {
+                $key = md5($name);
+                $field_class = 'rcmfd_category_' . str_replace(' ', '_', $name);
+                $category_remove = html::span('input-group-append',
+                    html::a(
+                            'class'   => 'button icon delete input-group-text',
+                            'onclick' => '$(this).parent().parent().remove()',
+                            'title'   => $this->gettext('remove_category'),
+                            'href'    => '#rcmfd_new_category',
+                        ,
+                        html::span('inner', $this->gettext('delete'))
+                    )
+                );
+
+                $category_name  = new html_inputfield(array('name' => "_categories$key", 'class' => $field_class, 'size' => 30, 'disabled' => $this->driver->categoriesimmutable));
+                $category_color = new html_inputfield(array('name' => "_colors$key", 'class' => "$field_class colors", 'size' => 6));
+                $hidden         = '';
+
+                if (!empty($this->driver->categoriesimmutable)) {
+                    $hidden =  html::tag('input', 'type' => 'hidden', 'name' => "_categories$key", 'value' => $name);
+                }
+
+                $categories_list .= $hidden
+                    . html::div('input-group', $category_name->show($name) . $category_color->show($color) . $category_remove);
+            }
+
+            $p'blocks''categories''options''category_' . $name = 
+                'content' => html::div('id' => 'calendarcategories', $categories_list),
+            ;
+
+            $field_id = 'rcmfd_new_category';
+            $new_category = new html_inputfield('name' => '_new_category', 'id' => $field_id, 'size' => 30);
+            $add_category = html::span('input-group-append',
+                html::a(
+                    
+                        'type'    => 'button',
+                        'class'   => 'button create input-group-text',
+                        'title'   => $this->gettext('add_category'),
+                        'onclick' => 'rcube_calendar_add_category()',
+                        'href'    => '#rcmfd_new_category',
+                    ,
+                    html::span('inner', $this->gettext('add_category'))
+                )
+            );
+
+            $p'blocks''categories''options''categories' = 
+                'content' => html::div('input-group', $new_category->show('') . $add_category),
+            ;
+
+            $this->rc->output->add_label('delete', 'calendar.remove_category');
+            $this->rc->output->add_script('
+function rcube_calendar_add_category() {
+    var name = $("#rcmfd_new_category").val();
+    if (name.length) {
+        var button_label = rcmail.gettext("calendar.remove_category");
+        var input = $("<input>").attr({type: "text", name: "_categories", size: 30, "class": "form-control"}).val(name);
+        var color = $("<input>").attr({type: "text", name: "_colors", size: 6, "class": "colors form-control"}).val("000000");
+        var button = $("<a>").attr({"class": "button icon delete input-group-text", title: button_label, href: "#rcmfd_new_category"})
+            .click(function() { $(this).parent().parent().remove(); })
+            .append($("<span>").addClass("inner").text(rcmail.gettext("delete")));
+
+        $("<div>").addClass("input-group").append(input).append(color).append($("<span class=\'input-group-append\'>").append(button))
+            .appendTo("#calendarcategories");
+        color.minicolors(rcmail.env.minicolors_config || {});
+        $("#rcmfd_new_category").val("");
+    }
+}',
+                'foot'
+            );
+
+            $this->rc->output->add_script('
+$("#rcmfd_new_category").keypress(function(event) {
+    if (event.which == 13) {
+        rcube_calendar_add_category();
+        event.preventDefault();
+    }
+});',
+                'docready'
+            );
+
+            // load miniColors js/css files
+            jqueryui::miniColors();
+        }
+
+        // virtual birthdays calendar
+        if (!isset($no_override'calendar_contact_birthdays')) {
+            $p'blocks''birthdays''name' = $this->gettext('birthdayscalendar');
+
+            if (empty($p'current')) {
+                $p'blocks''birthdays''content' = true;
+                return $p;
+            }
+
+            $field_id = 'rcmfd_contact_birthdays';
+            $input    = new html_checkbox(
+                    'name'    => '_contact_birthdays',
+                    'id'      => $field_id,
+                    'value'   => 1,
+                    'onclick' => '$(".calendar_birthday_props").prop("disabled",!this.checked)'
+            );
+
+            $p'blocks''birthdays''options''contact_birthdays' = 
+                'title'   => html::label($field_id, $this->gettext('displaybirthdayscalendar')),
+                'content' => $input->show($this->rc->config->get('calendar_contact_birthdays') ? 1 : 0),
+            ;
+
+            $input_attrib = 
+                'class'    => 'calendar_birthday_props',
+                'disabled' => !$this->rc->config->get('calendar_contact_birthdays'),
+            ;
+
+            $sources  = ;
+            $checkbox = new html_checkbox('name' => '_birthday_adressbooks' + $input_attrib);
+
+            foreach ($this->rc->get_address_sources(false, true) as $source) {
+                $active = in_array($source'id', (array) $this->rc->config->get('calendar_birthday_adressbooks')) ? $source'id' : '';
+                $sources = html::tag('li', null,
+                    html::label(null,
+                        $checkbox->show($active, 'value' => $source'id')
+                        . rcube::Q(!empty($source'realname') ? $source'realname' : $source'name')
+                    )
+                );
+            }
+
+            $p'blocks''birthdays''options''birthday_adressbooks' = 
+                'title'   => rcube::Q($this->gettext('birthdayscalendarsources')),
+                'content' => html::tag('ul', 'proplist', implode("\n", $sources)),
+            ;
+
+            $field_id = 'rcmfd_birthdays_alarm';
+            $select_type = new html_select('name' => '_birthdays_alarm_type', 'id' => $field_id + $input_attrib);
+            $select_type->add($this->gettext('none'), '');
+
+            foreach ($this->driver->alarm_types as $type) {
+                $select_type->add($this->rc->gettext(strtolower("alarm{$type}option"), 'libcalendaring'), $type);
+            }
+
+            $input_value   = new html_inputfield('name' => '_birthdays_alarm_value', 'id' => $field_id . 'value', 'size' => 3 + $input_attrib);
+            $select_offset = new html_select('name' => '_birthdays_alarm_offset', 'id' => $field_id . 'offset' + $input_attrib);
+
+            foreach ('-M','-H','-D' as $trigger) {
+                $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
+            }
+
+            $preset      = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
+            $preset_type = $this->rc->config->get('calendar_birthdays_alarm_type', '');
+
+            $p'blocks''birthdays''options''birthdays_alarmoffset' = 
+                'title'   => html::label($field_id, rcube::Q($this->gettext('showalarms'))),
+                'content' => html::div('input-group',
+                    $select_type->show($preset_type)
+                    . $input_value->show($preset0) . ' ' . $select_offset->show($preset1)
+                ),
+            ;
         }
-        else if ($success) {
-          $this->event_save_success($event, $old, $action, $success);
+
+        return $p;
+    }
+
+    /**
+     * Handler for preferences_save hook.
+     * Executed on Calendar settings form submit.
+     *
+     * @param array Original parameters
+     *
+     * @return array Modified parameters
+     */
+    function preferences_save($p)
+    {
+        if ($p'section' == 'calendar') {
+            $this->load_driver();
+
+            // compose default alarm preset value
+            $alarm_offset  = rcube_utils::get_input_value('_alarm_offset', rcube_utils::INPUT_POST);
+            $alarm_value   = rcube_utils::get_input_value('_alarm_value', rcube_utils::INPUT_POST);
+            $default_alarm = $alarm_offset0 . intval($alarm_value) . $alarm_offset1;
+
+            $birthdays_alarm_offset = rcube_utils::get_input_value('_birthdays_alarm_offset', rcube_utils::INPUT_POST);
+            $birthdays_alarm_value  = rcube_utils::get_input_value('_birthdays_alarm_value', rcube_utils::INPUT_POST);
+            $birthdays_alarm_value  = $birthdays_alarm_offset0 . intval($birthdays_alarm_value) . $birthdays_alarm_offset1;
+
+            $p'prefs' = 
+                'calendar_default_view' => rcube_utils::get_input_value('_default_view', rcube_utils::INPUT_POST),
+                'calendar_timeslots'    => intval(rcube_utils::get_input_value('_timeslots', rcube_utils::INPUT_POST)),
+                'calendar_first_day'    => intval(rcube_utils::get_input_value('_first_day', rcube_utils::INPUT_POST)),
+                'calendar_first_hour'   => intval(rcube_utils::get_input_value('_first_hour', rcube_utils::INPUT_POST)),
+                'calendar_work_start'   => intval(rcube_utils::get_input_value('_work_start', rcube_utils::INPUT_POST)),
+                'calendar_work_end'     => intval(rcube_utils::get_input_value('_work_end', rcube_utils::INPUT_POST)),
+                'calendar_show_weekno'  => intval(rcube_utils::get_input_value('_show_weekno', rcube_utils::INPUT_POST)),
+                'calendar_event_coloring'       => intval(rcube_utils::get_input_value('_event_coloring', rcube_utils::INPUT_POST)),
+                'calendar_default_alarm_type'   => rcube_utils::get_input_value('_alarm_type', rcube_utils::INPUT_POST),
+                'calendar_default_alarm_offset' => $default_alarm,
+                'calendar_default_calendar'     => rcube_utils::get_input_value('_default_calendar', rcube_utils::INPUT_POST),
+                'calendar_date_format'          => null,  // clear previously saved values
+                'calendar_time_format'          => null,
+                'calendar_contact_birthdays'      => (bool) rcube_utils::get_input_value('_contact_birthdays', rcube_utils::INPUT_POST),
+                'calendar_birthday_adressbooks'   => (array) rcube_utils::get_input_value('_birthday_adressbooks', rcube_utils::INPUT_POST),
+                'calendar_birthdays_alarm_type'   => rcube_utils::get_input_value('_birthdays_alarm_type', rcube_utils::INPUT_POST),
+                'calendar_birthdays_alarm_offset' => $birthdays_alarm_value ?: null,
+                'calendar_itip_after_action'      => intval(rcube_utils::get_input_value('_after_action', rcube_utils::INPUT_POST)),
+            ;
+
+            if ($p'prefs''calendar_itip_after_action' == 4) {
+                $p'prefs''calendar_itip_after_action' = rcube_utils::get_input_value('_after_action_folder', rcube_utils::INPUT_POST, true);
+            }
+
+            // categories
+            if (empty($this->driver->nocategories)) {
+                $old_categories = $new_categories = ;
+
+                foreach ($this->driver->list_categories() as $name => $color) {
+                    $old_categoriesmd5($name) = $name;
+                }
+
+                $categories = (array) rcube_utils::get_input_value('_categories', rcube_utils::INPUT_POST);
+                $colors     = (array) rcube_utils::get_input_value('_colors', rcube_utils::INPUT_POST);
+
+                foreach ($categories as $key => $name) {
+                    if (!isset($colors$key)) {
+                        continue;
+                    }
+
+                    $color = preg_replace('/^#/', '', strval($colors$key));
+
+                    // rename categories in existing events -> driver's job
+                    if (!empty($old_categories$key)) {
+                        $oldname = $old_categories$key;
+                        $this->driver->replace_category($oldname, $name, $color);
+                        unset($old_categories$key);
+                    }
+                    else {
+                        $this->driver->add_category($name, $color);
+                    }
+
+                    $new_categories$name = $color;
+                }
+
+                // these old categories have been removed, alter events accordingly -> driver's job
+                foreach ((array) $old_categories as $key => $name) {
+                    $this->driver->remove_category($name);
+                }
+
+                $p'prefs''calendar_categories' = $new_categories;
+            }
         }
-        break;
 
-      case "undo":
-        // Restore deleted event
-        if ($event = $_SESSION'calendar_event_undo''data')
-          $success = $this->driver->restore_event($event);
+        return $p;
+    }
 
-        if ($success) {
-          $this->rc->session->remove('calendar_event_undo');
-          $this->rc->output->show_message('calendar.successrestore', 'confirmation');
-          $got_msg = true;
-          $reload  = 2;
-        }
-
-        break;
-
-      case "rsvp":
-        $itip_sending  = $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
-        $status        = rcube_utils::get_input_value('status', rcube_utils::INPUT_POST);
-        $attendees     = rcube_utils::get_input_value('attendees', rcube_utils::INPUT_POST);
-        $reply_comment = $event'comment';
-
-        $this->write_preprocess($event, 'edit');
-        $ev = $this->driver->get_event($event);
-        $ev'attendees' = $event'attendees';
-        $ev'free_busy' = $event'free_busy';
-        $ev'_savemode' = $event'_savemode';
-        $ev'comment'   = $reply_comment;
-
-        // send invitation to delegatee + add it as attendee
-        if ($status == 'delegated' && $event'to') {
-          $itip = $this->load_itip();
-          if ($itip->delegate_to($ev, $event'to', (bool)$event'rsvp', $attendees)) {
-            $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
-            $noreply = false;
-          }
-        }
-
-        $event = $ev;
-
-        // compose a list of attendees affected by this change
-        $updated_attendees = array_filter(array_map(function($j) use ($event) {
-          return $event'attendees'$j;
-        }, $attendees));
-
-        if ($success = $this->driver->edit_rsvp($event, $status, $updated_attendees)) {
-          $noreply = rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC);
-          $noreply = intval($noreply) || $status == 'needs-action' || $itip_sending === 0;
-          $reload  = $event'calendar' != $ev'calendar' || $event'recurrence' ? 2 : 1;
-          $organizer = null;
-          $emails = $this->get_user_emails();
+    /**
+     * Dispatcher for calendar actions initiated by the client
+     */
+    function calendar_action()
+    {
+        $action  = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
+        $cal     = rcube_utils::get_input_value('c', rcube_utils::INPUT_GPC);
+        $success = false;
+        $reload  = false;
+
+        if (isset($cal'showalarms')) {
+            $cal'showalarms' = intval($cal'showalarms');
+        }
+
+        switch ($action) {
+        case "form-new":
+        case "form-edit":
+            echo $this->ui->calendar_editform($action, $cal);
+            exit;
+
+        case "new":
+            $success = $this->driver->create_calendar($cal);
+            $reload  = true;
+            break;
 
-          foreach ($event'attendees' as $i => $attendee) {
-            if ($attendee'role' == 'ORGANIZER') {
-              $organizer = $attendee;
+        case "edit":
+            $success = $this->driver->edit_calendar($cal);
+            $reload  = true;
+            break;
+
+        case "delete":
+            if ($success = $this->driver->delete_calendar($cal)) {
+                $this->rc->output->command('plugin.destroy_source', 'id' => $cal'id');
             }
-            else if ($attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
-              $reply_sender = $attendee'email';
+            break;
+
+        case "subscribe":
+            if (!$this->driver->subscribe_calendar($cal)) {
+                $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
             }
-          }
+            else {
+                $calendars = $this->driver->list_calendars();
+                $calendar  = !empty($calendars$cal'id') ? $calendars$cal'id' : null;
 
-          if (!$noreply) {
-            $itip = $this->load_itip();
-            $itip->set_sender_email($reply_sender);
-            $event'thisandfuture' = $event'_savemode' == 'future';
-            if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
-              $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer'name' ? $organizer'name' : $organizer'email'))), 'confirmation');
-            else
-              $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
-          }
-
-          // refresh all calendars
-          if ($event'calendar' != $ev'calendar') {
-            $this->rc->output->command('plugin.refresh_calendar', array('source' => null, 'refetch' => true));
-            $reload = 0;
-          }
-        }
-        break;
-
-      case "dismiss":
-        $event'ids' = explode(',', $event'id');
-        $plugin = $this->rc->plugins->exec_hook('dismiss_alarms', $event);
-        $success = $plugin'success';
-        foreach ($event'ids' as $id) {
-            if (strpos($id, 'cal:') === 0)
-                $success |= $this->driver->dismiss_alarm(substr($id, 4), $event'snooze');
-        }
-        break;
-
-      case "changelog":
-        $data = $this->driver->get_event_changelog($event);
-        if (is_array($data) && !empty($data)) {
-          $lib = $this->lib;
-          $dtformat = $this->rc->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
-          array_walk($data, function(&$change) use ($lib, $dtformat) {
-            if ($change'date') {
-              $dt = $lib->adjust_timezone($change'date');
-              if ($dt instanceof DateTime)
-                $change'date' = $this->rc->format_date($dt, $dtformat, false);
+                // find parent folder and check if it's a "user calendar"
+                // if it's also activated we need to refresh it (#5340)
+                while (!empty($calendar'parent')) {
+                    if (isset($calendars$calendar'parent')) {
+                        $calendar = $calendars$calendar'parent';
+                    }
+                    else {
+                        break;
+                    }
+                }
+
+                if ($calendar && $calendar'id' != $cal'id'
+                    && !empty($calendar'active')
+                    && $calendar'group' == "other user"
+                ) {
+                    $this->rc->output->command('plugin.refresh_source', $calendar'id');
+                }
             }
-          });
-          $this->rc->output->command('plugin.render_event_changelog', $data);
+            return;
+
+        case "search":
+            $results    = ;
+            $color_mode = $this->rc->config->get('calendar_event_coloring', $this->defaults'calendar_event_coloring');
+            $query      = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+            $source     = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+
+            foreach ((array) $this->driver->search_calendars($query, $source) as $id => $prop) {
+                $editname = $prop'editname';
+                unset($prop'editname');  // force full name to be displayed
+                $prop'active' = false;
+
+                // let the UI generate HTML and CSS representation for this calendar
+                $html = $this->ui->calendar_list_item($id, $prop, $jsenv);
+                $cal  = $jsenv$id;
+                $cal'editname' = $editname;
+                $cal'html'     = $html;
+
+                if (!empty($prop'color')) {
+                    $cal'css' = $this->ui->calendar_css_classes($id, $prop, $color_mode);
+                }
+
+                $results = $cal;
+            }
+
+            // report more results available
+            if (!empty($this->driver->search_more_results)) {
+                $this->rc->output->show_message('autocompletemore', 'notice');
+            }
+
+            $reqid = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
+            $this->rc->output->command('multi_thread_http_response', $results, $reqid);
+            return;
+        }
+
+        if ($success) {
+            $this->rc->output->show_message('successfullysaved', 'confirmation');
         }
         else {
-          $this->rc->output->command('plugin.render_event_changelog', false);
+            $error_msg = $this->gettext('errorsaving');
+            if (!empty($this->driver->last_error)) {
+                $error_msg .= ': ' . $this->driver->last_error;
+            }
+            $this->rc->output->show_message($error_msg, 'error');
         }
-        $got_msg = true;
-        $reload = false;
-        break;
-
-      case "diff":
-        $data = $this->driver->get_event_diff($event, $event'rev1', $event'rev2');
-        if (is_array($data)) {
-          // convert some properties, similar to self::_client_event()
-          $lib = $this->lib;
-          array_walk($data'changes', function(&$change, $i) use ($event, $lib) {
-            // convert date cols
-            foreach (array('start','end','created','changed') as $col) {
-              if ($change'property' == $col) {
-                $change'old' = $lib->adjust_timezone($change'old', strlen($change'old') == 10)->format('c');
-                $change'new' = $lib->adjust_timezone($change'new', strlen($change'new') == 10)->format('c');
-              }
-            }
-            // create textual representation for alarms and recurrence
-            if ($change'property' == 'alarms') {
-              if (is_array($change'old'))
-                $change'old_' = libcalendaring::alarm_text($change'old');
-              if (is_array($change'new'))
-                $change'new_' = libcalendaring::alarm_text(array_merge((array)$change'old', $change'new'));
-            }
-            if ($change'property' == 'recurrence') {
-              if (is_array($change'old'))
-                $change'old_' = $lib->recurrence_text($change'old');
-              if (is_array($change'new'))
-                $change'new_' = $lib->recurrence_text(array_merge((array)$change'old', $change'new'));
-            }
-            if ($change'property' == 'attachments') {
-              if (is_array($change'old'))
-                $change'old''classname' = rcube_utils::file2class($change'old''mimetype', $change'old''name');
-              if (is_array($change'new'))
-                $change'new''classname' = rcube_utils::file2class($change'new''mimetype', $change'new''name');
-            }
-            // compute a nice diff of description texts
-            if ($change'property' == 'description') {
-              $change'diff_' = libkolab::html_diff($change'old', $change'new');
+
+        $this->rc->output->command('plugin.unlock_saving');
+
+        if ($success && $reload) {
+            $this->rc->output->command('plugin.reload_view');
+        }
+    }
+
+    /**
+     * Dispatcher for event actions initiated by the client
+     */
+    function event_action()
+    {
+        $action  = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
+        $event   = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);
+        $success = $reload = $got_msg = false;
+        $old     = null;
+
+        // read old event data in order to find changes
+        if ((!empty($event'_notify') || !empty($event'_decline')) && $action != 'new') {
+            $old = $this->driver->get_event($event);
+
+            // load main event if savemode is 'all' or if deleting 'future' events
+            if (($event'_savemode' == 'all' || ($event'_savemode' == 'future' && $action == 'remove' && empty($event'_decline')))
+                && !empty($old'recurrence_id')
+            ) {
+                $old'id' = $old'recurrence_id';
+                $old = $this->driver->get_event($old);
             }
-          });
-          $this->rc->output->command('plugin.event_show_diff', $data);
         }
-        else {
-          $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
+
+        switch ($action) {
+        case "new":
+            // create UID for new event
+            $event'uid' = $this->generate_uid();
+            if (!$this->write_preprocess($event, $action)) {
+                $got_msg = true;
+            }
+            else if ($success = $this->driver->new_event($event)) {
+                $event'id'        = $event'uid';
+                $event'_savemode' = 'all';
+
+                $this->cleanup_event($event);
+                $this->event_save_success($event, null, $action, true);
+            }
+
+            $reload = $success && !empty($event'recurrence') ? 2 : 1;
+            break;
+
+        case "edit":
+            if (!$this->write_preprocess($event, $action)) {
+                $got_msg = true;
+            }
+            else if ($success = $this->driver->edit_event($event)) {
+                $this->cleanup_event($event);
+                $this->event_save_success($event, $old, $action, $success);
+            }
+
+            $reload = $success && (!empty($event'recurrence') || !empty($event'_savemode') || !empty($event'_fromcalendar')) ? 2 : 1;
+            break;
+
+        case "resize":
+            if (!$this->write_preprocess($event, $action)) {
+                $got_msg = true;
+            }
+            else if ($success = $this->driver->resize_event($event)) {
+                $this->event_save_success($event, $old, $action, $success);
+            }
+
+            $reload = !empty($event'_savemode') ? 2 : 1;
+            break;
+
+        case "move":
+            if (!$this->write_preprocess($event, $action)) {
+                $got_msg = true;
+            }
+            else if ($success = $this->driver->move_event($event)) {
+                $this->event_save_success($event, $old, $action, $success);
+            }
+
+            $reload = $success && !empty($event'_savemode') ? 2 : 1;
+            break;
+
+        case "remove":
+            // remove previous deletes
+            $undo_time = $this->driver->undelete ? $this->rc->config->get('undo_timeout', 0) : 0;
+
+            // search for event if only UID is given
+            if (!isset($event'calendar') && !empty($event'uid')) {
+                if (!($event = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE))) {
+                    break;
+                }
+                $undo_time = 0;
+            }
+
+            // Note: the driver is responsible for setting $_SESSION'calendar_event_undo'
+            //       containing 'ts' and 'data' elements
+            $success = $this->driver->remove_event($event, $undo_time < 1);
+            $reload = (!$success || !empty($event'_savemode')) ? 2 : 1;
+
+            if ($undo_time > 0 && $success) {
+                // display message with Undo link.
+                $onclick = sprintf("%s.http_request('event', 'action=undo', %s.display_message('', 'loading'))",
+                    rcmail_output::JS_OBJECT_NAME,
+                    rcmail_output::JS_OBJECT_NAME
+                );
+                $msg = html::span(null, $this->gettext('successremoval'))
+                    . ' ' . html::a('onclick' => $onclick, $this->gettext('undo'));
+
+                $this->rc->output->show_message($msg, 'confirmation', null, true, $undo_time);
+                $got_msg = true;
+            }
+            else if ($success) {
+                $this->rc->output->show_message('calendar.successremoval', 'confirmation');
+                $got_msg = true;
+            }
+
+            // send cancellation for the main event
+            if ($event'_savemode' == 'all') {
+                unset($old'_instance', $old'recurrence_date', $old'recurrence_id');
+            }
+            // send an update for the main event's recurrence rule instead of a cancellation message
+            else if ($event'_savemode' == 'future' && $success !== false && $success !== true) {
+                $event'_savemode' = 'all';  // force event_save_success() to load master event
+                $action  = 'edit';
+                $success = true;
+            }
+
+            // send iTIP reply that participant has declined the event
+            if ($success && !empty($event'_decline')) {
+                $emails    = $this->get_user_emails();
+                $organizer = null;
+
+                foreach ($old'attendees' as $i => $attendee) {
+                    if ($attendee'role' == 'ORGANIZER') {
+                        $organizer = $attendee;
+                    }
+                    else if (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
+                        $old'attendees'$i'status' = 'DECLINED';
+                        $reply_sender = $attendee'email';
+                    }
+                }
+
+                if ($event'_savemode' == 'future' && $event'id' != $old'id') {
+                    $old'thisandfuture' = true;
+                }
+
+                $itip = $this->load_itip();
+                $itip->set_sender_email($reply_sender);
+
+                if ($organizer && $itip->send_itip_message($old, 'REPLY', $organizer, 'itipsubjectdeclined', 'itipmailbodydeclined')) {
+                    $mailto = !empty($organizer'name') ? $organizer'name' : $organizer'email';
+                    $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
+
+                    $this->rc->output->command('display_message', $msg, 'confirmation');
+                }
+                else {
+                    $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+                }
+            }
+            else if ($success) {
+                $this->event_save_success($event, $old, $action, $success);
+            }
+
+            break;
+
+        case "undo":
+            // Restore deleted event
+            if (!empty($_SESSION'calendar_event_undo''data')) {
+                $event   = $_SESSION'calendar_event_undo''data';
+                $success = $this->driver->restore_event($event);
+            }
+
+            if ($success) {
+                $this->rc->session->remove('calendar_event_undo');
+                $this->rc->output->show_message('calendar.successrestore', 'confirmation');
+                $got_msg = true;
+                $reload  = 2;
+            }
+
+            break;
+
+        case "rsvp":
+            $itip_sending  = $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
+            $status        = rcube_utils::get_input_value('status', rcube_utils::INPUT_POST);
+            $attendees     = rcube_utils::get_input_value('attendees', rcube_utils::INPUT_POST);
+            $reply_comment = $event'comment';
+
+            $this->write_preprocess($event, 'edit');
+            $ev = $this->driver->get_event($event);
+            $ev'attendees' = $event'attendees';
+            $ev'free_busy' = $event'free_busy';
+            $ev'_savemode' = $event'_savemode';
+            $ev'comment'   = $reply_comment;
+
+            // send invitation to delegatee + add it as attendee
+            if ($status == 'delegated' && !empty($event'to')) {
+                $itip = $this->load_itip();
+                if ($itip->delegate_to($ev, $event'to', !empty($event'rsvp'), $attendees)) {
+                    $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
+                    $noreply = false;
+                }
+            }
+
+            $event = $ev;
+
+            // compose a list of attendees affected by this change
+            $updated_attendees = array_filter(array_map(function($j) use ($event) {
+                    return $event'attendees'$j;
+                },
+                $attendees
+            ));
+
+            if ($success = $this->driver->edit_rsvp($event, $status, $updated_attendees)) {
+                $noreply = rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC);
+                $noreply = intval($noreply) || $status == 'needs-action' || $itip_sending === 0;
+                $reload  = $event'calendar' != $ev'calendar' || !empty($event'recurrence') ? 2 : 1;
+                $emails  = $this->get_user_emails();
+                $organizer = null;
+
+                foreach ($event'attendees' as $i => $attendee) {
+                    if ($attendee'role' == 'ORGANIZER') {
+                        $organizer = $attendee;
+                    }
+                    else if (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
+                        $reply_sender = $attendee'email';
+                    }
+                }
+
+                if (!$noreply) {
+                    $itip = $this->load_itip();
+                    $itip->set_sender_email($reply_sender);
+                    $event'thisandfuture' = $event'_savemode' == 'future';
+
+                    if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status)) {
+                        $mailto = !empty($organizer'name') ? $organizer'name' : $organizer'email';
+                        $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
+
+                        $this->rc->output->command('display_message', $msg, 'confirmation');
+                    }
+                    else {
+                        $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+                    }
+                }
+
+                // refresh all calendars
+                if ($event'calendar' != $ev'calendar') {
+                    $this->rc->output->command('plugin.refresh_calendar', 'source' => null, 'refetch' => true);
+                    $reload = 0;
+                }
+            }
+
+            break;
+
+        case "dismiss":
+            $event'ids' = explode(',', $event'id');
+            $plugin  = $this->rc->plugins->exec_hook('dismiss_alarms', $event);
+            $success = $plugin'success';
+
+            foreach ($event'ids' as $id) {
+                if (strpos($id, 'cal:') === 0) {
+                    $success |= $this->driver->dismiss_alarm(substr($id, 4), $event'snooze');
+                }
+            }
+
+            break;
+
+        case "changelog":
+            $data = $this->driver->get_event_changelog($event);
+            if (is_array($data) && !empty($data)) {
+                $lib = $this->lib;
+                $dtformat = $this->rc->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
+                array_walk($data, function(&$change) use ($lib, $dtformat) {
+                    if (!empty($change'date')) {
+                        $dt = $lib->adjust_timezone($change'date');
+
+                        if ($dt instanceof DateTime) {
+                            $change'date' = $this->rc->format_date($dt, $dtformat, false);
+                        }
+                    }
+                });
+
+                $this->rc->output->command('plugin.render_event_changelog', $data);
+            }
+            else {
+                $this->rc->output->command('plugin.render_event_changelog', false);
+            }
+
+            $got_msg = true;
+            $reload  = false;
+
+            break;
+
+        case "diff":
+            $data = $this->driver->get_event_diff($event, $event'rev1', $event'rev2');
+            if (is_array($data)) {
+                // convert some properties, similar to self::_client_event()
+                $lib = $this->lib;
+                array_walk($data'changes', function(&$change, $i) use ($event, $lib) {
+                    // convert date cols
+                    foreach ('start', 'end', 'created', 'changed' as $col) {
+                        if ($change'property' == $col) {
+                            $change'old' = $lib->adjust_timezone($change'old', strlen($change'old') == 10)->format('c');
+                            $change'new' = $lib->adjust_timezone($change'new', strlen($change'new') == 10)->format('c');
+                        }
+                    }
+                    // create textual representation for alarms and recurrence
+                    if ($change'property' == 'alarms') {
+                        if (is_array($change'old')) {
+                            $change'old_' = libcalendaring::alarm_text($change'old');
+                        }
+                        if (is_array($change'new')) {
+                            $change'new_' = libcalendaring::alarm_text(array_merge((array)$change'old', $change'new'));
+                        }
+                    }
+                    if ($change'property' == 'recurrence') {
+                        if (is_array($change'old')) {
+                            $change'old_' = $lib->recurrence_text($change'old');
+                        }
+                        if (is_array($change'new')) {
+                            $change'new_' = $lib->recurrence_text(array_merge((array)$change'old', $change'new'));
+                        }
+                    }
+                    if ($change'property' == 'attachments') {
+                        if (is_array($change'old')) {
+                            $change'old''classname' = rcube_utils::file2class($change'old''mimetype', $change'old''name');
+                        }
+                        if (is_array($change'new')) {
+                            $change'new''classname' = rcube_utils::file2class($change'new''mimetype', $change'new''name');
+                        }
+                    }
+                    // compute a nice diff of description texts
+                    if ($change'property' == 'description') {
+                        $change'diff_' = libkolab::html_diff($change'old', $change'new');
+                    }
+                });
+
+                $this->rc->output->command('plugin.event_show_diff', $data);
+            }
+            else {
+                $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
+            }
+
+            $got_msg = true;
+            $reload  = false;
+
+            break;
+
+        case "show":
+            if ($event = $this->driver->get_event_revison($event, $event'rev')) {
+                $this->rc->output->command('plugin.event_show_revision', $this->_client_event($event));
+            }
+            else {
+                $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
+            }
+
+            $got_msg = true;
+            $reload  = false;
+            break;
+
+        case "restore":
+            if ($success = $this->driver->restore_event_revision($event, $event'rev')) {
+                $_event = $this->driver->get_event($event);
+                $reload = $_event'recurrence' ? 2 : 1;
+                $msg = $this->gettext('name' => 'objectrestoresuccess', 'vars' => 'rev' => $event'rev');
+                $this->rc->output->command('display_message', $msg, 'confirmation');
+                $this->rc->output->command('plugin.close_history_dialog');
+            }
+            else {
+                $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
+                $reload = 0;
+            }
+
+            $got_msg = true;
+            break;
         }
-        $got_msg = true;
-        $reload = false;
-        break;
-
-      case "show":
-        if ($event = $this->driver->get_event_revison($event, $event'rev')) {
-          $this->rc->output->command('plugin.event_show_revision', $this->_client_event($event));
+
+        // show confirmation/error message
+        if (!$got_msg) {
+            if ($success) {
+                $this->rc->output->show_message('successfullysaved', 'confirmation');
+            }
+            else {
+                $this->rc->output->show_message('calendar.errorsaving', 'error');
+            }
         }
-        else {
-          $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
+
+        // unlock client
+        $this->rc->output->command('plugin.unlock_saving', $success);
+
+        // update event object on the client or trigger a complete refresh if too complicated
+        if ($reload && empty($_REQUEST'_framed')) {
+            $args = 'source' => $event'calendar';
+            if ($reload > 1) {
+                $args'refetch' = true;
+            }
+            else if ($success && $action != 'remove') {
+                $args'update' = $this->_client_event($this->driver->get_event($event), true);
+            }
+            $this->rc->output->command('plugin.refresh_calendar', $args);
         }
-        $got_msg = true;
-        $reload = false;
-        break;
-
-      case "restore":
-        if ($success = $this->driver->restore_event_revision($event, $event'rev')) {
-          $_event = $this->driver->get_event($event);
-          $reload = $_event'recurrence' ? 2 : 1;
-          $this->rc->output->command('display_message', $this->gettext(array('name' => 'objectrestoresuccess', 'vars' => array('rev' => $event'rev'))), 'confirmation');
-          $this->rc->output->command('plugin.close_history_dialog');
+    }
+
+    /**
+     * Helper method sending iTip notifications after successful event updates
+     */
+    private function event_save_success(&$event, $old, $action, $success)
+    {
+        // $success is a new event ID
+        if ($success !== true) {
+            // send update notification on the main event
+            if ($event'_savemode' == 'future' && !empty($event'_notify')
+                && !empty($old'attendees') && !empty($old'recurrence_id')
+            ) {
+                $master = $this->driver->get_event('id' => $old'recurrence_id', 'calendar' => $old'calendar', 0, true);
+                unset($master'_instance', $master'recurrence_date');
+
+                $sent = $this->notify_attendees($master, null, $action, $event'_comment', false);
+                if ($sent < 0) {
+                    $this->rc->output->show_message('calendar.errornotifying', 'error');
+                }
+
+                $event'attendees' = $master'attendees';  // this tricks us into the next if clause
+            }
+
+            // delete old reference if saved as new
+            if ($event'_savemode' == 'future' || $event'_savemode' == 'new') {
+                $old = null;
+            }
+
+            $event'id'        = $success;
+            $event'_savemode' = 'all';
         }
-        else {
-          $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
-          $reload = 0;
+
+        // send out notifications
+        if (!empty($event'_notify') && (!empty($event'attendees') || !empty($old'attendees'))) {
+            $_savemode = $event'_savemode';
+
+            // send notification for the main event when savemode is 'all'
+            if ($action != 'remove' && $_savemode == 'all'
+                && (!empty($event'recurrence_id') || !empty($old'recurrence_id') || ($old && $old'id' != $event'id'))
+            ) {
+                if (!empty($event'recurrence_id')) {
+                    $event'id' = $event'recurrence_id';
+                }
+                else if (!empty($old'recurrence_id')) {
+                    $event'id' = $old'recurrence_id';
+                }
+                else {
+                    $event'id' = $old'id';
+                }
+                $event = $this->driver->get_event($event, 0, true);
+                unset($event'_instance', $event'recurrence_date');
+            }
+            else {
+                // make sure we have the complete record
+                $event = $action == 'remove' ? $old : $this->driver->get_event($event, 0, true);
+            }
+
+            $event'_savemode' = $_savemode;
+
+            if ($old) {
+                $old'thisandfuture' = $_savemode == 'future';
+            }
+
+            // only notify if data really changed (TODO: do diff check on client already)
+            if (!$old || $action == 'remove' || self::event_diff($event, $old)) {
+                $comment = isset($event'_comment') ? $event'_comment' : null;
+                $sent    = $this->notify_attendees($event, $old, $action, $comment);
+
+                if ($sent > 0) {
+                    $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
+                }
+                else if ($sent < 0) {
+                    $this->rc->output->show_message('calendar.errornotifying', 'error');
+                }
+            }
         }
-        $got_msg = true;
-        break;
     }
 
-    // show confirmation/error message
-    if (!$got_msg) {
-      if ($success)
-        $this->rc->output->show_message('successfullysaved', 'confirmation');
-      else
-        $this->rc->output->show_message('calendar.errorsaving', 'error');
-    }
-
-    // unlock client
-    $this->rc->output->command('plugin.unlock_saving', $success);
-
-    // update event object on the client or trigger a complete refresh if too complicated
-    if ($reload && empty($_REQUEST'_framed')) {
-      $args = array('source' => $event'calendar');
-      if ($reload > 1)
-        $args'refetch' = true;
-      else if ($success && $action != 'remove')
-        $args'update' = $this->_client_event($this->driver->get_event($event), true);
-      $this->rc->output->command('plugin.refresh_calendar', $args);
-    }
-  }
-
-  /**
-   * Helper method sending iTip notifications after successful event updates
-   */
-  private function event_save_success(&$event, $old, $action, $success)
-  {
-    // $success is a new event ID
-    if ($success !== true) {
-      // send update notification on the main event
-      if ($event'_savemode' == 'future' && $event'_notify' && $old'attendees' && $old'recurrence_id') {
-        $master = $this->driver->get_event(array('id' => $old'recurrence_id', 'calendar' => $old'calendar'), 0, true);
-        unset($master'_instance', $master'recurrence_date');
-
-        $sent = $this->notify_attendees($master, null, $action, $event'_comment', false);
-        if ($sent < 0)
-          $this->rc->output->show_message('calendar.errornotifying', 'error');
-
-        $event'attendees' = $master'attendees';  // this tricks us into the next if clause
-      }
-
-      // delete old reference if saved as new
-      if ($event'_savemode' == 'future' || $event'_savemode' == 'new') {
-        $old = null;
-      }
-
-      $event'id' = $success;
-      $event'_savemode' = 'all';
-    }
-
-    // send out notifications
-    if ($event'_notify' && ($event'attendees' || $old'attendees')) {
-      $_savemode = $event'_savemode';
-
-      // send notification for the main event when savemode is 'all'
-      if ($action != 'remove' && $_savemode == 'all' && ($event'recurrence_id' || $old'recurrence_id' || ($old && $old'id' != $event'id'))) {
-        $event'id' = $event'recurrence_id' ?: ($old'recurrence_id' ?: $old'id');
-        $event = $this->driver->get_event($event, 0, true);
-        unset($event'_instance', $event'recurrence_date');
-      }
-      else {
-        // make sure we have the complete record
-        $event = $action == 'remove' ? $old : $this->driver->get_event($event, 0, true);
-      }
-
-      $event'_savemode' = $_savemode;
-
-      if ($old) {
-        $old'thisandfuture' = $_savemode == 'future';
-      }
-
-      // only notify if data really changed (TODO: do diff check on client already)
-      if (!$old || $action == 'remove' || self::event_diff($event, $old)) {
-        $sent = $this->notify_attendees($event, $old, $action, $event'_comment');
-        if ($sent > 0)
-          $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
-        else if ($sent < 0)
-          $this->rc->output->show_message('calendar.errornotifying', 'error');
-      }
-    }
-  }
-
-  /**
-   * Handler for load-requests from fullcalendar
-   * This will return pure JSON formatted output
-   */
-  function load_events()
-  {
-    $start  = $this->input_timestamp('start', rcube_utils::INPUT_GET);
-    $end    = $this->input_timestamp('end', rcube_utils::INPUT_GET);
-    $query  = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET);
-    $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
-
-    $events = $this->driver->load_events($start, $end, $query, $source);
-    echo $this->encode($events, !empty($query));
-    exit;
-  }
-
-  /**
-   * Handler for requests fetching event counts for calendars
-   */
-  public function count_events()
-  {
-    // don't update session on these requests (avoiding race conditions)
-    $this->rc->session->nowrite = true;
-
-    $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
-    if (!$start) {
-      $start = new DateTime('today 00:00:00', $this->timezone);
-      $start = $start->format('U');
-    }
-
-    $counts = $this->driver->count_events(
-      rcube_utils::get_input_value('source', rcube_utils::INPUT_GET),
-      $start,
-      rcube_utils::get_input_value('end', rcube_utils::INPUT_GET)
-    );
-
-    $this->rc->output->command('plugin.update_counts', array('counts' => $counts));
-  }
-
-  /**
-   * Load event data from an iTip message attachment
-   */
-  public function itip_events($msgref)
-  {
-    $path = explode('/', $msgref);
-    $msg  = array_pop($path);
-    $mbox = join('/', $path);
-    list($uid, $mime_id) = explode('#', $msg);
-    $events = array();
-
-    if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
-      $partstat = 'NEEDS-ACTION';
-/*
-      $user_emails = $this->lib->get_user_emails();
-      foreach ($event'attendees' as $attendee) {
-        if (in_array($attendee'email', $user_emails)) {
-          $partstat = $attendee'status';
-          break;
-        }
-      }
-*/
-      $event'id'        = $event'uid';
-      $event'temporary' = true;
-      $event'readonly'  = true;
-      $event'calendar'  = '--invitation--itip';
-      $event'className' = 'fc-invitation-' . strtolower($partstat);
-      $event'_mbox'     = $mbox;
-      $event'_uid'      = $uid;
-      $event'_part'     = $mime_id;
-
-      $events = $this->_client_event($event, true);
-
-      // add recurring instances
-      if (!empty($event'recurrence')) {
-        // Some installations can't handle all occurrences (aborting the request w/o an error in log)
-        $end = clone $event'start';
-        $end->add(new DateInterval($event'recurrence''FREQ' == 'DAILY' ? 'P1Y' : 'P10Y'));
-
-        foreach ($this->driver->get_recurring_events($event, $event'start', $end) as $recurring) {
-          $recurring'temporary' = true;
-          $recurring'readonly'  = true;
-          $recurring'calendar'  = '--invitation--itip';
-          $events = $this->_client_event($recurring, true);
-        }
-      }
-    }
-
-    return $events;
-  }
-
-  /**
-   * Handler for keep-alive requests
-   * This will check for updated data in active calendars and sync them to the client
-   */
-  public function refresh($attr)
-  {
-     // refresh the entire calendar every 10th time to also sync deleted events
-    if (rand(0,10) == 10) {
-        $this->rc->output->command('plugin.refresh_calendar', array('refetch' => true));
-        return;
-    }
-
-    $counts = array();
-
-    foreach ($this->driver->list_calendars(calendar_driver::FILTER_ACTIVE) as $cal) {
-      $events = $this->driver->load_events(
-        rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC),
-        rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC),
-        rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC),
-        $cal'id',
-        1,
-        $attr'last'
-      );
-
-      foreach ($events as $event) {
-        $this->rc->output->command('plugin.refresh_calendar',
-          array('source' => $cal'id', 'update' => $this->_client_event($event)));
-      }
-
-      // refresh count for this calendar
-      if ($cal'counts') {
-        $today = new DateTime('today 00:00:00', $this->timezone);
-        $counts += $this->driver->count_events($cal'id', $today->format('U'));
-      }
-    }
-
-    if (!empty($counts)) {
-      $this->rc->output->command('plugin.update_counts', array('counts' => $counts));
-    }
-  }
-
-  /**
-   * Handler for pending_alarms plugin hook triggered by the calendar module on keep-alive requests.
-   * This will check for pending notifications and pass them to the client
-   */
-  public function pending_alarms($p)
-  {
-    $this->load_driver();
-    $time = $p'time' ?: time();
-    if ($alarms = $this->driver->pending_alarms($time)) {
-      foreach ($alarms as $alarm) {
-        $alarm'id' = 'cal:' . $alarm'id';  // prefix ID with cal:
-        $p'alarms' = $alarm;
-      }
-    }
-
-    // get alarms for birthdays calendar
-    if ($this->rc->config->get('calendar_contact_birthdays') && $this->rc->config->get('calendar_birthdays_alarm_type') == 'DISPLAY') {
-      $cache = $this->rc->get_cache('calendar.birthdayalarms', 'db');
-
-      foreach ($this->driver->load_birthday_events($time, $time + 86400 * 60) as $e) {
-        $alarm = libcalendaring::get_next_alarm($e);
-
-        // overwrite alarm time with snooze value (or null if dismissed)
-        if ($dismissed = $cache->get($e'id'))
-          $alarm'time' = $dismissed'notifyat';
-
-        // add to list if alarm is set
-        if ($alarm && $alarm'time' && $alarm'time' <= $time) {
-          $e'id' = 'cal:bday:' . $e'id';
-          $e'notifyat' = $alarm'time';
-          $p'alarms' = $e;
-        }
-      }
-    }
-
-    return $p;
-  }
-
-  /**
-   * Handler for alarm dismiss hook triggered by libcalendaring
-   */
-  public function dismiss_alarms($p)
-  {
-      $this->load_driver();
-      foreach ((array)$p'ids' as $id) {
-          if (strpos($id, 'cal:bday:') === 0) {
-              $p'success' |= $this->driver->dismiss_birthday_alarm(substr($id, 9), $p'snooze');
-          }
-          else if (strpos($id, 'cal:') === 0) {
-              $p'success' |= $this->driver->dismiss_alarm(substr($id, 4), $p'snooze');
-          }
-      }
-
-      return $p;
-  }
-
-  /**
-   * Handler for check-recent requests which are accidentally sent to calendar
-   */
-  function check_recent()
-  {
-    // NOP
-    $this->rc->output->send();
-  }
-
-  /**
-   * Hook triggered when a contact is saved
-   */
-  function contact_update($p)
-  {
-    // clear birthdays calendar cache
-    if (!empty($p'record''birthday')) {
-      $cache = $this->rc->get_cache('calendar.birthdays', 'db');
-      $cache->remove();
-    }
-  }
-
-  /**
-   *
-   */
-  function import_events()
-  {
-    // Upload progress update
-    if (!empty($_GET'_progress')) {
-      $this->rc->upload_progress();
-    }
-
-    @set_time_limit(0);
-
-    // process uploaded file if there is no error
-    $err = $_FILES'_data''error';
-
-    if (!$err && $_FILES'_data''tmp_name') {
-      $calendar   = rcube_utils::get_input_value('calendar', rcube_utils::INPUT_GPC);
-      $rangestart = $_REQUEST'_range' ? date_create("now -" . intval($_REQUEST'_range') . " months") : 0;
+    /**
+     * Handler for load-requests from fullcalendar
+     * This will return pure JSON formatted output
+     */
+    function load_events()
+    {
+        $start  = $this->input_timestamp('start', rcube_utils::INPUT_GET);
+        $end    = $this->input_timestamp('end', rcube_utils::INPUT_GET);
+        $query  = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET);
+        $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
 
-      // extract zip file
-      if ($_FILES'_data''type' == 'application/zip') {
-        $count = 0;
-        if (class_exists('ZipArchive', false)) {
-          $zip = new ZipArchive();
-          if ($zip->open($_FILES'_data''tmp_name')) {
-            $randname = uniqid('zip-' . session_id(), true);
-            $tmpdir = slashify($this->rc->config->get('temp_dir', sys_get_temp_dir())) . $randname;
-            mkdir($tmpdir, 0700);
-
-            // extract each ical file from the archive and import it
-            for ($i = 0; $i < $zip->numFiles; $i++) { 
-              $filename = $zip->getNameIndex($i);
-              if (preg_match('/\.ics$/i', $filename)) {
-                $tmpfile = $tmpdir . '/' . basename($filename);
-                if (copy('zip://' . $_FILES'_data''tmp_name' . '#'.$filename, $tmpfile)) {
-                  $count += $this->import_from_file($tmpfile, $calendar, $rangestart, $errors);
-                  unlink($tmpfile);
-                }
-              }
-            }
-
-            rmdir($tmpdir);
-            $zip->close();
-          }
-          else {
-            $errors = 1;
-            $msg = 'Failed to open zip file.';
-          }
+        $events = $this->driver->load_events($start, $end, $query, $source);
+        echo $this->encode($events, !empty($query));
+        exit;
+    }
+
+    /**
+     * Handler for requests fetching event counts for calendars
+     */
+    public function count_events()
+    {
+        // don't update session on these requests (avoiding race conditions)
+        $this->rc->session->nowrite = true;
+
+        $start  = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
+        $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
+        $end    = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET);
+
+        if (!$start) {
+            $start = new DateTime('today 00:00:00', $this->timezone);
+            $start = $start->format('U');
+        }
+
+        $counts = $this->driver->count_events($source, $start, $end);
+
+        $this->rc->output->command('plugin.update_counts', 'counts' => $counts);
+    }
+
+    /**
+     * Load event data from an iTip message attachment
+     */
+    public function itip_events($msgref)
+    {
+        $path = explode('/', $msgref);
+        $msg  = array_pop($path);
+        $mbox = join('/', $path);
+        list($uid, $mime_id) = explode('#', $msg);
+        $events = ;
+
+        if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
+            $partstat = 'NEEDS-ACTION';
+
+            $event'id'        = $event'uid';
+            $event'temporary' = true;
+            $event'readonly'  = true;
+            $event'calendar'  = '--invitation--itip';
+            $event'className' = 'fc-invitation-' . strtolower($partstat);
+            $event'_mbox'     = $mbox;
+            $event'_uid'      = $uid;
+            $event'_part'     = $mime_id;
+
+            $events = $this->_client_event($event, true);
+
+            // add recurring instances
+            if (!empty($event'recurrence')) {
+                // Some installations can't handle all occurrences (aborting the request w/o an error in log)
+                $freq = !empty($event'recurrence''FREQ') ? $event'recurrence''FREQ' : null;
+                $end  = clone $event'start';
+                $end->add(new DateInterval($freq == 'DAILY' ? 'P1Y' : 'P10Y'));
+
+                foreach ($this->driver->get_recurring_events($event, $event'start', $end) as $recurring) {
+                    $recurring'temporary' = true;
+                    $recurring'readonly'  = true;
+                    $recurring'calendar'  = '--invitation--itip';
+
+                    $events = $this->_client_event($recurring, true);
+                }
+            }
         }
-        else {
-          $errors = 1;
-          $msg = 'Zip files are not supported for import.';
+
+        return $events;
+    }
+
+    /**
+     * Handler for keep-alive requests
+     * This will check for updated data in active calendars and sync them to the client
+     */
+    public function refresh($attr)
+    {
+        // refresh the entire calendar every 10th time to also sync deleted events
+        if (rand(0, 10) == 10) {
+            $this->rc->output->command('plugin.refresh_calendar', 'refetch' => true);
+            return;
+        }
+
+        $counts = ;
+
+        foreach ($this->driver->list_calendars(calendar_driver::FILTER_ACTIVE) as $cal) {
+            $events = $this->driver->load_events(
+                rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC),
+                rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC),
+                rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC),
+                $cal'id',
+                1,
+                $attr'last'
+            );
+
+            foreach ($events as $event) {
+                $this->rc->output->command(
+                    'plugin.refresh_calendar',
+                    'source' => $cal'id', 'update' => $this->_client_event($event)
+                );
+            }
+
+            // refresh count for this calendar
+            if (!empty($cal'counts')) {
+                $today = new DateTime('today 00:00:00', $this->timezone);
+                $counts += $this->driver->count_events($cal'id', $today->format('U'));
+            }
+        }
+
+        if (!empty($counts)) {
+            $this->rc->output->command('plugin.update_counts', 'counts' => $counts);
         }
-      }
-      else {
-        // attempt to import teh uploaded file directly
-        $count = $this->import_from_file($_FILES'_data''tmp_name', $calendar, $rangestart, $errors);
-      }
-
-      if ($count) {
-        $this->rc->output->command('display_message', $this->gettext(array('name' => 'importsuccess', 'vars' => array('nr' => $count))), 'confirmation');
-        $this->rc->output->command('plugin.import_success', array('source' => $calendar, 'refetch' => true));
-      }
-      else if (!$errors) {
-        $this->rc->output->command('display_message', $this->gettext('importnone'), 'notice');
-        $this->rc->output->command('plugin.import_success', array('source' => $calendar));
-      }
-      else {
-        $this->rc->output->command('plugin.import_error', array('message' => $this->gettext('importerror') . ($msg ? ': ' . $msg : '')));
-      }
-    }
-    else {
-      if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-        $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
-            'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
-      }
-      else {
-        $msg = $this->rc->gettext('fileuploaderror');
-      }
-
-      $this->rc->output->command('plugin.import_error', array('message' => $msg));
-    }
-
-    $this->rc->output->send('iframe');
-  }
-
-  /**
-   * Helper function to parse and import a single .ics file
-   */
-  private function import_from_file($filepath, $calendar, $rangestart, &$errors)
-  {
-    $user_email = $this->rc->user->get_username();
-
-    $ical = $this->get_ical();
-    $errors = !$ical->fopen($filepath);
-    $count = $i = 0;
-    foreach ($ical as $event) {
-      // keep the browser connection alive on long import jobs
-      if (++$i > 100 && $i % 100 == 0) {
-          echo "";
-          ob_flush();
-      }
-
-      // TODO: correctly handle recurring events which start before $rangestart
-      if ($event'end' < $rangestart && (!$event'recurrence' || ($event'recurrence''until' && $event'recurrence''until' < $rangestart)))
-        continue;
-
-      $event'_owner' = $user_email;
-      $event'calendar' = $calendar;
-      if ($this->driver->new_event($event)) {
-        $count++;
-      }
-      else {
-        $errors++;
-      }
-    }
-
-    return $count;
-  }
-
-
-  /**
-   * Construct the ics file for exporting events to iCalendar format;
-   */
-  function export_events($terminate = true)
-  {
-    $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
-    $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET);
-
-    if (!isset($start))
-      $start = 'today -1 year';
-    if (!is_numeric($start))
-      $start = strtotime($start . ' 00:00:00');
-    if (!$end)
-      $end = 'today +10 years';
-    if (!is_numeric($end))
-      $end = strtotime($end . ' 23:59:59');
-
-    $event_id    = rcube_utils::get_input_value('id', rcube_utils::INPUT_GET);
-    $attachments = rcube_utils::get_input_value('attachments', rcube_utils::INPUT_GET);
-    $calid = $filename = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
-
-    $calendars = $this->driver->list_calendars();
-    $events = array();
-
-    if ($calendars$calid) {
-      $filename = $calendars$calid'name' ? $calendars$calid'name' : $calid;
-      $filename = asciiwords(html_entity_decode($filename));  // to 7bit ascii
-      if (!empty($event_id)) {
-        if ($event = $this->driver->get_event(array('calendar' => $calid, 'id' => $event_id), 0, true)) {
-          if ($event'recurrence_id') {
-            $event = $this->driver->get_event(array('calendar' => $calid, 'id' => $event'recurrence_id'), 0, true);
-          }
-          $events = array($event);
-          $filename = asciiwords($event'title');
-          if (empty($filename))
-            $filename = 'event';
-        }
-      }
-      else {
-         $events = $this->driver->load_events($start, $end, null, $calid, 0);
-         if (empty($filename))
-           $filename = $calid;
-      }
-    }
-
-    header("Content-Type: text/calendar");
-    header("Content-Disposition: inline; filename=".$filename.'.ics');
-
-    $this->get_ical()->export($events, '', true, $attachments ? array($this->driver, 'get_attachment_body') : null);
-
-    if ($terminate)
-      exit;
-  }
-
-
-  /**
-   * Handler for iCal feed requests
-   */
-  function ical_feed_export()
-  {
-    $session_exists = !empty($_SESSION'user_id');
-
-    // process HTTP auth info
-    if (!empty($_SERVER'PHP_AUTH_USER') && isset($_SERVER'PHP_AUTH_PW')) {
-      $_POST'_user' = $_SERVER'PHP_AUTH_USER'; // used for rcmail::autoselect_host()
-      $auth = $this->rc->plugins->exec_hook('authenticate', array(
-        'host' => $this->rc->autoselect_host(),
-        'user' => trim($_SERVER'PHP_AUTH_USER'),
-        'pass' => $_SERVER'PHP_AUTH_PW',
-        'cookiecheck' => true,
-        'valid' => true,
-      ));
-      if ($auth'valid' && !$auth'abort')
-        $this->rc->login($auth'user', $auth'pass', $auth'host');
-    }
-
-    // require HTTP auth
-    if (empty($_SESSION'user_id')) {
-      header('WWW-Authenticate: Basic realm="Roundcube Calendar"');
-      header('HTTP/1.0 401 Unauthorized');
-      exit;
-    }
-
-    // decode calendar feed hash
-    $format = 'ics';
-    $calhash = rcube_utils::get_input_value('_cal', rcube_utils::INPUT_GET);
-    if (preg_match(($suff_regex = '/\.(a-z0-9{3,5})$/i'), $calhash, $m)) {
-      $format = strtolower($m1);
-      $calhash = preg_replace($suff_regex, '', $calhash);
-    }
-
-    if (!strpos($calhash, ':'))
-      $calhash = base64_decode($calhash);
-
-    list($user, $_GET'source') = explode(':', $calhash, 2);
-
-    // sanity check user
-    if ($this->rc->user->get_username() == $user) {
-      $this->setup();
-      $this->load_driver();
-      $this->export_events(false);
-    }
-    else {
-      header('HTTP/1.0 404 Not Found');
-    }
-
-    // don't save session data
-    if (!$session_exists)
-      session_destroy();
-    exit;
-  }
-
-  /**
-   *
-   */
-  function load_settings()
-  {
-    $this->lib->load_settings();
-    $this->defaults += $this->lib->defaults;
-
-    $settings = array();
-
-    // configuration
-    $settings'default_view'     = (string) $this->rc->config->get('calendar_default_view', $this->defaults'calendar_default_view');
-    $settings'timeslots'        = (int) $this->rc->config->get('calendar_timeslots', $this->defaults'calendar_timeslots');
-    $settings'first_day'        = (int) $this->rc->config->get('calendar_first_day', $this->defaults'calendar_first_day');
-    $settings'first_hour'       = (int) $this->rc->config->get('calendar_first_hour', $this->defaults'calendar_first_hour');
-    $settings'work_start'       = (int) $this->rc->config->get('calendar_work_start', $this->defaults'calendar_work_start');
-    $settings'work_end'         = (int) $this->rc->config->get('calendar_work_end', $this->defaults'calendar_work_end');
-    $settings'agenda_range'     = (int) $this->rc->config->get('calendar_agenda_range', $this->defaults'calendar_agenda_range');
-    $settings'event_coloring'   = (int) $this->rc->config->get('calendar_event_coloring', $this->defaults'calendar_event_coloring');
-    $settings'time_indicator'   = (int) $this->rc->config->get('calendar_time_indicator', $this->defaults'calendar_time_indicator');
-    $settings'invite_shared'    = (int) $this->rc->config->get('calendar_allow_invite_shared', $this->defaults'calendar_allow_invite_shared');
-    $settings'itip_notify'      = (int) $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
-    $settings'show_weekno'      = (int) $this->rc->config->get('calendar_show_weekno', $this->defaults'calendar_show_weekno');
-    $settings'default_calendar' = $this->rc->config->get('calendar_default_calendar');
-    $settings'invitation_calendars' = (bool) $this->rc->config->get('kolab_invitation_calendars', false);
-
-    // 'table' view has been replaced by 'list' view
-    if ($settings'default_view' == 'table') {
-      $settings'default_view' = 'list';
-    }
-
-    // get user identity to create default attendee
-    if ($this->ui->screen == 'calendar') {
-      foreach ($this->rc->user->list_emails() as $rec) {
-        if (!$identity)
-          $identity = $rec;
-        $identity'emails' = $rec'email';
-        $settings'identities'$rec'identity_id' = $rec'email';
-      }
-      $identity'emails' = $this->rc->user->get_username();
-      $settings'identity' = array('name' => $identity'name', 'email' => strtolower($identity'email'), 'emails' => ';' . strtolower(join(';', $identity'emails')));
-    }
-
-    // freebusy token authentication URL
-    if (($url = $this->rc->config->get('calendar_freebusy_session_auth_url'))
-      && ($uniqueid = $this->rc->config->get('kolab_uniqueid'))
-    ) {
-      if ($url === true) $url = '/freebusy';
-      $url = rtrim(rcube_utils::resolve_url($url), '/ ');
-      $url .= '/' . urlencode($this->rc->get_user_name());
-      $url .= '/' . urlencode($uniqueid);
-
-      $settings'freebusy_url' = $url;
-    }
-
-    return $settings;
-  }
-
-  /**
-   * Encode events as JSON
-   *
-   * @param  array  Events as array
-   * @param  boolean Add CSS class names according to calendar and categories
-   * @return string JSON encoded events
-   */
-  function encode($events, $addcss = false)
-  {
-    $json = array();
-    foreach ($events as $event) {
-      $json = $this->_client_event($event, $addcss);
-    }
-    return rcube_output::json_serialize($json);
-  }
-
-  /**
-   * Convert an event object to be used on the client
-   */
-  private function _client_event($event, $addcss = false)
-  {
-    // compose a human readable strings for alarms_text and recurrence_text
-    if ($event'valarms') {
-      $event'alarms_text' = libcalendaring::alarms_text($event'valarms');
-      $event'valarms' = libcalendaring::to_client_alarms($event'valarms');
-    }
-    if ($event'recurrence') {
-      $event'recurrence_text' = $this->lib->recurrence_text($event'recurrence');
-      $event'recurrence' = $this->lib->to_client_recurrence($event'recurrence', $event'allday');
-      unset($event'recurrence_date');
-    }
-
-    foreach ((array)$event'attachments' as $k => $attachment) {
-      $event'attachments'$k'classname' = rcube_utils::file2class($attachment'mimetype', $attachment'name');
-
-      unset($event'attachments'$k'data', $event'attachments'$k'content');
-
-      if (!$attachment'id') {
-        $event'attachments'$k'id' = $k;
-      }
-    }
-
-    // convert link URIs references into structs
-    if (array_key_exists('links', $event)) {
-        foreach ((array) $event'links' as $i => $link) {
-            if (strpos($link, 'imap://') === 0 && ($msgref = $this->driver->get_message_reference($link))) {
-                $event'links'$i = $msgref;
-            }
-        }
-    }
-
-    // check for organizer in attendees list
-    $organizer = null;
-    foreach ((array)$event'attendees' as $i => $attendee) {
-      if ($attendee'role' == 'ORGANIZER') {
-        $organizer = $attendee;
-      }
-      if ($attendee'status' == 'DELEGATED' && $attendee'rsvp' == false) {
-        $event'attendees'$i'noreply' = true;
-      }
-      else {
-        unset($event'attendees'$i'noreply');
-      }
-    }
-
-    if ($organizer === null && !empty($event'organizer')) {
-      $organizer = $event'organizer';
-      $organizer'role' = 'ORGANIZER';
-      if (!is_array($event'attendees'))
-        $event'attendees' = array();
-      array_unshift($event'attendees', $organizer);
-    }
-
-    // Convert HTML description into plain text
-    if ($this->is_html($event)) {
-      $h2t = new rcube_html2text($event'description', false, true, 0);
-      $event'description' = trim($h2t->get_text());
-    }
-
-    // mapping url => vurl, allday => allDay because of the fullcalendar client script
-    $event'vurl' = $event'url';
-    $event'allDay' = !empty($event'allday');
-    unset($event'url');
-    unset($event'allday');
-
-    $event'className' = $event'className' ? explode(' ', $event'className') : array();
-
-    if ($event'allDay') {
-        $event'end' = $event'end'->add(new DateInterval('P1D'));
-    }
-
-    if ($_GET'mode' == 'print') {
-        $event'editable' = false;
-    }
-
-    return array(
-      '_id'   => $event'calendar' . ':' . $event'id',  // unique identifier for fullcalendar
-      'start' => $this->lib->adjust_timezone($event'start', $event'allDay')->format('c'),
-      'end'   => $this->lib->adjust_timezone($event'end', $event'allDay')->format('c'),
-      // 'changed' might be empty for event recurrences (Bug #2185)
-      'changed' => $event'changed' ? $this->lib->adjust_timezone($event'changed')->format('c') : null,
-      'created' => $event'created' ? $this->lib->adjust_timezone($event'created')->format('c') : null,
-      'title'       => strval($event'title'),
-      'description' => strval($event'description'),
-      'location'    => strval($event'location'),
-    ) + $event;
-  }
-
-
-  /**
-   * Generate a unique identifier for an event
-   */
-  public function generate_uid()
-  {
-    return strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($this->rc->user->get_username()), 0, 16));
-  }
-
-
-  /**
-   * TEMPORARY: generate random event data for testing
-   * Create events by opening http://<roundcubeurl>/?_task=calendar&_action=randomdata&_num=500&_date=2014-08-01&_dev=120
-   */
-  public function generate_randomdata()
-  {
-    @set_time_limit(0);
-
-    $num   = $_REQUEST'_num' ? intval($_REQUEST'_num') : 100;
-    $date  = $_REQUEST'_date' ?: 'now';
-    $dev   = $_REQUEST'_dev' ?: 30;
-    $cats  = array_keys($this->driver->list_categories());
-    $cals  = $this->driver->list_calendars(calendar_driver::FILTER_ACTIVE);
-    $count = 0;
-
-    while ($count++ < $num) {
-      $spread = intval($dev) * 86400; // days
-      $refdate = strtotime($date);
-      $start = round(($refdate + rand(-$spread, $spread)) / 600) * 600;
-      $duration = round(rand(30, 360) / 30) * 30 * 60;
-      $allday = rand(0,20) > 18;
-      $alarm = rand(-30,12) * 5;
-      $fb = rand(0,2);
-      
-      if (date('G', $start) > 23)
-        $start -= 3600;
-      
-      if ($allday) {
-        $start = strtotime(date('Y-m-d 00:00:00', $start));
-        $duration = 86399;
-      }
-      
-      $title = '';
-      $len = rand(2, 12);
-      $words = explode(" ", "The Hough transform is named after Paul Hough who patented the method in 1962. It is a technique which can be used to isolate features of a particular shape within an image. Because it requires that the desired features be specified in some parametric form, the classical Hough transform is most commonly used for the de- tection of regular curves such as lines, circles, ellipses, etc. A generalized Hough transform can be employed in applications where a simple analytic description of a feature(s) is not possible. Due to the computational complexity of the generalized Hough algorithm, we restrict the main focus of this discussion to the classical Hough transform. Despite its domain restrictions, the classical Hough transform (hereafter referred to without the classical prefix ) retains many applications, as most manufac- tured parts (and many anatomical parts investigated in medical imagery) contain feature boundaries which can be described by regular curves. The main advantage of the Hough transform technique is that it is tolerant of gaps in feature boundary descriptions and is relatively unaffected by image noise.");
-//      $chars = "!# abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890";
-      for ($i = 0; $i < $len; $i++)
-        $title .= $wordsrand(0,count($words)-1) . " ";
-      
-      $this->driver->new_event(array(
-        'uid' => $this->generate_uid(),
-        'start' => new DateTime('@'.$start),
-        'end' => new DateTime('@'.($start + $duration)),
-        'allday' => $allday,
-        'title' => rtrim($title),
-        'free_busy' => $fb == 2 ? 'outofoffice' : ($fb ? 'busy' : 'free'),
-        'categories' => $catsarray_rand($cats),
-        'calendar' => array_rand($cals),
-        'alarms' => $alarm > 0 ? "-{$alarm}M:DISPLAY" : '',
-        'priority' => rand(0,9),
-      ));
-    }
-    
-    $this->rc->output->redirect('');
-  }
-
-  /**
-   * Handler for attachments upload
-   */
-  public function attachment_upload()
-  {
-    $handler = new kolab_attachments_handler();
-    $handler->attachment_upload(self::SESSION_KEY, 'cal-');
-  }
-
-  /**
-   * Handler for attachments download/displaying
-   */
-  public function attachment_get()
-  {
-    $handler = new kolab_attachments_handler();
-
-    // show loading page
-    if (!empty($_GET'_preload')) {
-        return $handler->attachment_loading_page();
-    }
-
-    $event_id = rcube_utils::get_input_value('_event', rcube_utils::INPUT_GPC);
-    $calendar = rcube_utils::get_input_value('_cal', rcube_utils::INPUT_GPC);
-    $id       = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
-    $rev      = rcube_utils::get_input_value('_rev', rcube_utils::INPUT_GPC);
-
-    $event = array('id' => $event_id, 'calendar' => $calendar, 'rev' => $rev);
-
-    if ($calendar == '--invitation--itip') {
-        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC);
-        $part = rcube_utils::get_input_value('_part', rcube_utils::INPUT_GPC);
-        $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC);
-
-        $event      = $this->lib->mail_get_itip_object($mbox, $uid, $part, 'event');
-        $attachment = $event'attachments'$id;
-        $attachment'body' = &$attachment'data';
-    }
-    else {
-        $attachment = $this->driver->get_attachment($id, $event);
-    }
-
-    // show part page
-    if (!empty($_GET'_frame')) {
-        $handler->attachment_page($attachment);
-    }
-    // deliver attachment content
-    else if ($attachment) {
-        if ($calendar != '--invitation--itip') {
-            $attachment'body' = $this->driver->get_attachment_body($id, $event);
-        }
-
-        $handler->attachment_get($attachment);
-    }
-
-    // if we arrive here, the requested part was not found
-    header('HTTP/1.1 404 Not Found');
-    exit;
-  }
-
-  /**
-   * Determine whether the given event description is HTML formatted
-   */
-  private function is_html($event)
-  {
-      // check for opening and closing <html> or <body> tags
-      return (preg_match('/<(html|body)(\s+a-z|>)/', $event'description', $m) && strpos($event'description', '</'.$m1.'>') > 0);
-  }
-
-  /**
-   * Prepares new/edited event properties before save
-   */
-  private function write_preprocess(&$event, $action)
-  {
-    // Remove double timezone specification (T2313)
-    $event'start' = preg_replace('/\s*$.*$/', '', $event'start');
-    $event'end'   = preg_replace('/\s*$.*$/', '', $event'end');
-
-    // convert dates into DateTime objects in user's current timezone
-    $event'start'  = new DateTime($event'start', $this->timezone);
-    $event'end'    = new DateTime($event'end', $this->timezone);
-    $event'allday' = !empty($event'allDay');
-    unset($event'allDay');
-
-    // start/end is all we need for 'move' action (#1480)
-    if ($action == 'move') {
-      return true;
-    }
-
-    // convert the submitted recurrence settings
-    if (is_array($event'recurrence')) {
-      $event'recurrence' = $this->lib->from_client_recurrence($event'recurrence', $event'start');
-
-      // align start date with the first occurrence
-      if (!empty($event'recurrence') && !empty($event'syncstart')
-        && (empty($event'_savemode') || $event'_savemode' == 'all')
-      ) {
-        $next = $this->find_first_occurrence($event);
-
-        if (!$next) {
-          $this->rc->output->show_message('calendar.recurrenceerror', 'error');
-          return false;
-        }
-        else if ($event'start' != $next) {
-          $diff = $event'start'->diff($event'end', true);
-
-          $event'start' = $next;
-          $event'end'   = clone $next;
-          $event'end'->add($diff);
-        }
-      }
-    }
-
-    // convert the submitted alarm values
-    if ($event'valarms') {
-      $event'valarms' = libcalendaring::from_client_alarms($event'valarms');
-    }
-
-    $attachments = array();
-    $eventid     = 'cal-'.$event'id';
-
-    if (is_array($_SESSIONself::SESSION_KEY) && $_SESSIONself::SESSION_KEY'id' == $eventid) {
-      if (!empty($_SESSIONself::SESSION_KEY'attachments')) {
-        foreach ($_SESSIONself::SESSION_KEY'attachments' as $id => $attachment) {
-          if (is_array($event'attachments') && in_array($id, $event'attachments')) {
-            $attachments$id = $this->rc->plugins->exec_hook('attachment_get', $attachment);
-          }
-        }
-      }
-    }
-
-    $event'attachments' = $attachments;
-
-    // convert link references into simple URIs
-    if (array_key_exists('links', $event)) {
-      $event'links' = array_map(function($link) {
-          return is_array($link) ? $link'uri' : strval($link);
-        }, (array)$event'links');
-    }
-
-    // check for organizer in attendees
-    if ($action == 'new' || $action == 'edit') {
-      if (!$event'attendees')
-        $event'attendees' = array();
-
-      $emails = $this->get_user_emails();
-      $organizer = $owner = false;
-      foreach ((array)$event'attendees' as $i => $attendee) {
-        if ($attendee'role' == 'ORGANIZER')
-          $organizer = $i;
-        if ($attendee'email' && in_array(strtolower($attendee'email'), $emails))
-          $owner = $i;
-        if (!isset($attendee'rsvp'))
-          $event'attendees'$i'rsvp' = true;
-        else if (is_string($attendee'rsvp'))
-          $event'attendees'$i'rsvp' = $attendee'rsvp' == 'true' || $attendee'rsvp' == '1';
-      }
-
-      if (!empty($event'_identity')) {
-        $identity = $this->rc->user->get_identity($event'_identity');
-      }
-
-      // set new organizer identity
-      if ($organizer !== false && $identity) {
-        $event'attendees'$organizer'name' = $identity'name';
-        $event'attendees'$organizer'email' = $identity'email';
-      }
-      // set owner as organizer if yet missing
-      else if ($organizer === false && $owner !== false) {
-        $event'attendees'$owner'role' = 'ORGANIZER';
-        unset($event'attendees'$owner'rsvp');
-      }
-      // fallback to the selected identity
-      else if ($organizer === false && $identity) {
-        $event'attendees' = array(
-          'role'  => 'ORGANIZER',
-          'name'  => $identity'name',
-          'email' => $identity'email',
-        );
-      }
     }
 
-    // mapping url => vurl because of the fullcalendar client script
-    if (array_key_exists('vurl', $event)) {
-      $event'url' = $event'vurl';
-      unset($event'vurl');
+    /**
+     * Handler for pending_alarms plugin hook triggered by the calendar module on keep-alive requests.
+     * This will check for pending notifications and pass them to the client
+     */
+    public function pending_alarms($p)
+    {
+        $this->load_driver();
+
+        $time = !empty($p'time') ? $p'time' : time();
+
+        if ($alarms = $this->driver->pending_alarms($time)) {
+            foreach ($alarms as $alarm) {
+                $alarm'id' = 'cal:' . $alarm'id';  // prefix ID with cal:
+                $p'alarms' = $alarm;
+            }
+        }
+
+        // get alarms for birthdays calendar
+        if (
+            $this->rc->config->get('calendar_contact_birthdays')
+            && $this->rc->config->get('calendar_birthdays_alarm_type') == 'DISPLAY'
+        ) {
+            $cache = $this->rc->get_cache('calendar.birthdayalarms', 'db');
+
+            foreach ($this->driver->load_birthday_events($time, $time + 86400 * 60) as $e) {
+                $alarm = libcalendaring::get_next_alarm($e);
+
+                // overwrite alarm time with snooze value (or null if dismissed)
+                if ($dismissed = $cache->get($e'id')) {
+                    $alarm'time' = $dismissed'notifyat';
+                }
+
+                // add to list if alarm is set
+                if ($alarm && !empty($alarm'time') && $alarm'time' <= $time) {
+                    $e'id'       = 'cal:bday:' . $e'id';
+                    $e'notifyat' = $alarm'time';
+                    $p'alarms' = $e;
+                }
+            }
+        }
+
+        return $p;
     }
 
-    return true;
-  }
+    /**
+     * Handler for alarm dismiss hook triggered by libcalendaring
+     */
+    public function dismiss_alarms($p)
+    {
+        $this->load_driver();
+
+        foreach ((array) $p'ids' as $id) {
+            if (strpos($id, 'cal:bday:') === 0) {
+                $p'success' |= $this->driver->dismiss_birthday_alarm(substr($id, 9), $p'snooze');
+            }
+            else if (strpos($id, 'cal:') === 0) {
+                $p'success' |= $this->driver->dismiss_alarm(substr($id, 4), $p'snooze');
+            }
+        }
 
-  /**
-   * Releases some resources after successful event save
-   */
-  private function cleanup_event(&$event)
-  {
-    // remove temp. attachment files
-    if (!empty($_SESSIONself::SESSION_KEY) && ($eventid = $_SESSIONself::SESSION_KEY'id')) {
-      $this->rc->plugins->exec_hook('attachments_cleanup', array('group' => $eventid));
-      $this->rc->session->remove(self::SESSION_KEY);
+        return $p;
     }
-  }
 
-  /**
-   * Send out an invitation/notification to all event attendees
-   */
-  private function notify_attendees($event, $old, $action = 'edit', $comment = null, $rsvp = null)
-  {
-    if ($action == 'remove' || ($event'status' == 'CANCELLED' && $old'status' != $event'status')) {
-      $event'cancelled' = true;
-      $is_cancelled = true;
+    /**
+     * Handler for check-recent requests which are accidentally sent to calendar
+     */
+    function check_recent()
+    {
+        // NOP
+        $this->rc->output->send();
+    }
+
+    /**
+     * Hook triggered when a contact is saved
+     */
+    function contact_update($p)
+    {
+        // clear birthdays calendar cache
+        if (!empty($p'record''birthday')) {
+            $cache = $this->rc->get_cache('calendar.birthdays', 'db');
+            $cache->remove();
+        }
+    }
+
+    /**
+     *
+     */
+    function import_events()
+    {
+        // Upload progress update
+        if (!empty($_GET'_progress')) {
+            $this->rc->upload_progress();
+        }
+
+        @set_time_limit(0);
+
+        // process uploaded file if there is no error
+        $err = $_FILES'_data''error';
+
+        if (!$err && !empty($_FILES'_data''tmp_name')) {
+            $calendar   = rcube_utils::get_input_value('calendar', rcube_utils::INPUT_GPC);
+            $rangestart = !empty($_REQUEST'_range') ? date_create("now -" . intval($_REQUEST'_range') . " months") : 0;
+
+            // extract zip file
+            if ($_FILES'_data''type' == 'application/zip') {
+                $count = 0;
+                if (class_exists('ZipArchive', false)) {
+                    $zip = new ZipArchive();
+                    if ($zip->open($_FILES'_data''tmp_name')) {
+                        $randname = uniqid('zip-' . session_id(), true);
+                        $tmpdir = slashify($this->rc->config->get('temp_dir', sys_get_temp_dir())) . $randname;
+                        mkdir($tmpdir, 0700);
+
+                        // extract each ical file from the archive and import it
+                        for ($i = 0; $i < $zip->numFiles; $i++) {
+                            $filename = $zip->getNameIndex($i);
+                            if (preg_match('/\.ics$/i', $filename)) {
+                                $tmpfile = $tmpdir . '/' . basename($filename);
+                                if (copy('zip://' . $_FILES'_data''tmp_name' . '#'.$filename, $tmpfile)) {
+                                    $count += $this->import_from_file($tmpfile, $calendar, $rangestart, $errors);
+                                    unlink($tmpfile);
+                                }
+                            }
+                        }
+
+                        rmdir($tmpdir);
+                        $zip->close();
+                    }
+                    else {
+                        $errors = 1;
+                        $msg = 'Failed to open zip file.';
+                    }
+                }
+                else {
+                    $errors = 1;
+                    $msg = 'Zip files are not supported for import.';
+                }
+            }
+            else {
+                // attempt to import teh uploaded file directly
+                $count = $this->import_from_file($_FILES'_data''tmp_name', $calendar, $rangestart, $errors);
+            }
+
+            if ($count) {
+                $this->rc->output->command('display_message', $this->gettext('name' => 'importsuccess', 'vars' => 'nr' => $count), 'confirmation');
+                $this->rc->output->command('plugin.import_success', 'source' => $calendar, 'refetch' => true);
+            }
+            else if (!$errors) {
+                $this->rc->output->command('display_message', $this->gettext('importnone'), 'notice');
+                $this->rc->output->command('plugin.import_success', 'source' => $calendar);
+            }
+            else {
+                $this->rc->output->command('plugin.import_error', 'message' => $this->gettext('importerror') . ($msg ? ': ' . $msg : ''));
+            }
+        }
+        else {
+            if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+                $max = $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
+                $msg = $this->rc->gettext('name' => 'filesizeerror', 'vars' => 'size' => $max);
+            }
+            else {
+                $msg = $this->rc->gettext('fileuploaderror');
+            }
+
+            $this->rc->output->command('plugin.import_error', 'message' => $msg);
+        }
+
+        $this->rc->output->send('iframe');
     }
 
-    if ($rsvp === null)
-      $rsvp = !$old || $event'sequence' > $old'sequence';
+    /**
+     * Helper function to parse and import a single .ics file
+     */
+    private function import_from_file($filepath, $calendar, $rangestart, &$errors)
+    {
+        $user_email = $this->rc->user->get_username();
+        $ical       = $this->get_ical();
+        $errors     = !$ical->fopen($filepath);
 
-    $itip = $this->load_itip();
-    $emails = $this->get_user_emails();
-    $itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
+        $count = $i = 0;
 
-    // add comment to the iTip attachment
-    $event'comment' = $comment;
+        foreach ($ical as $event) {
+            // keep the browser connection alive on long import jobs
+            if (++$i > 100 && $i % 100 == 0) {
+                echo "";
+                ob_flush();
+            }
 
-    // set a valid recurrence-id if this is a recurrence instance
-    libcalendaring::identify_recurrence_instance($event);
+            // TODO: correctly handle recurring events which start before $rangestart
+            if ($rangestart && $event'end' < $rangestart
+                && (empty($event'recurrence') || (!empty($event'recurrence''until') && $event'recurrence''until' < $rangestart))
+            ) {
+                continue;
+            }
 
-    // compose multipart message using PEAR:Mail_Mime
-    $method = $action == 'remove' ? 'CANCEL' : 'REQUEST';
-    $message = $itip->compose_itip_message($event, $method, $rsvp);
+            $event'_owner'   = $user_email;
+            $event'calendar' = $calendar;
 
-    // list existing attendees from $old event
-    $old_attendees = array();
-    foreach ((array)$old'attendees' as $attendee) {
-      $old_attendees = $attendee'email';
+            if ($this->driver->new_event($event)) {
+                $count++;
+            }
+            else {
+                $errors++;
+            }
+        }
+
+        return $count;
     }
 
-    // send to every attendee
-    $sent = 0; $current = array();
-    foreach ((array)$event'attendees' as $attendee) {
-      $current = strtolower($attendee'email');
-      
-      // skip myself for obvious reasons
-      if (!$attendee'email' || in_array(strtolower($attendee'email'), $emails))
-        continue;
+    /**
+     * Construct the ics file for exporting events to iCalendar format;
+     */
+    function export_events($terminate = true)
+    {
+        $start       = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
+        $end         = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET);
+        $event_id    = rcube_utils::get_input_value('id', rcube_utils::INPUT_GET);
+        $attachments = rcube_utils::get_input_value('attachments', rcube_utils::INPUT_GET);
+        $calid       = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
+
+        if (!isset($start)) {
+            $start = 'today -1 year';
+        }
+        if (!is_numeric($start)) {
+            $start = strtotime($start . ' 00:00:00');
+        }
+        if (!$end) {
+            $end = 'today +10 years';
+        }
+        if (!is_numeric($end)) {
+            $end = strtotime($end . ' 23:59:59');
+        }
 
-      // skip if notification is disabled for this attendee
-      if ($attendee'noreply' && $itip_notify & 2)
-        continue;
+        $filename  = $calid;
+        $calendars = $this->driver->list_calendars();
+        $events    = ;
 
-      // skip if this attendee has delegated and set RSVP=FALSE
-      if ($attendee'status' == 'DELEGATED' && $attendee'rsvp' === false)
-        continue;
+        if (!empty($calendars$calid)) {
+            $filename = !empty($calendars$calid'name') ? $calendars$calid'name' : $calid;
+            $filename = asciiwords(html_entity_decode($filename));  // to 7bit ascii
 
-      // which template to use for mail text
-      $is_new = !in_array($attendee'email', $old_attendees);
-      $is_rsvp = $is_new || $event'sequence' > $old'sequence';
-      $bodytext = $is_cancelled ? 'eventcancelmailbody' : ($is_new ? 'invitationmailbody' : 'eventupdatemailbody');
-      $subject  = $is_cancelled ? 'eventcancelsubject'  : ($is_new ? 'invitationsubject' : ($event'title' ? 'eventupdatesubject':'eventupdatesubjectempty'));
+            if (!empty($event_id)) {
+                if ($event = $this->driver->get_event('calendar' => $calid, 'id' => $event_id, 0, true)) {
+                    if (!empty($event'recurrence_id')) {
+                        $event = $this->driver->get_event('calendar' => $calid, 'id' => $event'recurrence_id', 0, true);
+                    }
 
-      $event'comment' = $comment;
+                    $events   = $event;
+                    $filename = asciiwords($event'title');
 
-      // finally send the message
-      if ($itip->send_itip_message($event, $method, $attendee, $subject, $bodytext, $message, $is_rsvp))
-        $sent++;
-      else
-        $sent = -100;
+                    if (empty($filename)) {
+                        $filename = 'event';
+                    }
+                }
+            }
+            else {
+                $events = $this->driver->load_events($start, $end, null, $calid, 0);
+                if (empty($filename)) {
+                    $filename = $calid;
+                }
+            }
+        }
+
+        header("Content-Type: text/calendar");
+        header("Content-Disposition: inline; filename=".$filename.'.ics');
+
+        $this->get_ical()->export($events, '', true, $attachments ? $this->driver, 'get_attachment_body' : null);
+
+        if ($terminate) {
+            exit;
+        }
     }
 
-    // TODO: on change of a recurring (main) event, also send updates to differing attendess of recurrence exceptions
+    /**
+     * Handler for iCal feed requests
+     */
+    function ical_feed_export()
+    {
+        $session_exists = !empty($_SESSION'user_id');
+
+        // process HTTP auth info
+        if (!empty($_SERVER'PHP_AUTH_USER') && isset($_SERVER'PHP_AUTH_PW')) {
+            $_POST'_user' = $_SERVER'PHP_AUTH_USER'; // used for rcmail::autoselect_host()
+            $auth = $this->rc->plugins->exec_hook('authenticate', 
+                'host' => $this->rc->autoselect_host(),
+                'user' => trim($_SERVER'PHP_AUTH_USER'),
+                'pass' => $_SERVER'PHP_AUTH_PW',
+                'cookiecheck' => true,
+                'valid'       => true,
+            );
+
+            if ($auth'valid' && !$auth'abort') {
+                $this->rc->login($auth'user', $auth'pass', $auth'host');
+            }
+        }
+
+        // require HTTP auth
+        if (empty($_SESSION'user_id')) {
+            header('WWW-Authenticate: Basic realm="Kolab Calendar"');
+            header('HTTP/1.0 401 Unauthorized');
+            exit;
+        }
+
+        // decode calendar feed hash
+        $format  = 'ics';
+        $calhash = rcube_utils::get_input_value('_cal', rcube_utils::INPUT_GET);
+
+        if (preg_match(($suff_regex = '/\.(a-z0-9{3,5})$/i'), $calhash, $m)) {
+            $format  = strtolower($m1);
+            $calhash = preg_replace($suff_regex, '', $calhash);
+        }
+
+        if (!strpos($calhash, ':')) {
+            $calhash = base64_decode($calhash);
+        }
+
+        list($user, $_GET'source') = explode(':', $calhash, 2);
+
+        // sanity check user
+        if ($this->rc->user->get_username() == $user) {
+            $this->setup();
+            $this->load_driver();
+            $this->export_events(false);
+        }
+        else {
+            header('HTTP/1.0 404 Not Found');
+        }
 
-    // send CANCEL message to removed attendees
-    foreach ((array)$old'attendees' as $attendee) {
-      if ($attendee'role' == 'ORGANIZER' || !$attendee'email' || in_array(strtolower($attendee'email'), $current))
-        continue;
+        // don't save session data
+        if (!$session_exists) {
+            session_destroy();
+        }
 
-      $vevent = $old;
-      $vevent'cancelled' = $is_cancelled;
-      $vevent'attendees' = array($attendee);
-      $vevent'comment'   = $comment;
-      if ($itip->send_itip_message($vevent, 'CANCEL', $attendee, 'eventcancelsubject', 'eventcancelmailbody'))
-        $sent++;
-      else
-        $sent = -100;
+        exit;
     }
 
-    return $sent;
-  }
+    /**
+     *
+     */
+    function load_settings()
+    {
+        $this->lib->load_settings();
+        $this->defaults += $this->lib->defaults;
+
+        $settings = ;
+
+        // configuration
+        $settings'default_view'     = (string) $this->rc->config->get('calendar_default_view', $this->defaults'calendar_default_view');
+        $settings'timeslots'        = (int) $this->rc->config->get('calendar_timeslots', $this->defaults'calendar_timeslots');
+        $settings'first_day'        = (int) $this->rc->config->get('calendar_first_day', $this->defaults'calendar_first_day');
+        $settings'first_hour'       = (int) $this->rc->config->get('calendar_first_hour', $this->defaults'calendar_first_hour');
+        $settings'work_start'       = (int) $this->rc->config->get('calendar_work_start', $this->defaults'calendar_work_start');
+        $settings'work_end'         = (int) $this->rc->config->get('calendar_work_end', $this->defaults'calendar_work_end');
+        $settings'agenda_range'     = (int) $this->rc->config->get('calendar_agenda_range', $this->defaults'calendar_agenda_range');
+        $settings'event_coloring'   = (int) $this->rc->config->get('calendar_event_coloring', $this->defaults'calendar_event_coloring');
+        $settings'time_indicator'   = (int) $this->rc->config->get('calendar_time_indicator', $this->defaults'calendar_time_indicator');
+        $settings'invite_shared'    = (int) $this->rc->config->get('calendar_allow_invite_shared', $this->defaults'calendar_allow_invite_shared');
+        $settings'itip_notify'      = (int) $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
+        $settings'show_weekno'      = (int) $this->rc->config->get('calendar_show_weekno', $this->defaults'calendar_show_weekno');
+        $settings'default_calendar' = $this->rc->config->get('calendar_default_calendar');
+        $settings'invitation_calendars' = (bool) $this->rc->config->get('kolab_invitation_calendars', false);
+
+        // 'table' view has been replaced by 'list' view
+        if ($settings'default_view' == 'table') {
+            $settings'default_view' = 'list';
+        }
+
+        // get user identity to create default attendee
+        if ($this->ui->screen == 'calendar') {
+            foreach ($this->rc->user->list_emails() as $rec) {
+                if (empty($identity)) {
+                    $identity = $rec;
+                }
 
-  /**
-   * Echo simple free/busy status text for the given user and time range
-   */
-  public function freebusy_status()
-  {
-    $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
-    $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
-    $end   = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
+                $identity'emails' = $rec'email';
+                $settings'identities'$rec'identity_id' = $rec'email';
+            }
 
-    if (!$start) $start = time();
-    if (!$end) $end = $start + 3600;
+            $identity'emails' = $this->rc->user->get_username();
+            $settings'identity' = 
+                'name'   => $identity'name',
+                'email'  => strtolower($identity'email'),
+                'emails' => ';' . strtolower(join(';', $identity'emails'))
+            ;
+        }
 
-    $fbtypemap = array(calendar::FREEBUSY_UNKNOWN => 'UNKNOWN', calendar::FREEBUSY_FREE => 'FREE', calendar::FREEBUSY_BUSY => 'BUSY', calendar::FREEBUSY_TENTATIVE => 'TENTATIVE', calendar::FREEBUSY_OOF => 'OUT-OF-OFFICE');
-    $status = 'UNKNOWN';
+        // freebusy token authentication URL
+        if (($url = $this->rc->config->get('calendar_freebusy_session_auth_url'))
+            && ($uniqueid = $this->rc->config->get('kolab_uniqueid'))
+        ) {
+            if ($url === true) {
+                $url = '/freebusy';
+            }
+            $url = rtrim(rcube_utils::resolve_url($url), '/ ');
+            $url .= '/' . urlencode($this->rc->get_user_name());
+            $url .= '/' . urlencode($uniqueid);
 
-    // if the backend has free-busy information
-    $fblist = $this->driver->get_freebusy_list($email, $start, $end);
+            $settings'freebusy_url' = $url;
+        }
 
-    if (is_array($fblist)) {
-      $status = 'FREE';
+        return $settings;
+    }
 
-      foreach ($fblist as $slot) {
-        list($from, $to, $type) = $slot;
-        if ($from < $end && $to > $start) {
-          $status = isset($type) && $fbtypemap$type ? $fbtypemap$type : 'BUSY';
-          break;
+    /**
+     * Encode events as JSON
+     *
+     * @param array Events as array
+     * @param bool  Add CSS class names according to calendar and categories
+     *
+     * @return string JSON encoded events
+     */
+    function encode($events, $addcss = false)
+    {
+        $json = ;
+        foreach ($events as $event) {
+            $json = $this->_client_event($event, $addcss);
         }
-      }
+        return rcube_output::json_serialize($json);
     }
 
-    // let this information be cached for 5min
-    $this->rc->output->future_expire_header(300);
+    /**
+     * Convert an event object to be used on the client
+     */
+    private function _client_event($event, $addcss = false)
+    {
+        // compose a human readable strings for alarms_text and recurrence_text
+        if (!empty($event'valarms')) {
+            $event'alarms_text' = libcalendaring::alarms_text($event'valarms');
+            $event'valarms' = libcalendaring::to_client_alarms($event'valarms');
+        }
+
+        if (!empty($event'recurrence')) {
+            $event'recurrence_text' = $this->lib->recurrence_text($event'recurrence');
+            $event'recurrence' = $this->lib->to_client_recurrence($event'recurrence', $event'allday');
+            unset($event'recurrence_date');
+        }
+
+        if (!empty($event'attachments')) {
+            foreach ($event'attachments' as $k => $attachment) {
+                $event'attachments'$k'classname' = rcube_utils::file2class($attachment'mimetype', $attachment'name');
+
+                unset($event'attachments'$k'data', $event'attachments'$k'content');
+
+                if (empty($attachment'id')) {
+                    $event'attachments'$k'id' = $k;
+                }
+            }
+        }
+
+        // convert link URIs references into structs
+        if (array_key_exists('links', $event)) {
+            foreach ((array) $event'links' as $i => $link) {
+                if (strpos($link, 'imap://') === 0 && ($msgref = $this->driver->get_message_reference($link))) {
+                    $event'links'$i = $msgref;
+                }
+            }
+        }
+
+        // check for organizer in attendees list
+        $organizer = null;
+        foreach ((array) $event'attendees' as $i => $attendee) {
+            if ($attendee'role' == 'ORGANIZER') {
+                $organizer = $attendee;
+            }
+            if (!empty($attendee'status') && $attendee'status' == 'DELEGATED' && empty($attendee'rsvp')) {
+                $event'attendees'$i'noreply' = true;
+            }
+            else {
+                unset($event'attendees'$i'noreply');
+            }
+        }
+
+        if ($organizer === null && !empty($event'organizer')) {
+            $organizer = $event'organizer';
+            $organizer'role' = 'ORGANIZER';
+            if (!is_array($event'attendees')) {
+                $event'attendees' = $organizer;
+            }
+        }
 
-    echo $status;
-    exit;
-  }
+        // Convert HTML description into plain text
+        if ($this->is_html($event)) {
+            $h2t = new rcube_html2text($event'description', false, true, 0);
+            $event'description' = trim($h2t->get_text());
+        }
 
-  /**
-   * Return a list of free/busy time slots within the given period
-   * Echo data in JSON encoding
-   */
-  public function freebusy_times()
-  {
-    $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
-    $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
-    $end   = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
-    $interval  = intval(rcube_utils::get_input_value('interval', rcube_utils::INPUT_GPC));
-    $strformat = $interval > 60 ? 'Ymd' : 'YmdHis';
+        // mapping url => vurl, allday => allDay because of the fullcalendar client script
+        $event'vurl'   = $event'url';
+        $event'allDay' = !empty($event'allday');
+        unset($event'url');
+        unset($event'allday');
 
-    if (!$start) $start = time();
-    if (!$end)   $end = $start + 86400 * 30;
-    if (!$interval) $interval = 60;  // 1 hour
+        $event'className' = !empty($event'className') ? explode(' ', $event'className') : ;
 
-    if (!$dte) {
-      $dts = new DateTime('@'.$start);
-      $dts->setTimezone($this->timezone);
+        if ($event'allDay') {
+            $event'end' = $event'end'->add(new DateInterval('P1D'));
+        }
+
+        if (!empty($_GET'mode') && $_GET'mode' == 'print') {
+            $event'editable' = false;
+        }
+
+        return 
+            '_id'     => $event'calendar' . ':' . $event'id',  // unique identifier for fullcalendar
+            'start'   => $this->lib->adjust_timezone($event'start', $event'allDay')->format('c'),
+            'end'     => $this->lib->adjust_timezone($event'end', $event'allDay')->format('c'),
+            // 'changed' might be empty for event recurrences (Bug #2185)
+            'changed' => !empty($event'changed') ? $this->lib->adjust_timezone($event'changed')->format('c') : null,
+            'created' => !empty($event'created') ? $this->lib->adjust_timezone($event'created')->format('c') : null,
+            'title'       => strval($event'title'),
+            'description' => strval($event'description'),
+            'location'    => strval($event'location'),
+         + $event;
+    }
+
+    /**
+     * Generate a unique identifier for an event
+     */
+    public function generate_uid()
+    {
+        return strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($this->rc->user->get_username()), 0, 16));
     }
 
-    $fblist = $this->driver->get_freebusy_list($email, $start, $end);
-    $slots  = '';
+    /**
+     * TEMPORARY: generate random event data for testing
+     * Create events by opening http://<roundcubeurl>/?_task=calendar&_action=randomdata&_num=500&_date=2014-08-01&_dev=120
+     */
+    public function generate_randomdata()
+    {
+        @set_time_limit(0);
+
+        $num   = !empty($_REQUEST'_num') ? intval($_REQUEST'_num') : 100;
+        $date  = !empty($_REQUEST'_date') ? $_REQUEST'_date' : 'now';
+        $dev   = !empty($_REQUEST'_dev') ? $_REQUEST'_dev' : 30;
+        $cats  = array_keys($this->driver->list_categories());
+        $cals  = $this->driver->list_calendars(calendar_driver::FILTER_ACTIVE);
+        $count = 0;
+
+        while ($count++ < $num) {
+            $spread   = intval($dev) * 86400; // days
+            $refdate  = strtotime($date);
+            $start    = round(($refdate + rand(-$spread, $spread)) / 600) * 600;
+            $duration = round(rand(30, 360) / 30) * 30 * 60;
+            $allday   = rand(0,20) > 18;
+            $alarm    = rand(-30,12) * 5;
+            $fb       = rand(0,2);
+
+            if (date('G', $start) > 23) {
+                $start -= 3600;
+            }
+
+            if ($allday) {
+                $start    = strtotime(date('Y-m-d 00:00:00', $start));
+                $duration = 86399;
+            }
+
+            $title = '';
+            $len = rand(2, 12);
+            $words = explode(" ", "The Hough transform is named after Paul Hough who patented the method in 1962."
+                . " It is a technique which can be used to isolate features of a particular shape within an image."
+                . " Because it requires that the desired features be specified in some parametric form, the classical"
+                . " Hough transform is most commonly used for the de- tection of regular curves such as lines, circles,"
+                . " ellipses, etc. A generalized Hough transform can be employed in applications where a simple"
+                . " analytic description of a feature(s) is not possible. Due to the computational complexity of"
+                . " the generalized Hough algorithm, we restrict the main focus of this discussion to the classical"
+                . " Hough transform. Despite its domain restrictions, the classical Hough transform (hereafter"
+                . " referred to without the classical prefix ) retains many applications, as most manufac- tured"
+                . " parts (and many anatomical parts investigated in medical imagery) contain feature boundaries"
+                . " which can be described by regular curves. The main advantage of the Hough transform technique"
+                . " is that it is tolerant of gaps in feature boundary descriptions and is relatively unaffected"
+                . " by image noise.");
+            // $chars = "!# abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890";
+            for ($i = 0; $i < $len; $i++) {
+                $title .= $wordsrand(0,count($words)-1) . " ";
+            }
+
+            $this->driver->new_event(
+                'uid'        => $this->generate_uid(),
+                'start'      => new DateTime('@'.$start),
+                'end'        => new DateTime('@'.($start + $duration)),
+                'allday'     => $allday,
+                'title'      => rtrim($title),
+                'free_busy'  => $fb == 2 ? 'outofoffice' : ($fb ? 'busy' : 'free'),
+                'categories' => $catsarray_rand($cats),
+                'calendar'   => array_rand($cals),
+                'alarms'     => $alarm > 0 ? "-{$alarm}M:DISPLAY" : '',
+                'priority'   => rand(0,9),
+            );
+        }
+
+        $this->rc->output->redirect('');
+    }
+
+    /**
+     * Handler for attachments upload
+     */
+    public function attachment_upload()
+    {
+        $handler = new kolab_attachments_handler();
+        $handler->attachment_upload(self::SESSION_KEY, 'cal-');
+    }
+
+    /**
+     * Handler for attachments download/displaying
+     */
+    public function attachment_get()
+    {
+        $handler = new kolab_attachments_handler();
+
+        // show loading page
+        if (!empty($_GET'_preload')) {
+            return $handler->attachment_loading_page();
+        }
+
+        $event_id = rcube_utils::get_input_value('_event', rcube_utils::INPUT_GPC);
+        $calendar = rcube_utils::get_input_value('_cal', rcube_utils::INPUT_GPC);
+        $id       = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
+        $rev      = rcube_utils::get_input_value('_rev', rcube_utils::INPUT_GPC);
+
+        $event = 'id' => $event_id, 'calendar' => $calendar, 'rev' => $rev;
+
+        if ($calendar == '--invitation--itip') {
+            $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC);
+            $part = rcube_utils::get_input_value('_part', rcube_utils::INPUT_GPC);
+            $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC);
+
+            $event      = $this->lib->mail_get_itip_object($mbox, $uid, $part, 'event');
+            $attachment = $event'attachments'$id;
+            $attachment'body' = &$attachment'data';
+        }
+        else {
+            $attachment = $this->driver->get_attachment($id, $event);
+        }
 
-    // prepare freebusy list before use (for better performance)
-    if (is_array($fblist)) {
-      foreach ($fblist as $idx => $slot) {
-        list($from, $to, ) = $slot;
+        // show part page
+        if (!empty($_GET'_frame')) {
+            $handler->attachment_page($attachment);
+        }
+        // deliver attachment content
+        else if ($attachment) {
+            if ($calendar != '--invitation--itip') {
+                $attachment'body' = $this->driver->get_attachment_body($id, $event);
+            }
 
-        // check for possible all-day times
-        if (gmdate('His', $from) == '000000' && gmdate('His', $to) == '235959') {
-          // shift into the user's timezone for sane matching
-          $fblist$idx0 -= $this->gmt_offset;
-          $fblist$idx1 -= $this->gmt_offset;
+            $handler->attachment_get($attachment);
         }
-      }
+
+        // if we arrive here, the requested part was not found
+        header('HTTP/1.1 404 Not Found');
+        exit;
     }
 
-    // build a list from $start till $end with blocks representing the fb-status
-    for ($s = 0, $t = $start; $t <= $end; $s++) {
-      $t_end = $t + $interval * 60;
-      $dt = new DateTime('@'.$t);
-      $dt->setTimezone($this->timezone);
+    /**
+     * Determine whether the given event description is HTML formatted
+     */
+    private function is_html($event)
+    {
+          // check for opening and closing <html> or <body> tags
+        return preg_match('/<(html|body)(\s+a-z|>)/', $event'description', $m)
+            && strpos($event'description', '</'.$m1.'>') > 0;
+    }
+
+    /**
+     * Prepares new/edited event properties before save
+     */
+    private function write_preprocess(&$event, $action)
+    {
+        // Remove double timezone specification (T2313)
+        $event'start' = preg_replace('/\s*$.*$/', '', $event'start');
+        $event'end'   = preg_replace('/\s*$.*$/', '', $event'end');
+
+        // convert dates into DateTime objects in user's current timezone
+        $event'start'  = new DateTime($event'start', $this->timezone);
+        $event'end'    = new DateTime($event'end', $this->timezone);
+        $event'allday' = !empty($event'allDay');
+        unset($event'allDay');
+
+        // start/end is all we need for 'move' action (#1480)
+        if ($action == 'move') {
+            return true;
+        }
+
+        // convert the submitted recurrence settings
+        if (!empty($event'recurrence')) {
+            $event'recurrence' = $this->lib->from_client_recurrence($event'recurrence', $event'start');
+
+            // align start date with the first occurrence
+            if (!empty($event'recurrence') && !empty($event'syncstart')
+                && (empty($event'_savemode') || $event'_savemode' == 'all')
+            ) {
+                $next = $this->find_first_occurrence($event);
 
-      // determine attendee's status
-      if (is_array($fblist)) {
-        $status = self::FREEBUSY_FREE;
+                if (!$next) {
+                    $this->rc->output->show_message('calendar.recurrenceerror', 'error');
+                    return false;
+                }
+                else if ($event'start' != $next) {
+                    $diff = $event'start'->diff($event'end', true);
 
-        foreach ($fblist as $slot) {
-          list($from, $to, $type) = $slot;
+                    $event'start' = $next;
+                    $event'end'   = clone $next;
+                    $event'end'->add($diff);
+                }
+            }
+        }
 
-          if ($from < $t_end && $to > $t) {
-            $status = isset($type) ? $type : self::FREEBUSY_BUSY;
-            if ($status == self::FREEBUSY_BUSY)  // can't get any worse :-)
-              break;
-          }
+        // convert the submitted alarm values
+        if (!empty($event'valarms')) {
+            $event'valarms' = libcalendaring::from_client_alarms($event'valarms');
         }
-      }
-      else {
-        $status = self::FREEBUSY_UNKNOWN;
-      }
 
-      // use most compact format, assume $status is one digit/character
-      $slots .= $status;
-      $t = $t_end;
+        $attachments = ;
+        $eventid     = 'cal-' . (!empty($event'id') ? $event'id' : 'new-event');
+
+        if (!empty($_SESSIONself::SESSION_KEY) && $_SESSIONself::SESSION_KEY'id' == $eventid) {
+            if (!empty($_SESSIONself::SESSION_KEY'attachments')) {
+                foreach ($_SESSIONself::SESSION_KEY'attachments' as $id => $attachment) {
+                    if (!empty($event'attachments') && in_array($id, $event'attachments')) {
+                        $attachments$id = $this->rc->plugins->exec_hook('attachment_get', $attachment);
+                    }
+                }
+            }
+        }
+
+        $event'attachments' = $attachments;
+
+        // convert link references into simple URIs
+        if (array_key_exists('links', $event)) {
+            $event'links' = array_map(function($link) {
+                    return is_array($link) ? $link'uri' : strval($link);
+                },
+                (array) $event'links'
+            );
+        }
+
+        // check for organizer in attendees
+        if ($action == 'new' || $action == 'edit') {
+            if (empty($event'attendees')) {
+                $event'attendees' = ;
+            }
+
+            $emails = $this->get_user_emails();
+            $organizer = $owner = false;
+
+            foreach ((array) $event'attendees' as $i => $attendee) {
+                if ($attendee'role' == 'ORGANIZER') {
+                    $organizer = $i;
+                }
+                if (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
+                    $owner = $i;
+                }
+                if (!isset($attendee'rsvp')) {
+                    $event'attendees'$i'rsvp' = true;
+                }
+                else if (is_string($attendee'rsvp')) {
+                    $event'attendees'$i'rsvp' = $attendee'rsvp' == 'true' || $attendee'rsvp' == '1';
+                }
+            }
+
+            if (!empty($event'_identity')) {
+                $identity = $this->rc->user->get_identity($event'_identity');
+            }
+
+            // set new organizer identity
+            if ($organizer !== false && !empty($identity)) {
+                $event'attendees'$organizer'name'  = $identity'name';
+                $event'attendees'$organizer'email' = $identity'email';
+            }
+            // set owner as organizer if yet missing
+            else if ($organizer === false && $owner !== false) {
+                $event'attendees'$owner'role' = 'ORGANIZER';
+                unset($event'attendees'$owner'rsvp');
+            }
+            // fallback to the selected identity
+            else if ($organizer === false && !empty($identity)) {
+                $event'attendees' = 
+                    'role'  => 'ORGANIZER',
+                    'name'  => $identity'name',
+                    'email' => $identity'email',
+                ;
+            }
+        }
+
+        // mapping url => vurl because of the fullcalendar client script
+        if (array_key_exists('vurl', $event)) {
+            $event'url' = $event'vurl';
+            unset($event'vurl');
+        }
+
+        return true;
     }
 
-    $dte = new DateTime('@'.$t_end);
-    $dte->setTimezone($this->timezone);
+    /**
+     * Releases some resources after successful event save
+     */
+    private function cleanup_event(&$event)
+    {
+        // remove temp. attachment files
+        if (!empty($_SESSIONself::SESSION_KEY) && ($eventid = $_SESSIONself::SESSION_KEY'id')) {
+            $this->rc->plugins->exec_hook('attachments_cleanup', 'group' => $eventid);
+            $this->rc->session->remove(self::SESSION_KEY);
+        }
+    }
+
+    /**
+     * Send out an invitation/notification to all event attendees
+     */
+    private function notify_attendees($event, $old, $action = 'edit', $comment = null, $rsvp = null)
+    {
+        $is_cancelled = false;
+        if ($action == 'remove' || ($event'status' == 'CANCELLED' && $old'status' != $event'status')) {
+            $event'cancelled' = true;
+            $is_cancelled = true;
+        }
+
+        if ($rsvp === null) {
+            $rsvp = !$old || $event'sequence' > $old'sequence';
+        }
+
+        $itip        = $this->load_itip();
+        $emails      = $this->get_user_emails();
+        $itip_notify = (int) $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
+
+        // add comment to the iTip attachment
+        $event'comment' = $comment;
+
+        // set a valid recurrence-id if this is a recurrence instance
+        libcalendaring::identify_recurrence_instance($event);
+
+        // compose multipart message using PEAR:Mail_Mime
+        $method  = $action == 'remove' ? 'CANCEL' : 'REQUEST';
+        $message = $itip->compose_itip_message($event, $method, $rsvp);
+
+        // list existing attendees from $old event
+        $old_attendees = ;
+        if (!empty($old'attendees')) {
+            foreach ((array) $old'attendees' as $attendee) {
+                $old_attendees = $attendee'email';
+            }
+        }
+
+        // send to every attendee
+        $sent    = 0;
+        $current = ;
+        foreach ((array) $event'attendees' as $attendee) {
+            // skip myself for obvious reasons
+            if (empty($attendee'email') || in_array(strtolower($attendee'email'), $emails)) {
+                continue;
+            }
+
+            $current = strtolower($attendee'email');
+
+            // skip if notification is disabled for this attendee
+            if (!empty($attendee'noreply') && $itip_notify & 2) {
+                continue;
+            }
 
-    // let this information be cached for 5min
-    $this->rc->output->future_expire_header(300);
+            // skip if this attendee has delegated and set RSVP=FALSE
+            if ($attendee'status' == 'DELEGATED' && $attendee'rsvp' === false) {
+                continue;
+            }
 
-    echo rcube_output::json_serialize(array(
-      'email' => $email,
-      'start' => $dts->format('c'),
-      'end'   => $dte->format('c'),
-      'interval' => $interval,
-      'slots' => $slots,
-    ));
-    exit;
-  }
+            // which template to use for mail text
+            $is_new   = !in_array($attendee'email', $old_attendees);
+            $is_rsvp  = $is_new || $event'sequence' > $old'sequence';
+            $bodytext = $is_cancelled ? 'eventcancelmailbody' : ($is_new ? 'invitationmailbody' : 'eventupdatemailbody');
+            $subject  = $is_cancelled ? 'eventcancelsubject'  : ($is_new ? 'invitationsubject' : ($event'title' ? 'eventupdatesubject' : 'eventupdatesubjectempty'));
 
-  /**
-   * Handler for printing calendars
-   */
-  public function print_view()
-  {
-    $title = $this->gettext('print');
+            $event'comment' = $comment;
 
-    $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
-    if (!in_array($view, array('agendaWeek', 'agendaDay', 'month', 'list')))
-      $view = 'agendaDay';
+            // finally send the message
+            if ($itip->send_itip_message($event, $method, $attendee, $subject, $bodytext, $message, $is_rsvp)) {
+                $sent++;
+            }
+            else {
+                $sent = -100;
+            }
+        }
 
-    $this->rc->output->set_env('view', $view);
+        // TODO: on change of a recurring (main) event, also send updates to differing attendess of recurrence exceptions
 
-    if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC))
-      $this->rc->output->set_env('date', $date);
+        // send CANCEL message to removed attendees
+        if (!empty($old'attendees')) {
+            foreach ($old'attendees' as $attendee) {
+                if ($attendee'role' == 'ORGANIZER'
+                    || empty($attendee'email')
+                    || in_array(strtolower($attendee'email'), $current)
+                ) {
+                    continue;
+                }
 
-    if ($range = rcube_utils::get_input_value('range', rcube_utils::INPUT_GPC))
-      $this->rc->output->set_env('listRange', intval($range));
+                $vevent = $old;
+                $vevent'cancelled' = $is_cancelled;
+                $vevent'attendees' = $attendee;
+                $vevent'comment'   = $comment;
 
-    if ($search = rcube_utils::get_input_value('search', rcube_utils::INPUT_GPC)) {
-      $this->rc->output->set_env('search', $search);
-      $title .= ' "' . $search . '"';
+                if ($itip->send_itip_message($vevent, 'CANCEL', $attendee, 'eventcancelsubject', 'eventcancelmailbody')) {
+                    $sent++;
+                }
+                else {
+                    $sent = -100;
+                }
+            }
+        }
+
+        return $sent;
     }
 
-    // Add JS to the page
-    $this->ui->addJS();
+    /**
+     * Echo simple free/busy status text for the given user and time range
+     */
+    public function freebusy_status()
+    {
+        $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
+        $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
+        $end   = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
+
+        if (!$start) $start = time();
+        if (!$end) $end = $start + 3600;
+
+        $status = 'UNKNOWN';
+        $fbtypemap = 
+            calendar::FREEBUSY_UNKNOWN   => 'UNKNOWN',
+            calendar::FREEBUSY_FREE      => 'FREE',
+            calendar::FREEBUSY_BUSY      => 'BUSY',
+            calendar::FREEBUSY_TENTATIVE => 'TENTATIVE',
+            calendar::FREEBUSY_OOF       => 'OUT-OF-OFFICE'
+        ;
+
+        // if the backend has free-busy information
+        $fblist = $this->driver->get_freebusy_list($email, $start, $end);
+
+        if (is_array($fblist)) {
+            $status = 'FREE';
+
+            foreach ($fblist as $slot) {
+                list($from, $to, $type) = $slot;
+                if ($from < $end && $to > $start) {
+                    $status = isset($type) && !empty($fbtypemap$type) ? $fbtypemap$type : 'BUSY';
+                    break;
+                }
+            }
+        }
+
+        // let this information be cached for 5min
+        $this->rc->output->future_expire_header(300);
 
-    $this->register_handler('plugin.calendar_css', array($this->ui, 'calendar_css'));
-    $this->register_handler('plugin.calendar_list', array($this->ui, 'calendar_list'));
+        echo $status;
+        exit;
+    }
+
+    /**
+     * Return a list of free/busy time slots within the given period
+     * Echo data in JSON encoding
+     */
+    public function freebusy_times()
+    {
+        $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
+        $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
+        $end   = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
+        $interval  = intval(rcube_utils::get_input_value('interval', rcube_utils::INPUT_GPC));
+        $strformat = $interval > 60 ? 'Ymd' : 'YmdHis';
+
+        if (!$start) $start = time();
+        if (!$end)   $end = $start + 86400 * 30;
+        if (!$interval) $interval = 60;  // 1 hour
+
+        if (!$dte) {
+            $dts = new DateTime('@'.$start);
+            $dts->setTimezone($this->timezone);
+        }
+
+        $fblist = $this->driver->get_freebusy_list($email, $start, $end);
+        $slots  = '';
+
+        // prepare freebusy list before use (for better performance)
+        if (is_array($fblist)) {
+            foreach ($fblist as $idx => $slot) {
+                list($from, $to, ) = $slot;
+
+                // check for possible all-day times
+                if (gmdate('His', $from) == '000000' && gmdate('His', $to) == '235959') {
+                    // shift into the user's timezone for sane matching
+                    $fblist$idx0 -= $this->gmt_offset;
+                    $fblist$idx1 -= $this->gmt_offset;
+                }
+            }
+        }
+
+        // build a list from $start till $end with blocks representing the fb-status
+        for ($s = 0, $t = $start; $t <= $end; $s++) {
+            $t_end = $t + $interval * 60;
+            $dt = new DateTime('@'.$t);
+            $dt->setTimezone($this->timezone);
+
+            // determine attendee's status
+            if (is_array($fblist)) {
+                $status = self::FREEBUSY_FREE;
+
+                foreach ($fblist as $slot) {
+                    list($from, $to, $type) = $slot;
+
+                    if ($from < $t_end && $to > $t) {
+                        $status = isset($type) ? $type : self::FREEBUSY_BUSY;
+                        if ($status == self::FREEBUSY_BUSY) {
+                            // can't get any worse :-)
+                            break;
+                        }
+                    }
+                }
+            }
+            else {
+                $status = self::FREEBUSY_UNKNOWN;
+            }
+
+            // use most compact format, assume $status is one digit/character
+            $slots .= $status;
+            $t = $t_end;
+        }
 
-    $this->rc->output->set_pagetitle($title);
-    $this->rc->output->send('calendar.print');
-  }
+        $dte = new DateTime('@'.$t_end);
+        $dte->setTimezone($this->timezone);
 
-  /**
-   * Compare two event objects and return differing properties
-   *
-   * @param array Event A
-   * @param array Event B
-   * @return array List of differing event properties
-   */
-  public static function event_diff($a, $b)
-  {
-    $diff   = array();
-    $ignore = array('changed' => 1, 'attachments' => 1);
+        // let this information be cached for 5min
+        $this->rc->output->future_expire_header(300);
 
-    foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {
-      if (!$ignore$key && $key0 != '_' && $a$key != $b$key) {
-        $diff = $key;
-      }
+        echo rcube_output::json_serialize(
+            'email' => $email,
+            'start' => $dts->format('c'),
+            'end'   => $dte->format('c'),
+            'interval' => $interval,
+            'slots' => $slots,
+        );
+        exit;
     }
 
-    // only compare number of attachments
-    if (count((array) $a'attachments') != count((array) $b'attachments')) {
-      $diff = 'attachments';
+    /**
+     * Handler for printing calendars
+     */
+    public function print_view()
+    {
+        $title = $this->gettext('print');
+
+        $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
+        if (!in_array($view, 'agendaWeek', 'agendaDay', 'month', 'list')) {
+            $view = 'agendaDay';
+        }
+
+        $this->rc->output->set_env('view', $view);
+
+        if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC)) {
+            $this->rc->output->set_env('date', $date);
+        }
+
+        if ($range = rcube_utils::get_input_value('range', rcube_utils::INPUT_GPC)) {
+            $this->rc->output->set_env('listRange', intval($range));
+        }
+
+        if ($search = rcube_utils::get_input_value('search', rcube_utils::INPUT_GPC)) {
+            $this->rc->output->set_env('search', $search);
+            $title .= ' "' . $search . '"';
+        }
+
+        // Add JS to the page
+        $this->ui->addJS();
+
+        $this->register_handler('plugin.calendar_css', $this->ui, 'calendar_css');
+        $this->register_handler('plugin.calendar_list', $this->ui, 'calendar_list');
+
+        $this->rc->output->set_pagetitle($title);
+        $this->rc->output->send('calendar.print');
     }
 
-    return $diff;
-  }
+    /**
+     * Compare two event objects and return differing properties
+     *
+     * @param array Event A
+     * @param array Event B
+     *
+     * @return array List of differing event properties
+     */
+    public static function event_diff($a, $b)
+    {
+        $diff   = ;
+        $ignore = 'changed' => 1, 'attachments' => 1;
+
+        foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {
+            if (empty($ignore$key) && $key0 != '_') {
+                $av = isset($a$key) ? $a$key : null;
+                $bv = isset($b$key) ? $b$key : null;
+
+                if ($av != $bv) {
+                    $diff = $key;
+                }
+            }
+        }
+
+        // only compare number of attachments
+        $ac = !empty($a'attachments') ? count($a'attachments') : 0;
+        $bc = !empty($b'attachments') ? count($b'attachments') : 0;
+
+        if ($ac != $bc) {
+            $diff = 'attachments';
+        }
 
-  /**
-   * Update attendee properties on the given event object
-   *
-   * @param array The event object to be altered
-   * @param array List of hash arrays each represeting an updated/added attendee
-   */
-  public static function merge_attendee_data(&$event, $attendees, $removed = null)
-  {
-    if (!empty($attendees) && !is_array($attendees0)) {
-      $attendees = array($attendees);
+        return $diff;
     }
 
-    foreach ($attendees as $attendee) {
-      $found = false;
+    /**
+     * Update attendee properties on the given event object
+     *
+     * @param array The event object to be altered
+     * @param array List of hash arrays each represeting an updated/added attendee
+     */
+    public static function merge_attendee_data(&$event, $attendees, $removed = null)
+    {
+        if (!empty($attendees) && !is_array($attendees0)) {
+            $attendees = $attendees;
+        }
+
+        foreach ($attendees as $attendee) {
+            $found = false;
 
-      foreach ($event'attendees' as $i => $candidate) {
-        if ($candidate'email' == $attendee'email') {
-          $event'attendees'$i = $attendee;
-          $found = true;
-          break;
+            foreach ($event'attendees' as $i => $candidate) {
+                if ($candidate'email' == $attendee'email') {
+                    $event'attendees'$i = $attendee;
+                    $found = true;
+                    break;
+                }
+            }
+
+            if (!$found) {
+                $event'attendees' = $attendee;
+            }
         }
-      }
 
-      if (!$found) {
-        $event'attendees' = $attendee;
-      }
+        // filter out removed attendees
+        if (!empty($removed)) {
+            $event'attendees' = array_filter($event'attendees', function($attendee) use ($removed) {
+                return !in_array($attendee'email', $removed);
+            });
+        }
     }
 
-    // filter out removed attendees
-    if (!empty($removed)) {
-      $event'attendees' = array_filter($event'attendees', function($attendee) use ($removed) {
-        return !in_array($attendee'email', $removed);
-      });
+    /****  Resource management functions  ****/
+
+    /**
+     * Getter for the configured implementation of the resource directory interface
+     */
+    private function resources_directory()
+    {
+        if (!empty($this->resources_dir)) {
+            return $this->resources_dir;
+        }
+
+        if ($driver_name = $this->rc->config->get('calendar_resources_driver')) {
+            $driver_class = 'resources_driver_' . $driver_name;
+
+            require_once($this->home . '/drivers/resources_driver.php');
+            require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
+
+            $this->resources_dir = new $driver_class($this);
+        }
+
+        return $this->resources_dir;
     }
-  }
 
+    /**
+     * Handler for resoruce autocompletion requests
+     */
+    public function resources_autocomplete()
+    {
+        $search  = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
+        $sid     = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
+        $maxnum  = (int)$this->rc->config->get('autocomplete_max', 15);
+        $results = ;
 
-  /****  Resource management functions  ****/
+        if ($directory = $this->resources_directory()) {
+            foreach ($directory->load_resources($search, $maxnum) as $rec) {
+                $results  = 
+                    'name'  => $rec'name',
+                    'email' => $rec'email',
+                    'type'  => $rec'_type',
+                ;
+            }
+        }
 
-  /**
-   * Getter for the configured implementation of the resource directory interface
-   */
-  private function resources_directory()
-  {
-    if (is_object($this->resources_dir)) {
-      return $this->resources_dir;
+        $this->rc->output->command('ksearch_query_results', $results, $search, $sid);
+        $this->rc->output->send();
     }
 
-    if ($driver_name = $this->rc->config->get('calendar_resources_driver')) {
-      $driver_class = 'resources_driver_' . $driver_name;
+    /**
+     * Handler for load-requests for resource data
+     */
+    function resources_list()
+    {
+        $data = ;
 
-      require_once($this->home . '/drivers/resources_driver.php');
-      require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
+        if ($directory = $this->resources_directory()) {
+            foreach ($directory->load_resources() as $rec) {
+                $data = $rec;
+            }
+        }
 
-      $this->resources_dir = new $driver_class($this);
+        $this->rc->output->command('plugin.resource_data', $data);
+        $this->rc->output->send();
     }
 
-    return $this->resources_dir;
-  }
+    /**
+     * Handler for requests loading resource owner information
+     */
+    function resources_owner()
+    {
+        if ($directory = $this->resources_directory()) {
+            $id   = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
+            $data = $directory->get_resource_owner($id);
+        }
 
-  /**
-   * Handler for resoruce autocompletion requests
-   */
-  public function resources_autocomplete()
-  {
-    $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
-    $sid    = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
-    $maxnum = (int)$this->rc->config->get('autocomplete_max', 15);
-    $results = array();
+        $this->rc->output->command('plugin.resource_owner', $data);
+        $this->rc->output->send();
+    }
 
-    if ($directory = $this->resources_directory()) {
-      foreach ($directory->load_resources($search, $maxnum) as $rec) {
-        $results  = array(
-            'name'  => $rec'name',
-            'email' => $rec'email',
-            'type'  => $rec'_type',
-        );
-      }
+    /**
+     * Deliver event data for a resource's calendar
+     */
+    function resources_calendar()
+    {
+        $events = ;
+
+        if ($directory = $this->resources_directory()) {
+            $id    = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
+            $start = $this->input_timestamp('start', rcube_utils::INPUT_GET);
+            $end   = $this->input_timestamp('end', rcube_utils::INPUT_GET);
+
+            $events = $directory->get_resource_calendar($id, $start, $end);
+        }
+
+        echo $this->encode($events);
+        exit;
     }
 
-    $this->rc->output->command('ksearch_query_results', $results, $search, $sid);
-    $this->rc->output->send();
-  }
-
-  /**
-   * Handler for load-requests for resource data
-   */
-  function resources_list()
-  {
-    $data = array();
-
-    if ($directory = $this->resources_directory()) {
-      foreach ($directory->load_resources() as $rec) {
-        $data = $rec;
-      }
-    }
-
-    $this->rc->output->command('plugin.resource_data', $data);
-    $this->rc->output->send();
-  }
-
-  /**
-   * Handler for requests loading resource owner information
-   */
-  function resources_owner()
-  {
-    if ($directory = $this->resources_directory()) {
-      $id = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
-      $data = $directory->get_resource_owner($id);
-    }
-
-    $this->rc->output->command('plugin.resource_owner', $data);
-    $this->rc->output->send();
-  }
-
-  /**
-   * Deliver event data for a resource's calendar
-   */
-  function resources_calendar()
-  {
-    $events = array();
-
-    if ($directory = $this->resources_directory()) {
-      $id    = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
-      $start = $this->input_timestamp('start', rcube_utils::INPUT_GET);
-      $end   = $this->input_timestamp('end', rcube_utils::INPUT_GET);
-
-      $events = $directory->get_resource_calendar($id, $start, $end);
-    }
-
-    echo $this->encode($events);
-    exit;
-  }
-
-
-  /****  Event invitation plugin hooks ****/
-
-  /**
-   * Find an event in user calendars
-   */
-  protected function find_event($event, &$mode)
-  {
-    $this->load_driver();
-
-    // We search for writeable calendars in personal namespace by default
-    $mode   = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
-    $result = $this->driver->get_event($event, $mode);
-    // ... now check shared folders if not found
-    if (!$result) {
-      $result = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_SHARED);
-      if ($result) {
-        $mode |= calendar_driver::FILTER_SHARED;
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * Handler for calendar/itip-status requests
-   */
-  function event_itip_status()
-  {
-    $data = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
-
-    $this->load_driver();
-
-    // find local copy of the referenced event (in personal namespace)
-    $existing  = $this->find_event($data, $mode);
-    $is_shared = $mode & calendar_driver::FILTER_SHARED;
-    $itip      = $this->load_itip();
-    $response  = $itip->get_itip_status($data, $existing);
-
-    // get a list of writeable calendars to save new events to
-    if ((!$existing || $is_shared)
-      && !$data'nosave'
-      && ($response'action' == 'rsvp' || $response'action' == 'import')
-    ) {
-      $calendars       = $this->driver->list_calendars($mode);
-      $calendar_select = new html_select(array(
-          'name'       => 'calendar',
-          'id'         => 'itip-saveto',
-          'is_escaped' => true,
-          'class'      => 'form-control custom-select'
-      ));
-      $calendar_select->add('--', '');
-      $numcals = 0;
-      foreach ($calendars as $calendar) {
-        if ($calendar'editable') {
-          $calendar_select->add($calendar'name', $calendar'id');
-          $numcals++;
-        }
-      }
-      if ($numcals < 1)
-        $calendar_select = null;
-    }
-
-    if ($calendar_select) {
-      $default_calendar = $this->get_default_calendar($data'sensitivity', $calendars);
-      $response'select' = html::span('folder-select', $this->gettext('saveincalendar') . '&nbsp;' .
-        $calendar_select->show($is_shared ? $existing'calendar' : $default_calendar'id'));
-    }
-    else if ($data'nosave') {
-      $response'select' = html::tag('input', array('type' => 'hidden', 'name' => 'calendar', 'id' => 'itip-saveto', 'value' => ''));
-    }
-
-    // render small agenda view for the respective day
-    if ($data'method' == 'REQUEST' && !empty($data'date') && $response'action' == 'rsvp') {
-      $event_start = rcube_utils::anytodatetime($data'date');
-      $day_start   = new Datetime(gmdate('Y-m-d 00:00', $data'date'), $this->lib->timezone);
-      $day_end     = new Datetime(gmdate('Y-m-d 23:59', $data'date'), $this->lib->timezone);
-
-      // get events on that day from the user's personal calendars
-      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
-      $events = $this->driver->load_events($day_start->format('U'), $day_end->format('U'), null, array_keys($calendars));
-      usort($events, function($a, $b) { return $a'start' > $b'start' ? 1 : -1; });
-
-      $before = $after = array();
-      foreach ($events as $event) {
-        // TODO: skip events with free_busy == 'free' ?
-        if ($event'uid' == $data'uid'
-            || $event'end' < $day_start || $event'start' > $day_end
-            || $event'status' == 'CANCELLED'
-            || (!empty($event'className') && strpos($event'className', 'declined') !== false)
+    /****  Event invitation plugin hooks ****/
+
+    /**
+     * Find an event in user calendars
+     */
+    protected function find_event($event, &$mode)
+    {
+        $this->load_driver();
+
+        // We search for writeable calendars in personal namespace by default
+        $mode   = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
+        $result = $this->driver->get_event($event, $mode);
+        // ... now check shared folders if not found
+        if (!$result) {
+            $result = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_SHARED);
+            if ($result) {
+                $mode |= calendar_driver::FILTER_SHARED;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Handler for calendar/itip-status requests
+     */
+    function event_itip_status()
+    {
+        $data = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
+
+        $this->load_driver();
+
+        // find local copy of the referenced event (in personal namespace)
+        $existing  = $this->find_event($data, $mode);
+        $is_shared = $mode & calendar_driver::FILTER_SHARED;
+        $itip      = $this->load_itip();
+        $response  = $itip->get_itip_status($data, $existing);
+
+        // get a list of writeable calendars to save new events to
+        if (
+            (!$existing || $is_shared)
+            && empty($data'nosave')
+            && ($response'action' == 'rsvp' || $response'action' == 'import')
         ) {
-          continue;
+            $calendars       = $this->driver->list_calendars($mode);
+            $calendar_select = new html_select(
+                'name'       => 'calendar',
+                'id'         => 'itip-saveto',
+                'is_escaped' => true,
+                'class'      => 'form-control custom-select'
+            );
+
+            $calendar_select->add('--', '');
+            $numcals = 0;
+            foreach ($calendars as $calendar) {
+                if (!empty($calendar'editable')) {
+                    $calendar_select->add($calendar'name', $calendar'id');
+                    $numcals++;
+                }
+            }
+            if ($numcals < 1) {
+                $calendar_select = null;
+            }
         }
 
-        if ($event'start' < $event_start)
-          $before = $this->mail_agenda_event_row($event);
-        else
-          $after = $this->mail_agenda_event_row($event);
-      }
-
-      $response'append' = array(
-        'selector' => '.calendar-agenda-preview',
-        'replacements' => array(
-          '%before%' => !empty($before) ? join("\n", array_slice($before,  -3)) : html::div('event-row no-event', $this->gettext('noearlierevents')),
-          '%after%'  => !empty($after)  ? join("\n", array_slice($after, 0, 3)) : html::div('event-row no-event', $this->gettext('nolaterevents')),
-        ),
-      );
-    }
-
-    $this->rc->output->command('plugin.update_itip_object_status', $response);
-  }
-
-  /**
-   * Handler for calendar/itip-remove requests
-   */
-  function event_itip_remove()
-  {
-    $success  = false;
-    $uid      = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
-    $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
-    $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
-    $listmode = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
-
-    // search for event if only UID is given
-    if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), $listmode)) {
-      $event'_savemode' = $savemode;
-      $success = $this->driver->remove_event($event, true);
-    }
-
-    if ($success) {
-      $this->rc->output->show_message('calendar.successremoval', 'confirmation');
-    }
-    else {
-      $this->rc->output->show_message('calendar.errorsaving', 'error');
-    }
-  }
-
-  /**
-   * Handler for URLs that allow an invitee to respond on his invitation mail
-   */
-  public function itip_attend_response($p)
-  {
-    $this->setup();
-
-    if ($p'action' == 'attend') {
-      $this->ui->init();
-
-      $this->rc->output->set_env('task', 'calendar');  // override some env vars
-      $this->rc->output->set_env('refresh_interval', 0);
-      $this->rc->output->set_pagetitle($this->gettext('calendar'));
-
-      $itip  = $this->load_itip();
-      $token = rcube_utils::get_input_value('_t', rcube_utils::INPUT_GPC);
-
-      // read event info stored under the given token
-      if ($invitation = $itip->get_invitation($token)) {
-        $this->token = $token;
-        $this->event = $invitation'event';
-
-        // show message about cancellation
-        if ($invitation'cancelled') {
-          $this->invitestatus = html::div('rsvp-status declined', $itip->gettext('eventcancelled'));
-        }
-        // save submitted RSVP status
-        else if (!empty($_POST'rsvp')) {
-          $status = null;
-          foreach (array('accepted','tentative','declined') as $method) {
-            if ($_POST'rsvp' == $itip->gettext('itip' . $method)) {
-              $status = $method;
-              break;
-            }
-          }
-
-          // send itip reply to organizer
-          $invitation'event''comment' = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
-          if ($status && $itip->update_invitation($invitation, $invitation'attendee', strtoupper($status))) {
-            $this->invitestatus = html::div('rsvp-status ' . strtolower($status), $itip->gettext('youhave'.strtolower($status)));
-          }
-          else
-            $this->rc->output->command('display_message', $this->gettext('errorsaving'), 'error', -1);
-
-          // if user is logged in...
-          // FIXME: we should really consider removing this functionality
-          //        it's confusing that it creates/updates an event only for logged-in user
-          //        what if the logged-in user is not the same as the attendee?
-          if ($this->rc->user->ID) {
-            $this->load_driver();
+        if (!empty($calendar_select)) {
+            $default_calendar   = $this->get_default_calendar($data'sensitivity', $calendars);
+            $response'select' = html::span('folder-select', $this->gettext('saveincalendar')
+                . '&nbsp;'
+                . $calendar_select->show($is_shared ? $existing'calendar' : $default_calendar'id')
+            );
+        }
+        else if (!empty($data'nosave')) {
+            $response'select' = html::tag('input', 'type' => 'hidden', 'name' => 'calendar', 'id' => 'itip-saveto', 'value' => '');
+        }
+
+        // render small agenda view for the respective day
+        if ($data'method' == 'REQUEST' && !empty($data'date') && $response'action' == 'rsvp') {
+            $event_start = rcube_utils::anytodatetime($data'date');
+            $day_start   = new Datetime(gmdate('Y-m-d 00:00', $data'date'), $this->lib->timezone);
+            $day_end     = new Datetime(gmdate('Y-m-d 23:59', $data'date'), $this->lib->timezone);
+
+            // get events on that day from the user's personal calendars
+            $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
+            $events    = $this->driver->load_events($day_start->format('U'), $day_end->format('U'), null, array_keys($calendars));
+
+            usort($events, function($a, $b) { return $a'start' > $b'start' ? 1 : -1; });
+
+            $before = $after = ;
+            foreach ($events as $event) {
+                // TODO: skip events with free_busy == 'free' ?
+                if ($event'uid' == $data'uid'
+                    || $event'end' < $day_start || $event'start' > $day_end
+                    || $event'status' == 'CANCELLED'
+                    || (!empty($event'className') && strpos($event'className', 'declined') !== false)
+                ) {
+                    continue;
+                }
 
-            $invitation = $itip->get_invitation($token);
-            $existing   = $this->driver->get_event($this->event);
+                if ($event'start' < $event_start) {
+                    $before = $this->mail_agenda_event_row($event);
+                }
+                else {
+                    $after = $this->mail_agenda_event_row($event);
+                }
+            }
 
-            // save the event to his/her default calendar if not yet present
-            if (!$existing && ($calendar = $this->get_default_calendar($invitation'event''sensitivity'))) {
-              $invitation'event''calendar' = $calendar'id';
-              if ($this->driver->new_event($invitation'event'))
-                $this->rc->output->command('display_message', $this->gettext(array('name' => 'importedsuccessfully', 'vars' => array('calendar' => $calendar'name'))), 'confirmation');
-              else
-                $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
-            }
-            else if ($existing
-              && ($this->event'sequence' >= $existing'sequence' || $this->event'changed' >= $existing'changed')
-              && ($calendar = $this->driver->get_calendar($existing'calendar'))
-            ) {
-              $this->event       = $invitation'event';
-              $this->event'id' = $existing'id';
+            $response'append' = 
+                'selector' => '.calendar-agenda-preview',
+                'replacements' => 
+                    '%before%' => !empty($before) ? join("\n", array_slice($before,  -3)) : html::div('event-row no-event', $this->gettext('noearlierevents')),
+                    '%after%'  => !empty($after)  ? join("\n", array_slice($after, 0, 3)) : html::div('event-row no-event', $this->gettext('nolaterevents')),
+                ,
+            ;
+        }
+
+        $this->rc->output->command('plugin.update_itip_object_status', $response);
+    }
+
+    /**
+     * Handler for calendar/itip-remove requests
+     */
+    function event_itip_remove()
+    {
+        $uid      = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
+        $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
+        $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
+        $listmode = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
+        $success  = false;
 
-              unset($this->event'comment');
+        // search for event if only UID is given
+        if ($event = $this->driver->get_event('uid' => $uid, '_instance' => $instance, $listmode)) {
+            $event'_savemode' = $savemode;
+            $success = $this->driver->remove_event($event, true);
+        }
 
-              // merge attendees status
-              // e.g. preserve my participant status for regular updates
-              $this->lib->merge_attendees($this->event, $existing, $status);
-
-              // update attachments list
-              $event'deleted_attachments' = true;
-
-              // show me as free when declined (#1670)
-              if ($status == 'declined')
-                $this->event'free_busy' = 'free';
-
-              if ($this->driver->edit_event($this->event))
-                $this->rc->output->command('display_message', $this->gettext(array('name' => 'updatedsuccessfully', 'vars' => array('calendar' => $calendar->get_name()))), 'confirmation');
-              else
-                $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
-            }
-          }
-        }
-        
-        $this->register_handler('plugin.event_inviteform', array($this, 'itip_event_inviteform'));
-        $this->register_handler('plugin.event_invitebox', array($this->ui, 'event_invitebox'));
-        
-        if (!$this->invitestatus) {
-          $this->itip->set_rsvp_actions(array('accepted','tentative','declined'));
-          $this->register_handler('plugin.event_rsvp_buttons', array($this->ui, 'event_rsvp_buttons'));
-        }
-        
-        $this->rc->output->set_pagetitle($itip->gettext('itipinvitation') . ' ' . $this->event'title');
-      }
-      else
-        $this->rc->output->command('display_message', $this->gettext('itipinvalidrequest'), 'error', -1);
-      
-      $this->rc->output->send('calendar.itipattend');
-    }
-  }
-  
-  /**
-   *
-   */
-  public function itip_event_inviteform($attrib)
-  {
-    $hidden = new html_hiddenfield(array('name' => "_t", 'value' => $this->token));
-    return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'attend')), 'method' => 'post', 'noclose' => true) + $attrib) . $hidden->show();
-  }
-
-  /**
-   * 
-   */
-  private function mail_agenda_event_row($event, $class = '')
-  {
-    $time = $event'allday' ? $this->gettext('all-day') :
-      $this->rc->format_date($event'start', $this->rc->config->get('time_format')) . ' - ' .
-        $this->rc->format_date($event'end', $this->rc->config->get('time_format'));
-
-    return html::div(rtrim('event-row ' . ($class ?: $event'className')),
-      html::span('event-date', $time) .
-      html::span('event-title', rcube::Q($event'title'))
-    );
-  }
-  
-  /**
-   * 
-   */
-  public function mail_messages_list($p)
-  {
-    if (in_array('attachment', (array)$p'cols') && !empty($p'messages')) {
-      foreach ($p'messages' as $header) {
-        $part = new StdClass;
-        $part->mimetype = $header->ctype;
-        if (libcalendaring::part_is_vcalendar($part)) {
-          $header->list_flags'attachmentClass' = 'ical';
-        }
-        else if (in_array($header->ctype, array('multipart/alternative', 'multipart/mixed'))) {
-          // TODO: fetch bodystructure and search for ical parts. Maybe too expensive?
-          if (!empty($header->structure) && is_array($header->structure->parts)) {
-            foreach ($header->structure->parts as $part) {
-              if (libcalendaring::part_is_vcalendar($part) && !empty($part->ctype_parameters'method')) {
-                $header->list_flags'attachmentClass' = 'ical';
-                break;
-              }
+        if ($success) {
+            $this->rc->output->show_message('calendar.successremoval', 'confirmation');
+        }
+        else {
+            $this->rc->output->show_message('calendar.errorsaving', 'error');
+        }
+    }
+
+    /**
+     * Handler for URLs that allow an invitee to respond on his invitation mail
+     */
+    public function itip_attend_response($p)
+    {
+        $this->setup();
+
+        if ($p'action' == 'attend') {
+            $this->ui->init();
+
+            $this->rc->output->set_env('task', 'calendar');  // override some env vars
+            $this->rc->output->set_env('refresh_interval', 0);
+            $this->rc->output->set_pagetitle($this->gettext('calendar'));
+
+            $itip  = $this->load_itip();
+            $token = rcube_utils::get_input_value('_t', rcube_utils::INPUT_GPC);
+
+            // read event info stored under the given token
+            if ($invitation = $itip->get_invitation($token)) {
+                $this->token = $token;
+                $this->event = $invitation'event';
+
+                // show message about cancellation
+                if (!empty($invitation'cancelled')) {
+                    $this->invitestatus = html::div('rsvp-status declined', $itip->gettext('eventcancelled'));
+                }
+                // save submitted RSVP status
+                else if (!empty($_POST'rsvp')) {
+                    $status = null;
+                    foreach ('accepted', 'tentative', 'declined' as $method) {
+                        if ($_POST'rsvp' == $itip->gettext('itip' . $method)) {
+                            $status = $method;
+                            break;
+                        }
+                    }
+
+                    // send itip reply to organizer
+                    $invitation'event''comment' = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
+                    if ($status && $itip->update_invitation($invitation, $invitation'attendee', strtoupper($status))) {
+                        $this->invitestatus = html::div('rsvp-status ' . strtolower($status), $itip->gettext('youhave'.strtolower($status)));
+                    }
+                    else {
+                        $this->rc->output->command('display_message', $this->gettext('errorsaving'), 'error', -1);
+                    }
+
+                    // if user is logged in...
+                    // FIXME: we should really consider removing this functionality
+                    //        it's confusing that it creates/updates an event only for logged-in user
+                    //        what if the logged-in user is not the same as the attendee?
+                    if ($this->rc->user->ID) {
+                        $this->load_driver();
+
+                        $invitation = $itip->get_invitation($token);
+                        $existing   = $this->driver->get_event($this->event);
+
+                        // save the event to his/her default calendar if not yet present
+                        if (!$existing && ($calendar = $this->get_default_calendar($invitation'event''sensitivity'))) {
+                            $invitation'event''calendar' = $calendar'id';
+                            if ($this->driver->new_event($invitation'event')) {
+                                $msg = $this->gettext('name' => 'importedsuccessfully', 'vars' => 'calendar' => $calendar'name');
+                                $this->rc->output->command('display_message', $msg, 'confirmation');
+                            }
+                            else {
+                                $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
+                            }
+                        }
+                        else if ($existing
+                            && ($this->event'sequence' >= $existing'sequence'
+                                || $this->event'changed' >= $existing'changed')
+                            && ($calendar = $this->driver->get_calendar($existing'calendar'))
+                        ) {
+                            $this->event       = $invitation'event';
+                            $this->event'id' = $existing'id';
+
+                            unset($this->event'comment');
+
+                            // merge attendees status
+                            // e.g. preserve my participant status for regular updates
+                            $this->lib->merge_attendees($this->event, $existing, $status);
+
+                            // update attachments list
+                            $event'deleted_attachments' = true;
+
+                            // show me as free when declined (#1670)
+                            if ($status == 'declined') {
+                                $this->event'free_busy' = 'free';
+                            }
+
+                            if ($this->driver->edit_event($this->event)) {
+                                $msg = $this->gettext('name' => 'updatedsuccessfully', 'vars' => 'calendar' => $calendar->get_name());
+                                $this->rc->output->command('display_message', $msg, 'confirmation');
+                            }
+                            else {
+                                $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
+                            }
+                        }
+                    }
+                }
+
+                $this->register_handler('plugin.event_inviteform', $this, 'itip_event_inviteform');
+                $this->register_handler('plugin.event_invitebox', $this->ui, 'event_invitebox');
+
+                if (empty($this->invitestatus)) {
+                    $this->itip->set_rsvp_actions('accepted', 'tentative', 'declined');
+                    $this->register_handler('plugin.event_rsvp_buttons', $this->ui, 'event_rsvp_buttons');
+                }
+
+                $this->rc->output->set_pagetitle($itip->gettext('itipinvitation') . ' ' . $this->event'title');
             }
-          }
+            else {
+                $this->rc->output->command('display_message', $this->gettext('itipinvalidrequest'), 'error', -1);
+            }
+
+            $this->rc->output->send('calendar.itipattend');
         }
-      }
     }
-  }
 
-  /**
-   * Add UI element to copy event invitations or updates to the calendar
-   */
-  public function mail_messagebody_html($p)
-  {
-    // load iCalendar functions (if necessary)
-    if (!empty($this->lib->ical_parts)) {
-      $this->get_ical();
-      $this->load_itip();
-    }
-
-    $html = '';
-    $has_events = false;
-    $ical_objects = $this->lib->get_mail_ical_objects();
-
-    // show a box for every event in the file
-    foreach ($ical_objects as $idx => $event) {
-      if ($event'_type' != 'event')  // skip non-event objects (#2928)
-        continue;
-
-      $has_events = true;
-
-      // get prepared inline UI for this event object
-      if ($ical_objects->method) {
-        $append   = '';
-        $date_str = $this->rc->format_date($event'start', $this->rc->config->get('date_format'), empty($event'start'->_dateonly));
-        $date     = new DateTime($event'start'->format('Y-m-d') . ' 12:00:00', new DateTimeZone('UTC'));
-
-        // prepare a small agenda preview to be filled with actual event data on async request
-        if ($ical_objects->method == 'REQUEST') {
-          $append = html::div('calendar-agenda-preview',
-            html::tag('h3', 'preview-title', $this->gettext('agenda') . ' ' . html::span('date', $date_str))
-            . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%');
-        }
-
-        $html .= html::div('calendar-invitebox invitebox boxinformation',
-          $this->itip->mail_itip_inline_ui(
-            $event,
-            $ical_objects->method,
-            $ical_objects->mime_id . ':' . $idx,
-            'calendar',
-            rcube_utils::anytodatetime($ical_objects->message_date),
-            $this->rc->url(array('task' => 'calendar')) . '&view=agendaDay&date=' . $date->format('U')
-          ) . $append
+    /**
+     *
+     */
+    public function itip_event_inviteform($attrib)
+    {
+        $hidden = new html_hiddenfield('name' => "_t", 'value' => $this->token);
+
+        return html::tag('form', 
+                'action' => $this->rc->url('task' => 'calendar', 'action' => 'attend'),
+                'method' => 'post',
+                'noclose' => true
+             + $attrib
+        ) . $hidden->show();
+    }
+
+    /**
+     *
+     */
+    private function mail_agenda_event_row($event, $class = '')
+    {
+        $time = !empty($event'allday') ? $this->gettext('all-day') :
+            $this->rc->format_date($event'start', $this->rc->config->get('time_format'))
+            . ' - ' .
+            $this->rc->format_date($event'end', $this->rc->config->get('time_format'));
+
+        return html::div(rtrim('event-row ' . ($class ?: $event'className')),
+            html::span('event-date', $time)
+            . html::span('event-title', rcube::Q($event'title'))
         );
-      }
+    }
 
-      // limit listing
-      if ($idx >= 3)
-        break;
-    }
-
-    // prepend event boxes to message body
-    if ($html) {
-      $this->ui->init();
-      $p'content' = $html . $p'content';
-      $this->rc->output->add_label('calendar.savingdata','calendar.deleteventconfirm','calendar.declinedeleteconfirm');
-    }
-
-    // add "Save to calendar" button into attachment menu
-    if ($has_events) {
-      $this->add_button(array(
-        'id'         => 'attachmentsavecal',
-        'name'       => 'attachmentsavecal',
-        'type'       => 'link',
-        'wrapper'    => 'li',
-        'command'    => 'attachment-save-calendar',
-        'class'      => 'icon calendarlink disabled',
-        'classact'   => 'icon calendarlink active',
-        'innerclass' => 'icon calendar',
-        'label'      => 'calendar.savetocalendar',
-        ), 'attachmentmenu');
-    }
-
-    return $p;
-  }
-
-
-  /**
-   * Handler for POST request to import an event attached to a mail message
-   */
-  public function mail_import_itip()
-  {
-    $itip_sending = $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
-
-    $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-    $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
-    $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
-    $status  = rcube_utils::get_input_value('_status', rcube_utils::INPUT_POST);
-    $delete  = intval(rcube_utils::get_input_value('_del', rcube_utils::INPUT_POST));
-    $noreply = intval(rcube_utils::get_input_value('_noreply', rcube_utils::INPUT_POST));
-    $noreply = $noreply || $status == 'needs-action' || $itip_sending === 0;
-    $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
-    $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
-    $comment  = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
-
-    $error_msg = $this->gettext('errorimportingevent');
-    $success   = false;
-
-    if ($status == 'delegated') {
-      $delegates = rcube_mime::decode_address_list(rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true), 1, false);
-      $delegate  = reset($delegates);
-
-      if (empty($delegate) || empty($delegate'mailto')) {
-        $this->rc->output->command('display_message', $this->rc->gettext('libcalendaring.delegateinvalidaddress'), 'error');
-        return;
-      }
-    }
-
-    // successfully parsed events?
-    if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
-      // forward iTip request to delegatee
-      if ($delegate) {
-        $rsvpme = rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST);
-        $itip   = $this->load_itip();
+    /**
+     *
+     */
+    public function mail_messages_list($p)
+    {
+        if (!empty($p'cols') && in_array('attachment', (array) $p'cols') && !empty($p'messages')) {
+            foreach ($p'messages' as $header) {
+                $part = new StdClass;
+                $part->mimetype = $header->ctype;
 
-        $event'comment' = $comment;
+                if (libcalendaring::part_is_vcalendar($part)) {
+                    $header->list_flags'attachmentClass' = 'ical';
+                }
+                else if (in_array($header->ctype, 'multipart/alternative', 'multipart/mixed')) {
+                    // TODO: fetch bodystructure and search for ical parts. Maybe too expensive?
+                    if (!empty($header->structure) && !empty($header->structure->parts)) {
+                        foreach ($header->structure->parts as $part) {
+                            if (libcalendaring::part_is_vcalendar($part)
+                                && !empty($part->ctype_parameters'method')
+                            ) {
+                                $header->list_flags'attachmentClass' = 'ical';
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Add UI element to copy event invitations or updates to the calendar
+     */
+    public function mail_messagebody_html($p)
+    {
+        // load iCalendar functions (if necessary)
+        if (!empty($this->lib->ical_parts)) {
+            $this->get_ical();
+            $this->load_itip();
+        }
+
+        $html = '';
+        $has_events = false;
+        $ical_objects = $this->lib->get_mail_ical_objects();
+
+        // show a box for every event in the file
+        foreach ($ical_objects as $idx => $event) {
+            if ($event'_type' != 'event') {
+                // skip non-event objects (#2928)
+                continue;
+            }
+
+            $has_events = true;
+
+            // get prepared inline UI for this event object
+            if ($ical_objects->method) {
+                $append   = '';
+                $date_str = $this->rc->format_date($event'start', $this->rc->config->get('date_format'), empty($event'start'->_dateonly));
+                $date     = new DateTime($event'start'->format('Y-m-d') . ' 12:00:00', new DateTimeZone('UTC'));
+
+                // prepare a small agenda preview to be filled with actual event data on async request
+                if ($ical_objects->method == 'REQUEST') {
+                    $append = html::div('calendar-agenda-preview',
+                        html::tag('h3', 'preview-title', $this->gettext('agenda') . ' ' . html::span('date', $date_str))
+                        . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%'
+                    );
+                }
+
+                $html .= html::div('calendar-invitebox invitebox boxinformation',
+                    $this->itip->mail_itip_inline_ui(
+                        $event,
+                        $ical_objects->method,
+                        $ical_objects->mime_id . ':' . $idx,
+                        'calendar',
+                        rcube_utils::anytodatetime($ical_objects->message_date),
+                        $this->rc->url('task' => 'calendar') . '&view=agendaDay&date=' . $date->format('U')
+                    ) . $append
+                );
+            }
+
+            // limit listing
+            if ($idx >= 3) {
+                break;
+            }
+        }
 
-        if ($itip->delegate_to($event, $delegate, !empty($rsvpme))) {
-          $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
+        // prepend event boxes to message body
+        if ($html) {
+            $this->ui->init();
+            $p'content' = $html . $p'content';
+            $this->rc->output->add_label('calendar.savingdata','calendar.deleteventconfirm','calendar.declinedeleteconfirm');
+        }
+
+        // add "Save to calendar" button into attachment menu
+        if ($has_events) {
+            $this->add_button(
+                    'id'         => 'attachmentsavecal',
+                    'name'       => 'attachmentsavecal',
+                    'type'       => 'link',
+                    'wrapper'    => 'li',
+                    'command'    => 'attachment-save-calendar',
+                    'class'      => 'icon calendarlink disabled',
+                    'classact'   => 'icon calendarlink active',
+                    'innerclass' => 'icon calendar',
+                    'label'      => 'calendar.savetocalendar',
+                ,
+                'attachmentmenu'
+            );
         }
-        else {
-          $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+
+        return $p;
+    }
+
+    /**
+     * Handler for POST request to import an event attached to a mail message
+     */
+    public function mail_import_itip()
+    {
+        $itip_sending = $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
+
+        $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+        $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+        $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
+        $status  = rcube_utils::get_input_value('_status', rcube_utils::INPUT_POST);
+        $delete  = intval(rcube_utils::get_input_value('_del', rcube_utils::INPUT_POST));
+        $noreply = intval(rcube_utils::get_input_value('_noreply', rcube_utils::INPUT_POST));
+        $noreply = $noreply || $status == 'needs-action' || $itip_sending === 0;
+        $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
+        $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
+        $comment  = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
+
+        $error_msg = $this->gettext('errorimportingevent');
+        $success   = false;
+        $deleted   = false;
+
+        if ($status == 'delegated') {
+            $to = rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true);
+            $delegates = rcube_mime::decode_address_list($to, 1, false);
+            $delegate  = reset($delegates);
+
+            if (empty($delegate) || empty($delegate'mailto')) {
+                $this->rc->output->command('display_message', $this->rc->gettext('libcalendaring.delegateinvalidaddress'), 'error');
+                return;
+            }
         }
 
-        unset($event'comment');
+        // successfully parsed events?
+        if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
+            // forward iTip request to delegatee
+            if (!empty($delegate)) {
+                $rsvpme = rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST);
+                $itip   = $this->load_itip();
 
-        // the delegator is set to non-participant, thus save as non-blocking
-        $event'free_busy' = 'free';
-      }
-
-      $mode = calendar_driver::FILTER_PERSONAL
-        | calendar_driver::FILTER_SHARED
-        | calendar_driver::FILTER_WRITEABLE;
-
-      // find writeable calendar to store event
-      $cal_id    = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST);
-      $dontsave  = $cal_id === '' && $event'_method' == 'REQUEST';
-      $calendars = $this->driver->list_calendars($mode);
-      $calendar  = $calendars$cal_id;
-
-      // select default calendar except user explicitly selected 'none'
-      if (!$calendar && !$dontsave)
-         $calendar = $this->get_default_calendar($event'sensitivity', $calendars);
-
-      $metadata = array(
-        'uid'       => $event'uid',
-        '_instance' => $event'_instance',
-        'changed'   => is_object($event'changed') ? $event'changed'->format('U') : 0,
-        'sequence'  => intval($event'sequence'),
-        'fallback'  => strtoupper($status),
-        'method'    => $event'_method',
-        'task'      => 'calendar',
-      );
+                $event'comment' = $comment;
 
-      // update my attendee status according to submitted method
-      if (!empty($status)) {
-        $organizer = null;
-        $emails = $this->get_user_emails();
-        foreach ($event'attendees' as $i => $attendee) {
-          if ($attendee'role' == 'ORGANIZER') {
-            $organizer = $attendee;
-          }
-          else if ($attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
-            $event'attendees'$i'status' = strtoupper($status);
-            if (!in_array($event'attendees'$i'status', array('NEEDS-ACTION','DELEGATED')))
-              $event'attendees'$i'rsvp' = false;  // unset RSVP attribute
-
-            $metadata'attendee' = $attendee'email';
-            $metadata'rsvp' = $attendee'role' != 'NON-PARTICIPANT';
-            $reply_sender = $attendee'email';
-            $event_attendee = $attendee;
-          }
-        }
-
-        // add attendee with this user's default identity if not listed
-        if (!$reply_sender) {
-          $sender_identity = $this->rc->user->list_emails(true);
-          $event'attendees' = array(
-            'name'   => $sender_identity'name',
-            'email'  => $sender_identity'email',
-            'role'   => 'OPT-PARTICIPANT',
-            'status' => strtoupper($status),
-          );
-          $metadata'attendee' = $sender_identity'email';
-        }
-      }
-      
-      // save to calendar
-      if ($calendar && $calendar'editable') {
-        // check for existing event with the same UID
-        $existing = $this->find_event($event, $mode);
-
-        // we'll create a new copy if user decided to change the calendar
-        if ($existing && $cal_id && $calendar && $calendar'id' != $existing'calendar') {
-          $existing = null;
-        }
-
-        if ($existing) {
-          $calendar = $calendars$existing'calendar';
-
-          // forward savemode for correct updates of recurring events
-          $existing'_savemode' = $savemode ?: $event'_savemode';
-
-          // only update attendee status
-          if ($event'_method' == 'REPLY') {
-            // try to identify the attendee using the email sender address
-            $existing_attendee        = -1;
-            $existing_attendee_emails = array();
-
-            foreach ($existing'attendees' as $i => $attendee) {
-              $existing_attendee_emails = $attendee'email';
-              if ($this->itip->compare_email($attendee'email', $event'_sender', $event'_sender_utf')) {
-                $existing_attendee = $i;
-              }
-            }
-
-            $event_attendee   = null;
-            $update_attendees = array();
-
-            foreach ($event'attendees' as $attendee) {
-              if ($this->itip->compare_email($attendee'email', $event'_sender', $event'_sender_utf')) {
-                $event_attendee       = $attendee;
-                $update_attendees   = $attendee;
-                $metadata'fallback' = $attendee'status';
-                $metadata'attendee' = $attendee'email';
-                $metadata'rsvp'     = $attendee'rsvp' || $attendee'role' != 'NON-PARTICIPANT';
-
-                if ($attendee'status' != 'DELEGATED') {
-                  break;
-                }
-              }
-              // also copy delegate attendee
-              else if (!empty($attendee'delegated-from')
-                && $this->itip->compare_email($attendee'delegated-from', $event'_sender', $event'_sender_utf')
-              ) {
-                $update_attendees = $attendee;
-                if (!in_array_nocase($attendee'email', $existing_attendee_emails)) {
-                  $existing'attendees' = $attendee;
-                }
-              }
-            }
-
-            // if delegatee has declined, set delegator's RSVP=True
-            if ($event_attendee && $event_attendee'status' == 'DECLINED' && $event_attendee'delegated-from') {
-              foreach ($existing'attendees' as $i => $attendee) {
-                if ($attendee'email' == $event_attendee'delegated-from') {
-                  $existing'attendees'$i'rsvp' = true;
-                  break;
-                }
-              }
-            }
-
-            // Accept sender as a new participant (different email in From: and the iTip)
-            // Use ATTENDEE entry from the iTip with replaced email address
-            if (!$event_attendee) {
-              // remove the organizer
-              $itip_attendees = array_filter($event'attendees', function($item) { return $item'role' != 'ORGANIZER'; });
-
-              // there must be only one attendee
-              if (is_array($itip_attendees) && count($itip_attendees) == 1) {
-                $event_attendee          = $itip_attendeeskey($itip_attendees);
-                $event_attendee'email' = $event'_sender';
-                $update_attendees      = $event_attendee;
-                $metadata'fallback'    = $event_attendee'status';
-                $metadata'attendee'    = $event_attendee'email';
-                $metadata'rsvp'        = $event_attendee'rsvp' || $event_attendee'role' != 'NON-PARTICIPANT';
-              }
-            }
-
-            // found matching attendee entry in both existing and new events
-            if ($existing_attendee >= 0 && $event_attendee) {
-              $existing'attendees'$existing_attendee = $event_attendee;
-              $success = $this->driver->update_attendees($existing, $update_attendees);
-            }
-            // update the entire attendees block
-            else if (($event'sequence' >= $existing'sequence' || $event'changed' >= $existing'changed') && $event_attendee) {
-              $existing'attendees' = $event_attendee;
-              $success = $this->driver->update_attendees($existing, $update_attendees);
+                if ($itip->delegate_to($event, $delegate, !empty($rsvpme))) {
+                    $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
+                }
+                else {
+                    $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+                }
+
+                unset($event'comment');
+
+                // the delegator is set to non-participant, thus save as non-blocking
+                $event'free_busy' = 'free';
+            }
+
+            $mode = calendar_driver::FILTER_PERSONAL
+                | calendar_driver::FILTER_SHARED
+                | calendar_driver::FILTER_WRITEABLE;
+
+            // find writeable calendar to store event
+            $cal_id    = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST);
+            $dontsave  = $cal_id === '' && $event'_method' == 'REQUEST';
+            $calendars = $this->driver->list_calendars($mode);
+            $calendar  = isset($calendars$cal_id) ? $calendars$cal_id : null;
+
+            // select default calendar except user explicitly selected 'none'
+            if (!$calendar && !$dontsave) {
+                $calendar = $this->get_default_calendar($event'sensitivity', $calendars);
+            }
+
+            $metadata = 
+                'uid'       => $event'uid',
+                '_instance' => isset($event'_instance') ? $event'_instance' : null,
+                'changed'   => is_object($event'changed') ? $event'changed'->format('U') : 0,
+                'sequence'  => intval($event'sequence'),
+                'fallback'  => strtoupper($status),
+                'method'    => $event'_method',
+                'task'      => 'calendar',
+            ;
+
+            // update my attendee status according to submitted method
+            if (!empty($status)) {
+                $organizer = null;
+                $emails = $this->get_user_emails();
+                foreach ($event'attendees' as $i => $attendee) {
+                    if ($attendee'role' == 'ORGANIZER') {
+                        $organizer = $attendee;
+                    }
+                    else if (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
+                        $event'attendees'$i'status' = strtoupper($status);
+                        if (!in_array($event'attendees'$i'status', 'NEEDS-ACTION', 'DELEGATED')) {
+                            $event'attendees'$i'rsvp' = false;  // unset RSVP attribute
+                        }
+
+                        $metadata'attendee' = $attendee'email';
+                        $metadata'rsvp'     = $attendee'role' != 'NON-PARTICIPANT';
+
+                        $reply_sender   = $attendee'email';
+                        $event_attendee = $attendee;
+                    }
+                }
+
+                // add attendee with this user's default identity if not listed
+                if (!$reply_sender) {
+                    $sender_identity = $this->rc->user->list_emails(true);
+                    $event'attendees' = 
+                        'name'   => $sender_identity'name',
+                        'email'  => $sender_identity'email',
+                        'role'   => 'OPT-PARTICIPANT',
+                        'status' => strtoupper($status),
+                    ;
+                    $metadata'attendee' = $sender_identity'email';
+                }
+            }
+
+            // save to calendar
+            if ($calendar && !empty($calendar'editable')) {
+                // check for existing event with the same UID
+                $existing = $this->find_event($event, $mode);
+
+                // we'll create a new copy if user decided to change the calendar
+                if ($existing && $cal_id && $calendar && $calendar'id' != $existing'calendar') {
+                    $existing = null;
+                }
+
+                if ($existing) {
+                    $calendar = $calendars$existing'calendar';
+
+                    // forward savemode for correct updates of recurring events
+                    $existing'_savemode' = $savemode ?: (!empty($event'_savemode') ? $event'_savemode' : null);
+
+                    // only update attendee status
+                    if ($event'_method' == 'REPLY') {
+                        // try to identify the attendee using the email sender address
+                        $existing_attendee        = -1;
+                        $existing_attendee_emails = ;
+
+                        foreach ($existing'attendees' as $i => $attendee) {
+                            $existing_attendee_emails = $attendee'email';
+                            if ($this->itip->compare_email($attendee'email', $event'_sender', $event'_sender_utf')) {
+                                $existing_attendee = $i;
+                            }
+                        }
+
+                        $event_attendee   = null;
+                        $update_attendees = ;
+
+                        foreach ($event'attendees' as $attendee) {
+                            if ($this->itip->compare_email($attendee'email', $event'_sender', $event'_sender_utf')) {
+                                $event_attendee       = $attendee;
+                                $update_attendees   = $attendee;
+                                $metadata'fallback' = $attendee'status';
+                                $metadata'attendee' = $attendee'email';
+                                $metadata'rsvp'     = !empty($attendee'rsvp') || $attendee'role' != 'NON-PARTICIPANT';
+
+                                if ($attendee'status' != 'DELEGATED') {
+                                    break;
+                                }
+                            }
+                            // also copy delegate attendee
+                            else if (!empty($attendee'delegated-from')
+                                && $this->itip->compare_email($attendee'delegated-from', $event'_sender', $event'_sender_utf')
+                            ) {
+                                $update_attendees = $attendee;
+                                if (!in_array_nocase($attendee'email', $existing_attendee_emails)) {
+                                    $existing'attendees' = $attendee;
+                                }
+                            }
+                        }
+
+                        // if delegatee has declined, set delegator's RSVP=True
+                        if ($event_attendee
+                            && $event_attendee'status' == 'DECLINED'
+                            && !empty($event_attendee'delegated-from')
+                        ) {
+                            foreach ($existing'attendees' as $i => $attendee) {
+                                if ($attendee'email' == $event_attendee'delegated-from') {
+                                    $existing'attendees'$i'rsvp' = true;
+                                    break;
+                                }
+                            }
+                        }
+
+                        // Accept sender as a new participant (different email in From: and the iTip)
+                        // Use ATTENDEE entry from the iTip with replaced email address
+                        if (!$event_attendee) {
+                            // remove the organizer
+                            $itip_attendees = array_filter(
+                                $event'attendees',
+                                function($item) { return $item'role' != 'ORGANIZER'; }
+                            );
+
+                            // there must be only one attendee
+                            if (is_array($itip_attendees) && count($itip_attendees) == 1) {
+                                $event_attendee          = $itip_attendeeskey($itip_attendees);
+                                $event_attendee'email' = $event'_sender';
+                                $update_attendees      = $event_attendee;
+                                $metadata'fallback'    = $event_attendee'status';
+                                $metadata'attendee'    = $event_attendee'email';
+                                $metadata'rsvp'        = !empty($event_attendee'rsvp') || $event_attendee'role' != 'NON-PARTICIPANT';
+                            }
+                        }
+
+                        // found matching attendee entry in both existing and new events
+                        if ($existing_attendee >= 0 && $event_attendee) {
+                            $existing'attendees'$existing_attendee = $event_attendee;
+                            $success = $this->driver->update_attendees($existing, $update_attendees);
+                        }
+                        // update the entire attendees block
+                        else if (
+                            ($event'sequence' >= $existing'sequence' || $event'changed' >= $existing'changed')
+                            && $event_attendee
+                        ) {
+                            $existing'attendees' = $event_attendee;
+                            $success = $this->driver->update_attendees($existing, $update_attendees);
+                        }
+                        else if (!$event_attendee) {
+                            $error_msg = $this->gettext('errorunknownattendee');
+                        }
+                        else {
+                            $error_msg = $this->gettext('newerversionexists');
+                        }
+                    }
+                    // delete the event when declined (#1670)
+                    else if ($status == 'declined' && $delete) {
+                        $deleted = $this->driver->remove_event($existing, true);
+                        $success = true;
+                    }
+                    // import the (newer) event
+                    else if ($event'sequence' >= $existing'sequence' || $event'changed' >= $existing'changed') {
+                        $event'id'       = $existing'id';
+                        $event'calendar' = $existing'calendar';
+
+                        // merge attendees status
+                        // e.g. preserve my participant status for regular updates
+                        $this->lib->merge_attendees($event, $existing, $status);
+
+                        // set status=CANCELLED on CANCEL messages
+                        if ($event'_method' == 'CANCEL') {
+                            $event'status' = 'CANCELLED';
+                        }
+
+                        // update attachments list, allow attachments update only on REQUEST (#5342)
+                        if ($event'_method' == 'REQUEST') {
+                            $event'deleted_attachments' = true;
+                        }
+                        else {
+                            unset($event'attachments');
+                        }
+
+                        // show me as free when declined (#1670)
+                        if ($status == 'declined'
+                            || (!empty($event'status') && $event'status' == 'CANCELLED')
+                            || $event_attendee'role' == 'NON-PARTICIPANT'
+                        ) {
+                            $event'free_busy' = 'free';
+                        }
+
+                        $success = $this->driver->edit_event($event);
+                    }
+                    else if (!empty($status)) {
+                        $existing'attendees' = $event'attendees';
+                        if ($status == 'declined' || $event_attendee'role' == 'NON-PARTICIPANT') {
+                            // show me as free when declined (#1670)
+                            $existing'free_busy' = 'free';
+                        }
+                        $success = $this->driver->edit_event($existing);
+                    }
+                    else {
+                        $error_msg = $this->gettext('newerversionexists');
+                    }
+                }
+                else if (!$existing && ($status != 'declined' || $this->rc->config->get('kolab_invitation_calendars'))) {
+                    if ($status == 'declined'
+                        || $event'status' == 'CANCELLED'
+                        || $event_attendee'role' == 'NON-PARTICIPANT'
+                    ) {
+                        $event'free_busy' = 'free';
+                    }
+
+                    // if the RSVP reply only refers to a single instance:
+                    // store unmodified master event with current instance as exception
+                    if (!empty($instance) && !empty($savemode) && $savemode != 'all') {
+                        $master = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event');
+                        if ($master'recurrence' && empty($master'_instance')) {
+                            // compute recurring events until this instance's date
+                            if ($recurrence_date = rcube_utils::anytodatetime($instance, $master'start'->getTimezone())) {
+                                $recurrence_date->setTime(23,59,59);
+
+                                foreach ($this->driver->get_recurring_events($master, $master'start', $recurrence_date) as $recurring) {
+                                    if ($recurring'_instance' == $instance) {
+                                        // copy attendees block with my partstat to exception
+                                        $recurring'attendees' = $event'attendees';
+                                        $master'recurrence''EXCEPTIONS' = $recurring;
+                                        $event = $recurring;  // set reference for iTip reply
+                                        break;
+                                    }
+                                }
+
+                                $master'calendar' = $event'calendar' = $calendar'id';
+                                $success = $this->driver->new_event($master);
+                            }
+                            else {
+                                $master = null;
+                            }
+                        }
+                        else {
+                            $master = null;
+                        }
+                    }
+
+                    // save to the selected/default calendar
+                    if (!$master) {
+                        $event'calendar' = $calendar'id';
+                        $success = $this->driver->new_event($event);
+                    }
+                }
+                else if ($status == 'declined') {
+                    $error_msg = null;
+                }
+            }
+            else if ($status == 'declined' || $dontsave) {
+                $error_msg = null;
+            }
+            else {
+                $error_msg = $this->gettext('nowritecalendarfound');
+            }
+        }
+
+        if ($success) {
+            if ($event'_method' == 'REPLY') {
+                $message = 'attendeupdateesuccess';
+            }
+            else {
+                $message = $deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully');
             }
-            else if (!$event_attendee) {
-              $error_msg = $this->gettext('errorunknownattendee');
+
+            $msg = $this->gettext('name' => $message, 'vars' => 'calendar' => $calendar'name');
+            $this->rc->output->command('display_message', $msg, 'confirmation');
+        }
+
+        if ($success || $dontsave) {
+            $metadata'calendar' = isset($event'calendar') ? $event'calendar' : null;
+            $metadata'nosave'   = $dontsave;
+            $metadata'rsvp'     = !empty($metadata'rsvp');
+
+            $metadata'after_action' = $this->rc->config->get('calendar_itip_after_action', $this->defaults'calendar_itip_after_action');
+            $this->rc->output->command('plugin.itip_message_processed', $metadata);
+            $error_msg = null;
+        }
+        else if ($error_msg) {
+            $this->rc->output->command('display_message', $error_msg, 'error');
+        }
+
+        // send iTip reply
+        if ($event'_method' == 'REQUEST' && !empty($organizer) && !$noreply
+            && !in_array(strtolower($organizer'email'), $emails) && !$error_msg
+        ) {
+            $event'comment' = $comment;
+            $itip = $this->load_itip();
+            $itip->set_sender_email($reply_sender);
+
+            if ($itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status)) {
+                $mailto = $organizer'name' ? $organizer'name' : $organizer'email';
+                $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
+                $this->rc->output->command('display_message', $msg, 'confirmation');
             }
             else {
-              $error_msg = $this->gettext('newerversionexists');
+                $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
             }
-          }
-          // delete the event when declined (#1670)
-          else if ($status == 'declined' && $delete) {
-             $deleted = $this->driver->remove_event($existing, true);
-             $success = true;
-          }
-          // import the (newer) event
-          else if ($event'sequence' >= $existing'sequence' || $event'changed' >= $existing'changed') {
-            $event'id' = $existing'id';
-            $event'calendar' = $existing'calendar';
-
-            // merge attendees status
-            // e.g. preserve my participant status for regular updates
-            $this->lib->merge_attendees($event, $existing, $status);
-
-            // set status=CANCELLED on CANCEL messages
-            if ($event'_method' == 'CANCEL')
-              $event'status' = 'CANCELLED';
-
-            // update attachments list, allow attachments update only on REQUEST (#5342)
-            if ($event'_method' == 'REQUEST')
-              $event'deleted_attachments' = true;
-            else
-              unset($event'attachments');
-
-            // show me as free when declined (#1670)
-            if ($status == 'declined' || $event'status' == 'CANCELLED' || $event_attendee'role' == 'NON-PARTICIPANT')
-              $event'free_busy' = 'free';
-
-            $success = $this->driver->edit_event($event);
-          }
-          else if (!empty($status)) {
-            $existing'attendees' = $event'attendees';
-            if ($status == 'declined' || $event_attendee'role' == 'NON-PARTICIPANT')  // show me as free when declined (#1670)
-              $existing'free_busy' = 'free';
-            $success = $this->driver->edit_event($existing);
-          }
-          else
-            $error_msg = $this->gettext('newerversionexists');
-        }
-        else if (!$existing && ($status != 'declined' || $this->rc->config->get('kolab_invitation_calendars'))) {
-          if ($status == 'declined' || $event'status' == 'CANCELLED' || $event_attendee'role' == 'NON-PARTICIPANT') {
-            $event'free_busy' = 'free';
-          }
-
-          // if the RSVP reply only refers to a single instance:
-          // store unmodified master event with current instance as exception
-          if (!empty($instance) && !empty($savemode) && $savemode != 'all') {
-            $master = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event');
-            if ($master'recurrence' && !$master'_instance') {
-              // compute recurring events until this instance's date
-              if ($recurrence_date = rcube_utils::anytodatetime($instance, $master'start'->getTimezone())) {
-                $recurrence_date->setTime(23,59,59);
-
-                foreach ($this->driver->get_recurring_events($master, $master'start', $recurrence_date) as $recurring) {
-                  if ($recurring'_instance' == $instance) {
-                    // copy attendees block with my partstat to exception
-                    $recurring'attendees' = $event'attendees';
-                    $master'recurrence''EXCEPTIONS' = $recurring;
-                    $event = $recurring;  // set reference for iTip reply
+        }
+
+        $this->rc->output->send();
+    }
+
+    /**
+     * Handler for calendar/itip-remove requests
+     */
+    function mail_itip_decline_reply()
+    {
+        $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+        $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+        $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
+
+        if (($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event'))
+            && $event'_method' == 'REPLY'
+        ) {
+            $event'comment' = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
+
+            foreach ($event'attendees' as $_attendee) {
+                if ($_attendee'role' != 'ORGANIZER') {
+                    $attendee = $_attendee;
                     break;
-                  }
                 }
+            }
+
+            $itip = $this->load_itip();
 
-                $master'calendar' = $event'calendar' = $calendar'id';
-                $success = $this->driver->new_event($master);
-              }
-              else {
-                $master = null;
-              }
+            if ($itip->send_itip_message($event, 'CANCEL', $attendee, 'itipsubjectcancel', 'itipmailbodycancel')) {
+                $mailto = !empty($attendee'name') ? $attendee'name' : $attendee'email';
+                $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
+                $this->rc->output->command('display_message', $msg, 'confirmation');
             }
             else {
-              $master = null;
+                $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
             }
-          }
+        }
+        else {
+            $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+        }
+    }
 
-          // save to the selected/default calendar
-          if (!$master) {
-            $event'calendar' = $calendar'id';
-            $success = $this->driver->new_event($event);
-          }
-        }
-        else if ($status == 'declined')
-          $error_msg = null;
-      }
-      else if ($status == 'declined' || $dontsave)
-        $error_msg = null;
-      else
-        $error_msg = $this->gettext('nowritecalendarfound');
-    }
-
-    if ($success) {
-      $message = $event'_method' == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully'));
-      $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('calendar' => $calendar'name'))), 'confirmation');
-    }
-
-    if ($success || $dontsave) {
-      $metadata'calendar' = $event'calendar';
-      $metadata'nosave' = $dontsave;
-      $metadata'rsvp' = intval($metadata'rsvp');
-      $metadata'after_action' = $this->rc->config->get('calendar_itip_after_action', $this->defaults'calendar_itip_after_action');
-      $this->rc->output->command('plugin.itip_message_processed', $metadata);
-      $error_msg = null;
-    }
-    else if ($error_msg) {
-      $this->rc->output->command('display_message', $error_msg, 'error');
-    }
-
-    // send iTip reply
-    if ($event'_method' == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer'email'), $emails) && !$error_msg) {
-      $event'comment' = $comment;
-      $itip = $this->load_itip();
-      $itip->set_sender_email($reply_sender);
-      if ($itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
-        $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer'name' ? $organizer'name' : $organizer'email'))), 'confirmation');
-      else
-        $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
-    }
-
-    $this->rc->output->send();
-  }
-
-  /**
-   * Handler for calendar/itip-remove requests
-   */
-  function mail_itip_decline_reply()
-  {
-    $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-    $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
-    $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
-
-    if (($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) && $event'_method' == 'REPLY') {
-      $event'comment' = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
-
-      foreach ($event'attendees' as $_attendee) {
-        if ($_attendee'role' != 'ORGANIZER') {
-          $attendee = $_attendee;
-          break;
-        }
-      }
-
-      $itip = $this->load_itip();
-      if ($itip->send_itip_message($event, 'CANCEL', $attendee, 'itipsubjectcancel', 'itipmailbodycancel'))
-        $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $attendee'name' ? $attendee'name' : $attendee'email'))), 'confirmation');
-      else
-        $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
-    }
-    else {
-      $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
-    }
-  }
-
-  /**
-   * Handler for calendar/itip-delegate requests
-   */
-  function mail_itip_delegate()
-  {
-    // forward request to mail_import_itip() with the right status
-    $_POST'_status' = $_REQUEST'_status' = 'delegated';
-    $this->mail_import_itip();
-  }
-
-  /**
-   * Import the full payload from a mail message attachment
-   */
-  public function mail_import_attachment()
-  {
-    $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-    $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
-    $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
-    $charset = RCUBE_CHARSET;
-
-    // establish imap connection
-    $imap = $this->rc->get_storage();
-    $imap->set_folder($mbox);
-
-    if ($uid && $mime_id) {
-      $part = $imap->get_message_part($uid, $mime_id);
-      if ($part->ctype_parameters'charset')
-        $charset = $part->ctype_parameters'charset';
-//      $headers = $imap->get_message_headers($uid);
-
-      if ($part) {
-        $events = $this->get_ical()->import($part, $charset);
-      }
-    }
-
-    $success = $existing = 0;
-    if (!empty($events)) {
-      // find writeable calendar to store event
-      $cal_id = !empty($_REQUEST'_calendar') ? rcube_utils::get_input_value('_calendar', rcube_utils::INPUT_POST) : null;
-      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
-
-      foreach ($events as $event) {
-        // save to calendar
-        $calendar = $calendars$cal_id ?: $this->get_default_calendar($event'sensitivity');
-        if ($calendar && $calendar'editable' && $event'_type' == 'event') {
-          $event'calendar' = $calendar'id';
-
-          if (!$this->driver->get_event($event'uid', calendar_driver::FILTER_WRITEABLE)) {
-            $success += (bool)$this->driver->new_event($event);
-          }
-          else {
-            $existing++;
-          }
-        }
-      }
-    }
-
-    if ($success) {
-      $this->rc->output->command('display_message', $this->gettext(array(
-        'name' => 'importsuccess',
-        'vars' => array('nr' => $success),
-      )), 'confirmation');
-    }
-    else if ($existing) {
-      $this->rc->output->command('display_message', $this->gettext('importwarningexists'), 'warning');
-    }
-    else {
-      $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
-    }
-  }
-
-  /**
-   * Read email message and return contents for a new event based on that message
-   */
-  public function mail_message2event()
-  {
-    $this->ui->init();
-    $this->ui->addJS();
-    $this->ui->init_templates();
-    $this->ui->calendar_list(array(), true); // set env'calendars'
-
-    $uid   = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
-    $mbox  = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
-    $event = array();
-
-    // establish imap connection
-    $imap    = $this->rc->get_storage();
-    $message = new rcube_message($uid, $mbox);
-
-    if ($message->headers) {
-      $event'title'       = trim($message->subject);
-      $event'description' = trim($message->first_text_part());
-
-      $this->load_driver();
-
-      // add a reference to the email message
-      if ($msgref = $this->driver->get_message_reference($message->headers, $mbox)) {
-        $event'links' = array($msgref);
-      }
-      // copy mail attachments to event
-      else if ($message->attachments) {
-        $eventid = 'cal-';
-        if (!is_array($_SESSIONself::SESSION_KEY) || $_SESSIONself::SESSION_KEY'id' != $eventid) {
-          $_SESSIONself::SESSION_KEY = array();
-          $_SESSIONself::SESSION_KEY'id' = $eventid;
-          $_SESSIONself::SESSION_KEY'attachments' = array();
-        }
-
-        foreach ((array)$message->attachments as $part) {
-          $attachment = array(
-            'data' => $imap->get_message_part($uid, $part->mime_id, $part),
-            'size' => $part->size,
-            'name' => $part->filename,
-            'mimetype' => $part->mimetype,
-            'group' => $eventid,
-          );
-
-          $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
-
-          if ($attachment'status' && !$attachment'abort') {
-            $id = $attachment'id';
-            $attachment'classname' = rcube_utils::file2class($attachment'mimetype', $attachment'name');
-
-            // store new attachment in session
-            unset($attachment'status', $attachment'abort', $attachment'data');
-            $_SESSIONself::SESSION_KEY'attachments'$id = $attachment;
-
-            $attachment'id' = 'rcmfile' . $attachment'id';  // add prefix to consider it 'new'
-            $event'attachments' = $attachment;
-          }
-        }
-      }
-
-      $this->rc->output->set_env('event_prop', $event);
-    }
-    else {
-      $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
-    }
-
-    $this->rc->output->send('calendar.dialog');
-  }
-
-  /**
-   * Handler for the 'message_compose' plugin hook. This will check for
-   * a compose parameter 'calendar_event' and create an attachment with the
-   * referenced event in iCal format
-   */
-  public function mail_message_compose($args)
-  {
-    // set the submitted event ID as attachment
-    if (!empty($args'param''calendar_event')) {
-      $this->load_driver();
-
-      list($cal, $id) = explode(':', $args'param''calendar_event', 2);
-      if ($event = $this->driver->get_event(array('id' => $id, 'calendar' => $cal))) {
-        $filename = asciiwords($event'title');
-        if (empty($filename))
-          $filename = 'event';
-
-        // save ics to a temp file and register as attachment
-        $tmp_path = tempnam($this->rc->config->get('temp_dir'), 'rcmAttmntCal');
-        file_put_contents($tmp_path, $this->get_ical()->export(array($event), '', false, array($this->driver, 'get_attachment_body')));
-
-        $args'attachments' = array(
-          'path'     => $tmp_path,
-          'name'     => $filename . '.ics',
-          'mimetype' => 'text/calendar',
-          'size'     => filesize($tmp_path),
-        );
-        $args'param''subject' = $event'title';
-      }
+    /**
+     * Handler for calendar/itip-delegate requests
+     */
+    function mail_itip_delegate()
+    {
+        // forward request to mail_import_itip() with the right status
+        $_POST'_status' = $_REQUEST'_status' = 'delegated';
+        $this->mail_import_itip();
+    }
+
+    /**
+     * Import the full payload from a mail message attachment
+     */
+    public function mail_import_attachment()
+    {
+        $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+        $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+        $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
+        $charset = RCUBE_CHARSET;
+
+        // establish imap connection
+        $imap = $this->rc->get_storage();
+        $imap->set_folder($mbox);
+
+        if ($uid && $mime_id) {
+            $part = $imap->get_message_part($uid, $mime_id);
+            // $headers = $imap->get_message_headers($uid);
+
+            if ($part) {
+                if (!empty($part->ctype_parameters'charset')) {
+                    $charset = $part->ctype_parameters'charset';
+                }
+                $events = $this->get_ical()->import($part, $charset);
+            }
+        }
+
+        $success = $existing = 0;
+
+        if (!empty($events)) {
+            // find writeable calendar to store event
+            $cal_id = !empty($_REQUEST'_calendar') ? rcube_utils::get_input_value('_calendar', rcube_utils::INPUT_POST) : null;
+            $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
+
+            foreach ($events as $event) {
+                // save to calendar
+                $calendar = !empty($calendars$cal_id) ? $calendars$cal_id : $this->get_default_calendar($event'sensitivity');
+                if ($calendar && $calendar'editable' && $event'_type' == 'event') {
+                    $event'calendar' = $calendar'id';
+
+                    if (!$this->driver->get_event($event'uid', calendar_driver::FILTER_WRITEABLE)) {
+                        $success += (bool)$this->driver->new_event($event);
+                    }
+                    else {
+                        $existing++;
+                    }
+                }
+            }
+        }
+
+        if ($success) {
+            $msg = $this->gettext('name' => 'importsuccess', 'vars' => 'nr' => $success);
+            $this->rc->output->command('display_message', $msg, 'confirmation');
+        }
+        else if ($existing) {
+            $this->rc->output->command('display_message', $this->gettext('importwarningexists'), 'warning');
+        }
+        else {
+            $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
+        }
+    }
+
+    /**
+     * Read email message and return contents for a new event based on that message
+     */
+    public function mail_message2event()
+    {
+        $this->ui->init();
+        $this->ui->addJS();
+        $this->ui->init_templates();
+        $this->ui->calendar_list(, true); // set env'calendars'
+
+        $uid   = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+        $mbox  = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
+        $event = ;
+
+        // establish imap connection
+        $imap    = $this->rc->get_storage();
+        $message = new rcube_message($uid, $mbox);
+
+        if ($message->headers) {
+            $event'title'       = trim($message->subject);
+            $event'description' = trim($message->first_text_part());
+
+            $this->load_driver();
+
+            // add a reference to the email message
+            if ($msgref = $this->driver->get_message_reference($message->headers, $mbox)) {
+                $event'links' = $msgref;
+            }
+            // copy mail attachments to event
+            else if ($message->attachments) {
+                $eventid = 'cal-';
+                if (empty($_SESSIONself::SESSION_KEY) || $_SESSIONself::SESSION_KEY'id' != $eventid) {
+                    $_SESSIONself::SESSION_KEY = 
+                        'id'          => $eventid,
+                        'attachments' => ,
+                    ;
+                }
+
+                foreach ((array) $message->attachments as $part) {
+                    $attachment = 
+                        'data' => $imap->get_message_part($uid, $part->mime_id, $part),
+                        'size' => $part->size,
+                        'name' => $part->filename,
+                        'mimetype' => $part->mimetype,
+                        'group' => $eventid,
+                    ;
+
+                    $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
+
+                    if (!empty($attachment'status') && !$attachment'abort') {
+                        $id = $attachment'id';
+                        $attachment'classname' = rcube_utils::file2class($attachment'mimetype', $attachment'name');
+
+                        // store new attachment in session
+                        unset($attachment'status', $attachment'abort', $attachment'data');
+                        $_SESSIONself::SESSION_KEY'attachments'$id = $attachment;
+
+                        $attachment'id' = 'rcmfile' . $attachment'id';  // add prefix to consider it 'new'
+                        $event'attachments' = $attachment;
+                    }
+                }
+            }
+
+            $this->rc->output->set_env('event_prop', $event);
+        }
+        else {
+            $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
+        }
+
+        $this->rc->output->send('calendar.dialog');
     }
 
-    return $args;
-  }
+    /**
+     * Handler for the 'message_compose' plugin hook. This will check for
+     * a compose parameter 'calendar_event' and create an attachment with the
+     * referenced event in iCal format
+     */
+    public function mail_message_compose($args)
+    {
+        // set the submitted event ID as attachment
+        if (!empty($args'param''calendar_event')) {
+            $this->load_driver();
+
+            list($cal, $id) = explode(':', $args'param''calendar_event', 2);
+
+            if ($event = $this->driver->get_event('id' => $id, 'calendar' => $cal)) {
+                $filename = asciiwords($event'title');
+                if (empty($filename)) {
+                    $filename = 'event';
+                }
+
+                // save ics to a temp file and register as attachment
+                $tmp_path = tempnam($this->rc->config->get('temp_dir'), 'rcmAttmntCal');
+                $export   = $this->get_ical()->export($event, '', false, $this->driver, 'get_attachment_body');
+
+                file_put_contents($tmp_path, $export);
+
+                $args'attachments' = 
+                    'path'     => $tmp_path,
+                    'name'     => $filename . '.ics',
+                    'mimetype' => 'text/calendar',
+                    'size'     => filesize($tmp_path),
+                ;
+                $args'param''subject' = $event'title';
+            }
+        }
 
+        return $args;
+    }
 
-  /**
-   * Get a list of email addresses of the current user (from login and identities)
-   */
-  public function get_user_emails()
-  {
-    return $this->lib->get_user_emails();
-  }
-
-
-  /**
-   * Build an absolute URL with the given parameters
-   */
-  public function get_url($param = array())
-  {
-    $param += array('task' => 'calendar');
-    return $this->rc->url($param, true, true);
-  }
-
-
-  public function ical_feed_hash($source)
-  {
-    return base64_encode($this->rc->user->get_username() . ':' . $source);
-  }
-
-  /**
-   * Handler for user_delete plugin hook
-   */
-  public function user_delete($args)
-  {
-     // delete itipinvitations entries related to this user
-     $db = $this->rc->get_dbh();
-     $table_itipinvitations = $db->table_name('itipinvitations', true);
-     $db->query("DELETE FROM $table_itipinvitations WHERE `user_id` = ?", $args'user'->ID);
-
-     $this->setup();
-     $this->load_driver();
-     return $this->driver->user_delete($args);
-  }
-
-  /**
-   * Find first occurrence of a recurring event excluding start date
-   *
-   * @param array $event Event data (with 'start' and 'recurrence')
-   *
-   * @return DateTime Date of the first occurrence
-   */
-  public function find_first_occurrence($event)
-  {
-    // Make sure libkolab plugin is loaded in case of Kolab driver
-    $this->load_driver();
-
-    // Use libkolab to compute recurring events (and libkolab plugin)
-    // Horde-based fallback has many bugs
-    if (class_exists('kolabformat') && class_exists('kolabcalendaring') && class_exists('kolab_date_recurrence')) {
-      $object = kolab_format::factory('event', 3.0);
-      $object->set($event);
-
-      $recurrence = new kolab_date_recurrence($object);
-    }
-    else {
-      // fallback to libcalendaring (Horde-based) recurrence implementation
-      require_once(__DIR__ . '/lib/calendar_recurrence.php');
-      $recurrence = new calendar_recurrence($this, $event);
-    }
-
-    return $recurrence->first_occurrence();
-  }
-
-  /**
-   * Get date-time input from UI and convert to unix timestamp
-   */
-  protected function input_timestamp($name, $type)
-  {
-    $ts = rcube_utils::get_input_value($name, $type);
-
-    if ($ts && (!is_numeric($ts) || strpos($ts, 'T'))) {
-      $ts = new DateTime($ts, $this->timezone);
-      $ts = $ts->getTimestamp();
-    }
-
-    return $ts;
-  }
-
-  /**
-   * Magic getter for public access to protected members
-   */
-  public function __get($name)
-  {
-    switch ($name) {
-      case 'ical':
-        return $this->get_ical();
+    /**
+     * Get a list of email addresses of the current user (from login and identities)
+     */
+    public function get_user_emails()
+    {
+        return $this->lib->get_user_emails();
+    }
 
-      case 'itip':
-        return $this->load_itip();
+    /**
+     * Build an absolute URL with the given parameters
+     */
+    public function get_url($param = )
+    {
+        $param += 'task' => 'calendar';
+        return $this->rc->url($param, true, true);
+    }
 
-      case 'driver':
+    public function ical_feed_hash($source)
+    {
+        return base64_encode($this->rc->user->get_username() . ':' . $source);
+    }
+
+    /**
+     * Handler for user_delete plugin hook
+     */
+    public function user_delete($args)
+    {
+         // delete itipinvitations entries related to this user
+         $db = $this->rc->get_dbh();
+         $table_itipinvitations = $db->table_name('itipinvitations', true);
+
+         $db->query("DELETE FROM $table_itipinvitations WHERE `user_id` = ?", $args'user'->ID);
+
+        $this->setup();
         $this->load_driver();
-        return $this->driver;
+
+        return $this->driver->user_delete($args);
     }
 
-    return null;
-  }
+    /**
+     * Find first occurrence of a recurring event excluding start date
+     *
+     * @param array $event Event data (with 'start' and 'recurrence')
+     *
+     * @return DateTime Date of the first occurrence
+     */
+    public function find_first_occurrence($event)
+    {
+        // Make sure libkolab plugin is loaded in case of Kolab driver
+        $this->load_driver();
+
+        // Use libkolab to compute recurring events (and libkolab plugin)
+        // Horde-based fallback has many bugs
+        if (class_exists('kolabformat') && class_exists('kolabcalendaring') && class_exists('kolab_date_recurrence')) {
+            $object = kolab_format::factory('event', 3.0);
+            $object->set($event);
+
+            $recurrence = new kolab_date_recurrence($object);
+        }
+        else {
+            // fallback to libcalendaring (Horde-based) recurrence implementation
+            require_once(__DIR__ . '/lib/calendar_recurrence.php');
+            $recurrence = new calendar_recurrence($this, $event);
+        }
+
+        return $recurrence->first_occurrence();
+    }
 
+    /**
+     * Get date-time input from UI and convert to unix timestamp
+     */
+    protected function input_timestamp($name, $type)
+    {
+        $ts = rcube_utils::get_input_value($name, $type);
+
+        if ($ts && (!is_numeric($ts) || strpos($ts, 'T'))) {
+            $ts = new DateTime($ts, $this->timezone);
+            $ts = $ts->getTimestamp();
+        }
+
+        return $ts;
+    }
+
+    /**
+     * Magic getter for public access to protected members
+     */
+    public function __get($name)
+    {
+        switch ($name) {
+        case 'ical':
+            return $this->get_ical();
+
+        case 'itip':
+            return $this->load_itip();
+
+        case 'driver':
+            $this->load_driver();
+            return $this->driver;
+        }
+
+        return null;
+    }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/calendar_ui.js -> iRony-0.4.6.tar.gz/lib/plugins/calendar/calendar_ui.js Changed

iRony-0.4.5.tar.gz/lib/plugins/calendar/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/calendar/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/calendar_driver.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/calendar_driver.php Changed

@@ -94,740 +94,770 @@
  */
 abstract class calendar_driver
 {
-  const FILTER_ALL           = 0;
-  const FILTER_WRITEABLE     = 1;
-  const FILTER_INSERTABLE    = 2;
-  const FILTER_ACTIVE        = 4;
-  const FILTER_PERSONAL      = 8;
-  const FILTER_PRIVATE       = 16;
-  const FILTER_CONFIDENTIAL  = 32;
-  const FILTER_SHARED        = 64;
-  const BIRTHDAY_CALENDAR_ID = '__bdays__';
-
-  // features supported by backend
-  public $alarms = false;
-  public $attendees = false;
-  public $freebusy = false;
-  public $attachments = false;
-  public $undelete = false;
-  public $history = false;
-  public $categoriesimmutable = false;
-  public $alarm_types = array('DISPLAY');
-  public $alarm_absolute = true;
-  public $last_error;
-
-  protected $default_categories = array(
-    'Personal' => 'c0c0c0',
-    'Work'     => 'ff0000',
-    'Family'   => '00ff00',
-    'Holiday'  => 'ff6600',
-  );
-
-  /**
-   * Get a list of available calendars from this source
-   *
-   * @param integer Bitmask defining filter criterias.
-   *          See FILTER_* constants for possible values.
-   * @return array List of calendars
-   */
-  abstract function list_calendars($filter = 0);
-
-  /**
-   * Create a new calendar assigned to the current user
-   *
-   * @param array Hash array with calendar properties
-   *        name: Calendar name
-   *       color: The color of the calendar
-   *  showalarms: True if alarms are enabled
-   * @return mixed ID of the calendar on success, False on error
-   */
-  abstract function create_calendar($prop);
-
-  /**
-   * Update properties of an existing calendar
-   *
-   * @param array Hash array with calendar properties
-   *          id: Calendar Identifier
-   *        name: Calendar name
-   *       color: The color of the calendar
-   *  showalarms: True if alarms are enabled (if supported)
-   * @return boolean True on success, Fales on failure
-   */
-  abstract function edit_calendar($prop);
-  
-  /**
-   * Set active/subscribed state of a calendar
-   *
-   * @param array Hash array with calendar properties
-   *          id: Calendar Identifier
-   *      active: True if calendar is active, false if not
-   * @return boolean True on success, Fales on failure
-   */
-  abstract function subscribe_calendar($prop);
-
-  /**
-   * Delete the given calendar with all its contents
-   *
-   * @param array Hash array with calendar properties
-   *      id: Calendar Identifier
-   * @return boolean True on success, Fales on failure
-   */
-  abstract function delete_calendar($prop);
-
-  /**
-   * Search for shared or otherwise not listed calendars the user has access
-   *
-   * @param string Search string
-   * @param string Section/source to search
-   * @return array List of calendars
-   */
-  abstract function search_calendars($query, $source);
-
-  /**
-   * Add a single event to the database
-   *
-   * @param array Hash array with event properties (see header of this file)
-   * @return mixed New event ID on success, False on error
-   */
-  abstract function new_event($event);
-
-  /**
-   * Update an event entry with the given data
-   *
-   * @param array Hash array with event properties (see header of this file)
-   * @return boolean True on success, False on error
-   */
-  abstract function edit_event($event);
-
-  /**
-   * Extended event editing with possible changes to the argument
-   *
-   * @param array  Hash array with event properties
-   * @param string New participant status
-   * @param array  List of hash arrays with updated attendees
-   * @return boolean True on success, False on error
-   */
-  public function edit_rsvp(&$event, $status, $attendees)
-  {
-    return $this->edit_event($event);
-  }
-
-  /**
-   * Update the participant status for the given attendee
-   *
-   * @param array  Hash array with event properties
-   * @param array  List of hash arrays each represeting an updated attendee
-   * @return boolean True on success, False on error
-   */
-  public function update_attendees(&$event, $attendees)
-  {
-    return $this->edit_event($event);
-  }
-
-  /**
-   * Move a single event
-   *
-   * @param array Hash array with event properties:
-   *      id: Event identifier
-   *   start: Event start date/time as DateTime object
-   *     end: Event end date/time as DateTime object
-   *  allday: Boolean flag if this is an all-day event
-   * @return boolean True on success, False on error
-   */
-  abstract function move_event($event);
-
-  /**
-   * Resize a single event
-   *
-   * @param array Hash array with event properties:
-   *      id: Event identifier
-   *   start: Event start date/time as DateTime object with timezone
-   *     end: Event end date/time as DateTime object with timezone
-   * @return boolean True on success, False on error
-   */
-  abstract function resize_event($event);
-
-  /**
-   * Remove a single event from the database
-   *
-   * @param array   Hash array with event properties:
-   *      id: Event identifier
-   * @param boolean Remove event irreversible (mark as deleted otherwise,
-   *                if supported by the backend)
-   *
-   * @return boolean True on success, False on error
-   */
-  abstract function remove_event($event, $force = true);
-
-  /**
-   * Restores a single deleted event (if supported)
-   *
-   * @param array Hash array with event properties:
-   *      id: Event identifier
-   *
-   * @return boolean True on success, False on error
-   */
-  public function restore_event($event)
-  {
-    return false;
-  }
-
-  /**
-   * Return data of a single event
-   *
-   * @param mixed  UID string or hash array with event properties:
-   *         id: Event identifier
-   *        uid: Event UID
-   *  _instance: Instance identifier in combination with uid (optional)
-   *   calendar: Calendar identifier (optional)
-   * @param integer Bitmask defining the scope to search events in.
-   *          See FILTER_* constants for possible values.
-   * @param boolean If true, recurrence exceptions shall be added
-   *
-   * @return array Event object as hash array
-   */
-  abstract function get_event($event, $scope = 0, $full = false);
-
-  /**
-   * Get events from source.
-   *
-   * @param  integer Date range start (unix timestamp)
-   * @param  integer Date range end (unix timestamp)
-   * @param  string  Search query (optional)
-   * @param  mixed   List of calendar IDs to load events from (either as array or comma-separated string)
-   * @param  boolean Include virtual/recurring events (optional)
-   * @param  integer Only list events modified since this time (unix timestamp)
-   * @return array A list of event objects (see header of this file for struct of an event)
-   */
-  abstract function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null);
-
-  /**
-   * Get number of events in the given calendar
-   *
-   * @param  mixed   List of calendar IDs to count events (either as array or comma-separated string)
-   * @param  integer Date range start (unix timestamp)
-   * @param  integer Date range end (unix timestamp)
-   * @return array   Hash array with counts grouped by calendar ID
-   */
-  abstract function count_events($calendars, $start, $end = null);
-
-  /**
-   * Get a list of pending alarms to be displayed to the user
-   *
-   * @param  integer Current time (unix timestamp)
-   * @param  mixed   List of calendar IDs to show alarms for (either as array or comma-separated string)
-   * @return array A list of alarms, each encoded as hash array:
-   *         id: Event identifier
-   *        uid: Unique identifier of this event
-   *      start: Event start date/time as DateTime object
-   *        end: Event end date/time as DateTime object
-   *     allday: Boolean flag if this is an all-day event
-   *      title: Event title/summary
-   *   location: Location string
-   */
-  abstract function pending_alarms($time, $calendars = null);
-
-  /**
-   * (User) feedback after showing an alarm notification
-   * This should mark the alarm as 'shown' or snooze it for the given amount of time
-   *
-   * @param  string  Event identifier
-   * @param  integer Suspend the alarm for this number of seconds
-   */
-  abstract function dismiss_alarm($event_id, $snooze = 0);
-
-  /**
-   * Check the given event object for validity
-   *
-   * @param array Event object as hash array
-   * @return boolean True if valid, false if not
-   */
-  public function validate($event)
-  {
-    $valid = true;
-
-    if (!is_object($event'start') || !is_a($event'start', 'DateTime'))
-      $valid = false;
-    if (!is_object($event'end') || !is_a($event'end', 'DateTime'))
-      $valid = false;
-
-    return $valid;
-  }
-
-
-  /**
-   * Get list of event's attachments.
-   * Drivers can return list of attachments as event property.
-   * If they will do not do this list_attachments() method will be used.
-   *
-   * @param array $event Hash array with event properties:
-   *         id: Event identifier
-   *   calendar: Calendar identifier
-   *
-   * @return array List of attachments, each as hash array:
-   *         id: Attachment identifier
-   *       name: Attachment name
-   *   mimetype: MIME content type of the attachment
-   *       size: Attachment size
-   */
-  public function list_attachments($event) { }
-
-  /**
-   * Get attachment properties
-   *
-   * @param string $id    Attachment identifier
-   * @param array  $event Hash array with event properties:
-   *         id: Event identifier
-   *   calendar: Calendar identifier
-   *
-   * @return array Hash array with attachment properties:
-   *         id: Attachment identifier
-   *       name: Attachment name
-   *   mimetype: MIME content type of the attachment
-   *       size: Attachment size
-   */
-  public function get_attachment($id, $event) { }
-
-  /**
-   * Get attachment body
-   *
-   * @param string $id    Attachment identifier
-   * @param array  $event Hash array with event properties:
-   *         id: Event identifier
-   *   calendar: Calendar identifier
-   *
-   * @return string Attachment body
-   */
-  public function get_attachment_body($id, $event) { }
-
-  /**
-   * Build a struct representing the given message reference
-   *
-   * @param object|string $uri_or_headers rcube_message_header instance holding the message headers
-   *                         or an URI from a stored link referencing a mail message.
-   * @param string $folder  IMAP folder the message resides in
-   *
-   * @return array An struct referencing the given IMAP message
-   */
-  public function get_message_reference($uri_or_headers, $folder = null)
-  {
-      // to be implemented by the derived classes
-      return false;
-  }
-
-  /**
-   * List availabale categories
-   * The default implementation reads them from config/user prefs
-   */
-  public function list_categories()
-  {
-    $rcmail = rcube::get_instance();
-    return $rcmail->config->get('calendar_categories', $this->default_categories);
-  }
-
-  /**
-   * Create a new category
-   */
-  public function add_category($name, $color) { }
-
-  /**
-   * Remove the given category
-   */
-  public function remove_category($name) { }
-
-  /**
-   * Update/replace a category
-   */
-  public function replace_category($oldname, $name, $color) { }
-
-  /**
-   * Fetch free/busy information from a person within the given range
-   *
-   * @param string  E-mail address of attendee
-   * @param integer Requested period start date/time as unix timestamp
-   * @param integer Requested period end date/time as unix timestamp
-   *
-   * @return array  List of busy timeslots within the requested range
-   */
-  public function get_freebusy_list($email, $start, $end)
-  {
-    return false;
-  }
-
-  /**
-   * Create instances of a recurring event
-   *
-   * @param array  Hash array with event properties
-   * @param object DateTime Start date of the recurrence window
-   * @param object DateTime End date of the recurrence window
-   * @return array List of recurring event instances
-   */
-  public function get_recurring_events($event, $start, $end = null)
-  {
-    $events = array();
-
-    if ($event'recurrence') {
-      // include library class
-      require_once(dirname(__FILE__) . '/../lib/calendar_recurrence.php');
-
-      $rcmail = rcmail::get_instance();
-      $recurrence = new calendar_recurrence($rcmail->plugins->get_plugin('calendar'), $event);
-      $recurrence_id_format = libcalendaring::recurrence_id_format($event);
-
-      // determine a reasonable end date if none given
-      if (!$end) {
-        switch ($event'recurrence''FREQ') {
-          case 'YEARLY':  $intvl = 'P100Y'; break;
-          case 'MONTHLY': $intvl = 'P20Y';  break;
-          default:        $intvl = 'P10Y';  break;
-        }
+    const FILTER_ALL           = 0;
+    const FILTER_WRITEABLE     = 1;
+    const FILTER_INSERTABLE    = 2;
+    const FILTER_ACTIVE        = 4;
+    const FILTER_PERSONAL      = 8;
+    const FILTER_PRIVATE       = 16;
+    const FILTER_CONFIDENTIAL  = 32;
+    const FILTER_SHARED        = 64;
+    const BIRTHDAY_CALENDAR_ID = '__bdays__';
+
+    // features supported by backend
+    public $alarms      = false;
+    public $attendees   = false;
+    public $freebusy    = false;
+    public $attachments = false;
+    public $undelete    = false;
+    public $history     = false;
+    public $alarm_types = 'DISPLAY';
+    public $alarm_absolute      = true;
+    public $categoriesimmutable = false;
+    public $last_error;
+
+    protected $default_categories = 
+        'Personal' => 'c0c0c0',
+        'Work'     => 'ff0000',
+        'Family'   => '00ff00',
+        'Holiday'  => 'ff6600',
+    ;
+
+    /**
+     * Get a list of available calendars from this source
+     *
+     * @param int $filter Bitmask defining filter criterias.
+     *                    See FILTER_* constants for possible values.
+     *
+     * @return array List of calendars
+     */
+    abstract function list_calendars($filter = 0);
+
+    /**
+     * Create a new calendar assigned to the current user
+     *
+     * @param array $prop Hash array with calendar properties
+     *        name: Calendar name
+     *       color: The color of the calendar
+     *  showalarms: True if alarms are enabled
+     *
+     * @return mixed ID of the calendar on success, False on error
+     */
+    abstract function create_calendar($prop);
+
+    /**
+     * Update properties of an existing calendar
+     *
+     * @param array $prop Hash array with calendar properties
+     *          id: Calendar Identifier
+     *        name: Calendar name
+     *       color: The color of the calendar
+     *  showalarms: True if alarms are enabled (if supported)
+     *
+     * @return bool True on success, Fales on failure
+     */
+    abstract function edit_calendar($prop);
+
+    /**
+     * Set active/subscribed state of a calendar
+     *
+     * @param array $prop Hash array with calendar properties
+     *          id: Calendar Identifier
+     *      active: True if calendar is active, false if not
+     *
+     * @return bool True on success, Fales on failure
+     */
+    abstract function subscribe_calendar($prop);
+
+    /**
+     * Delete the given calendar with all its contents
+     *
+     * @param array $prop Hash array with calendar properties
+     *      id: Calendar Identifier
+     *
+     * @return bool True on success, Fales on failure
+     */
+    abstract function delete_calendar($prop);
+
+    /**
+     * Search for shared or otherwise not listed calendars the user has access
+     *
+     * @param string $query  Search string
+     * @param string $source Section/source to search
+     *
+     * @return array List of calendars
+     */
+    abstract function search_calendars($query, $source);
+
+    /**
+     * Add a single event to the database
+     *
+     * @param array $event Hash array with event properties (see header of this file)
+     *
+     * @return mixed New event ID on success, False on error
+     */
+    abstract function new_event($event);
+
+    /**
+     * Update an event entry with the given data
+     *
+     * @param array $event Hash array with event properties (see header of this file)
+     *
+     * @return bool True on success, False on error
+     */
+    abstract function edit_event($event);
+
+    /**
+     * Extended event editing with possible changes to the argument
+     *
+     * @param array  &$event    Hash array with event properties
+     * @param string $status    New participant status
+     * @param array  $attendees List of hash arrays with updated attendees
+     *
+     * @return bool True on success, False on error
+     */
+    public function edit_rsvp(&$event, $status, $attendees)
+    {
+        return $this->edit_event($event);
+    }
 
-        $end = clone $event'start';
-        $end->add(new DateInterval($intvl));
-      }
-
-      $i = 0;
-      while ($next_event = $recurrence->next_instance()) {
-        // add to output if in range
-        if (($next_event'start' <= $end && $next_event'end' >= $start)) {
-          $next_event'_instance' = $next_event'start'->format($recurrence_id_format);
-          $next_event'id' = $next_event'uid' . '-' . $exception'_instance';
-          $next_event'recurrence_id' = $event'uid';
-          $events = $next_event;
+    /**
+     * Update the participant status for the given attendee
+     *
+     * @param array &$event    Hash array with event properties
+     * @param array $attendees List of hash arrays each represeting an updated attendee
+     *
+     * @return bool True on success, False on error
+     */
+    public function update_attendees(&$event, $attendees)
+    {
+        return $this->edit_event($event);
+    }
+
+    /**
+     * Move a single event
+     *
+     * @param array $event Hash array with event properties:
+     *      id: Event identifier
+     *   start: Event start date/time as DateTime object
+     *     end: Event end date/time as DateTime object
+     *  allday: Boolean flag if this is an all-day event
+     *
+     * @return bool True on success, False on error
+     */
+    abstract function move_event($event);
+
+    /**
+     * Resize a single event
+     *
+     * @param array $event Hash array with event properties:
+     *      id: Event identifier
+     *   start: Event start date/time as DateTime object with timezone
+     *     end: Event end date/time as DateTime object with timezone
+     *
+     * @return bool True on success, False on error
+     */
+    abstract function resize_event($event);
+
+    /**
+     * Remove a single event from the database
+     *
+     * @param array $event Hash array with event properties:
+     *                     id: Event identifier
+     * @param bool  $force Remove event irreversible (mark as deleted otherwise,
+     *                     if supported by the backend)
+     *
+     * @return bool True on success, False on error
+     */
+    abstract function remove_event($event, $force = true);
+
+    /**
+     * Restores a single deleted event (if supported)
+     *
+     * @param array $event Hash array with event properties:
+     *                     id: Event identifier
+     *
+     * @return bool True on success, False on error
+     */
+    public function restore_event($event)
+    {
+        return false;
+    }
+
+    /**
+     * Return data of a single event
+     *
+     * @param mixed $event UID string or hash array with event properties:
+     *         id: Event identifier
+     *        uid: Event UID
+     *  _instance: Instance identifier in combination with uid (optional)
+     *   calendar: Calendar identifier (optional)
+     * @param int   $scope Bitmask defining the scope to search events in.
+     *                     See FILTER_* constants for possible values.
+     * @param bool  $full  If true, recurrence exceptions shall be added
+     *
+     * @return array Event object as hash array
+     */
+    abstract function get_event($event, $scope = 0, $full = false);
+
+    /**
+     * Get events from source.
+     *
+     * @param int    $start      Date range start (unix timestamp)
+     * @param int    $end        Date range end (unix timestamp)
+     * @param string $query      Search query (optional)
+     * @param mixed  $calendars  List of calendar IDs to load events from (either as array or comma-separated string)
+     * @param bool   $virtual    Include virtual/recurring events (optional)
+     * @param int    $modifiedsince Only list events modified since this time (unix timestamp)
+     *
+     * @return array A list of event objects (see header of this file for struct of an event)
+     */
+    abstract function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null);
+
+    /**
+     * Get number of events in the given calendar
+     *
+     * @param mixed $calendars List of calendar IDs to count events (either as array or comma-separated string)
+     * @param int   $start     Date range start (unix timestamp)
+     * @param int   $end       Date range end (unix timestamp)
+     *
+     * @return array   Hash array with counts grouped by calendar ID
+     */
+    abstract function count_events($calendars, $start, $end = null);
+
+    /**
+     * Get a list of pending alarms to be displayed to the user
+     *
+     * @param int   $time      Current time (unix timestamp)
+     * @param mixed $calendars List of calendar IDs to show alarms for (either as array or comma-separated string)
+     *
+     * @return array A list of alarms, each encoded as hash array:
+     *         id: Event identifier
+     *        uid: Unique identifier of this event
+     *      start: Event start date/time as DateTime object
+     *        end: Event end date/time as DateTime object
+     *     allday: Boolean flag if this is an all-day event
+     *      title: Event title/summary
+     *   location: Location string
+     */
+    abstract function pending_alarms($time, $calendars = null);
+
+    /**
+     * (User) feedback after showing an alarm notification
+     * This should mark the alarm as 'shown' or snooze it for the given amount of time
+     *
+     * @param string $event_id Event identifier
+     * @param int    $snooze   Suspend the alarm for this number of seconds
+     */
+    abstract function dismiss_alarm($event_id, $snooze = 0);
+
+    /**
+     * Check the given event object for validity
+     *
+     * @param array $event Event object as hash array
+     *
+     * @return boolean True if valid, false if not
+     */
+    public function validate($event)
+    {
+        $valid = true;
+
+        if (empty($event'start') || !is_object($event'start') || !is_a($event'start', 'DateTime')) {
+            $valid = false;
         }
-        else if ($next_event'start' > $end) {  // stop loop if out of range
-          break;
+
+        if (empty($event'end') || !is_object($event'end') || !is_a($event'end', 'DateTime')) {
+            $valid = false;
         }
 
-        // avoid endless recursion loops
-        if (++$i > 1000) {
-          break;
+        return $valid;
+    }
+
+    /**
+     * Get list of event's attachments.
+     * Drivers can return list of attachments as event property.
+     * If they will do not do this list_attachments() method will be used.
+     *
+     * @param array $event Hash array with event properties:
+     *         id: Event identifier
+     *   calendar: Calendar identifier
+     *
+     * @return array List of attachments, each as hash array:
+     *         id: Attachment identifier
+     *       name: Attachment name
+     *   mimetype: MIME content type of the attachment
+     *       size: Attachment size
+     */
+    public function list_attachments($event) { }
+
+    /**
+     * Get attachment properties
+     *
+     * @param string $id    Attachment identifier
+     * @param array  $event Hash array with event properties:
+     *         id: Event identifier
+     *   calendar: Calendar identifier
+     *
+     * @return array Hash array with attachment properties:
+     *         id: Attachment identifier
+     *       name: Attachment name
+     *   mimetype: MIME content type of the attachment
+     *       size: Attachment size
+     */
+    public function get_attachment($id, $event) { }
+
+    /**
+     * Get attachment body
+     *
+     * @param string $id    Attachment identifier
+     * @param array  $event Hash array with event properties:
+     *         id: Event identifier
+     *   calendar: Calendar identifier
+     *
+     * @return string Attachment body
+     */
+    public function get_attachment_body($id, $event) { }
+
+    /**
+     * Build a struct representing the given message reference
+     *
+     * @param object|string $uri_or_headers rcube_message_header instance holding the message headers
+     *                         or an URI from a stored link referencing a mail message.
+     * @param string $folder  IMAP folder the message resides in
+     *
+     * @return array An struct referencing the given IMAP message
+     */
+    public function get_message_reference($uri_or_headers, $folder = null)
+    {
+        // to be implemented by the derived classes
+        return false;
+    }
+
+    /**
+     * List availabale categories
+     * The default implementation reads them from config/user prefs
+     */
+    public function list_categories()
+    {
+        $rcmail = rcube::get_instance();
+        return $rcmail->config->get('calendar_categories', $this->default_categories);
+    }
+
+    /**
+     * Create a new category
+     */
+    public function add_category($name, $color) { }
+
+    /**
+     * Remove the given category
+     */
+    public function remove_category($name) { }
+
+    /**
+     * Update/replace a category
+     */
+    public function replace_category($oldname, $name, $color) { }
+
+    /**
+     * Fetch free/busy information from a person within the given range
+     *
+     * @param string $email E-mail address of attendee
+     * @param int    $start Requested period start date/time as unix timestamp
+     * @param int    $end   Requested period end date/time as unix timestamp
+     *
+     * @return array List of busy timeslots within the requested range
+     */
+    public function get_freebusy_list($email, $start, $end)
+    {
+        return false;
+    }
+
+    /**
+     * Create instances of a recurring event
+     *
+     * @param array    $event Hash array with event properties
+     * @param DateTime $start Start date of the recurrence window
+     * @param DateTime $end   End date of the recurrence window
+     *
+     * @return array List of recurring event instances
+     */
+    public function get_recurring_events($event, $start, $end = null)
+    {
+        $events = ;
+
+        if (!empty($event'recurrence')) {
+            // include library class
+            require_once(dirname(__FILE__) . '/../lib/calendar_recurrence.php');
+
+            $rcmail = rcmail::get_instance();
+            $recurrence = new calendar_recurrence($rcmail->plugins->get_plugin('calendar'), $event);
+            $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+
+            // determine a reasonable end date if none given
+            if (!$end) {
+                switch ($event'recurrence''FREQ') {
+                case 'YEARLY':  $intvl = 'P100Y'; break;
+                case 'MONTHLY': $intvl = 'P20Y';  break;
+                default:        $intvl = 'P10Y';  break;
+                }
+
+                $end = clone $event'start';
+                $end->add(new DateInterval($intvl));
+            }
+
+            $i = 0;
+            while ($next_event = $recurrence->next_instance()) {
+                // add to output if in range
+                if (($next_event'start' <= $end && $next_event'end' >= $start)) {
+                    $next_event'_instance' = $next_event'start'->format($recurrence_id_format);
+                    $next_event'id' = $next_event'uid' . '-' . $exception'_instance';
+                    $next_event'recurrence_id' = $event'uid';
+                    $events = $next_event;
+                }
+                else if ($next_event'start' > $end) {  // stop loop if out of range
+                    break;
+                }
+
+                // avoid endless recursion loops
+                if (++$i > 1000) {
+                    break;
+                }
+            }
         }
-      }
+
+        return $events;
+    }
+
+    /**
+     * Provide a list of revisions for the given event
+     *
+     * @param array $event Hash array with event properties:
+     *         id: Event identifier
+     *   calendar: Calendar identifier
+     *
+     * @return array List of changes, each as a hash array:
+     *         rev: Revision number
+     *        type: Type of the change (create, update, move, delete)
+     *        date: Change date
+     *        user: The user who executed the change
+     *          ip: Client IP
+     * destination: Destination calendar for 'move' type
+     */
+    public function get_event_changelog($event)
+    {
+        return false;
+    }
+
+    /**
+     * Get a list of property changes beteen two revisions of an event
+     *
+     * @param array $event Hash array with event properties:
+     *         id: Event identifier
+     *   calendar: Calendar identifier
+     * @param mixed $rev1 Old Revision
+     * @param mixed $rev2 New Revision
+     *
+     * @return array List of property changes, each as a hash array:
+     *    property: Revision number
+     *         old: Old property value
+     *         new: Updated property value
+     */
+    public function get_event_diff($event, $rev1, $rev2)
+    {
+        return false;
     }
 
-    return $events;
-  }
-
-  /**
-   * Provide a list of revisions for the given event
-   *
-   * @param array  $event Hash array with event properties:
-   *         id: Event identifier
-   *   calendar: Calendar identifier
-   *
-   * @return array List of changes, each as a hash array:
-   *         rev: Revision number
-   *        type: Type of the change (create, update, move, delete)
-   *        date: Change date
-   *        user: The user who executed the change
-   *          ip: Client IP
-   * destination: Destination calendar for 'move' type
-   */
-  public function get_event_changelog($event)
-  {
-    return false;
-  }
-
-  /**
-   * Get a list of property changes beteen two revisions of an event
-   *
-   * @param array $event Hash array with event properties:
-   *         id: Event identifier
-   *   calendar: Calendar identifier
-   * @param mixed $rev1 Old Revision
-   * @param mixed $rev2 New Revision
-   *
-   * @return array List of property changes, each as a hash array:
-   *    property: Revision number
-   *         old: Old property value
-   *         new: Updated property value
-   */
-  public function get_event_diff($event, $rev1, $rev2)
-  {
-    return false;
-  }
-
-  /**
-   * Return full data of a specific revision of an event
-   *
-   * @param mixed  UID string or hash array with event properties:
-   *        id: Event identifier
-   *  calendar: Calendar identifier
-   * @param mixed  $rev Revision number
-   *
-   * @return array Event object as hash array
-   * @see self::get_event()
-   */
-  public function get_event_revison($event, $rev)
-  {
-    return false;
-  }
-
-  /**
-   * Command the backend to restore a certain revision of an event.
-   * This shall replace the current event with an older version.
-   *
-   * @param mixed  UID string or hash array with event properties:
-   *        id: Event identifier
-   *  calendar: Calendar identifier
-   * @param mixed  $rev Revision number
-   *
-   * @return boolean True on success, False on failure
-   */
-  public function restore_event_revision($event, $rev)
-  {
-    return false;
-  }
-
-
-  /**
-   * Callback function to produce driver-specific calendar create/edit form
-   *
-   * @param string Request action 'form-edit|form-new'
-   * @param array  Calendar properties (e.g. id, color)
-   * @param array  Edit form fields
-   *
-   * @return string HTML content of the form
-   */
-  public function calendar_form($action, $calendar, $formfields)
-  {
-    $table = new html_table(array('cols' => 2, 'class' => 'propform'));
-
-    foreach ($formfields as $col => $colprop) {
-      $label = !empty($colprop'label') ? $colprop'label' : $rcmail->gettext("$domain.$col");
-
-      $table->add('title', html::label($colprop'id', rcube::Q($label)));
-      $table->add(null, $colprop'value');
+    /**
+     * Return full data of a specific revision of an event
+     *
+     * @param mixed $event UID string or hash array with event properties:
+     *        id: Event identifier
+     *  calendar: Calendar identifier
+     * @param mixed  $rev Revision number
+     *
+     * @return array Event object as hash array
+     * @see self::get_event()
+     */
+    public function get_event_revison($event, $rev)
+    {
+        return false;
     }
 
-    return $table->show();
-  }
-
-  /**
-   * Compose a list of birthday events from the contact records in the user's address books.
-   *
-   * This is a default implementation using Roundcube's address book API.
-   * It can be overriden with a more optimized version by the individual drivers.
-   *
-   * @param  integer Event's new start (unix timestamp)
-   * @param  integer Event's new end (unix timestamp)
-   * @param  string  Search query (optional)
-   * @param  integer Only list events modified since this time (unix timestamp)
-   * @return array A list of event records
-   */
-  public function load_birthday_events($start, $end, $search = null, $modifiedsince = null)
-  {
-    // ignore update requests for simplicity reasons
-    if (!empty($modifiedsince)) {
-      return array();
+    /**
+     * Command the backend to restore a certain revision of an event.
+     * This shall replace the current event with an older version.
+     *
+     * @param mixed $event UID string or hash array with event properties:
+     *        id: Event identifier
+     *  calendar: Calendar identifier
+     * @param mixed  $rev Revision number
+     *
+     * @return boolean True on success, False on failure
+     */
+    public function restore_event_revision($event, $rev)
+    {
+        return false;
     }
 
-    // convert to DateTime for comparisons
-    $start  = new DateTime('@'.$start);
-    $end    = new DateTime('@'.$end);
-    // extract the current year
-    $year   = $start->format('Y');
-    $year2  = $end->format('Y');
-
-    $events = array();
-    $search = mb_strtolower($search);
-    $rcmail = rcmail::get_instance();
-    $cache  = $rcmail->get_cache('calendar.birthdays', 'db', 3600);
-    $cache->expunge();
-
-    $alarm_type   = $rcmail->config->get('calendar_birthdays_alarm_type', '');
-    $alarm_offset = $rcmail->config->get('calendar_birthdays_alarm_offset', '-1D');
-    $alarms       = $alarm_type ? $alarm_offset . ':' . $alarm_type : null;
-
-    // let the user select the address books to consider in prefs
-    $selected_sources = $rcmail->config->get('calendar_birthday_adressbooks');
-    $sources = $selected_sources ?: array_keys($rcmail->get_address_sources(false, true));
-    foreach ($sources as $source) {
-      $abook = $rcmail->get_address_book($source);
-
-      // skip LDAP address books unless selected by the user
-      if (!$abook || ($abook instanceof rcube_ldap && empty($selected_sources))) {
-        continue;
-      }
-
-      $abook->set_pagesize(10000);
-
-      // check for cached results
-      $cache_records = array();
-      $cached = $cache->get($source);
-
-      // iterate over (cached) contacts
-      foreach (($cached ?: $abook->search('*', '', 2, true, true, array('birthday'))) as $contact) {
-        $event = self::parse_contact($contact, $source);
-
-        if (empty($event)) {
-          continue;
+    /**
+     * Callback function to produce driver-specific calendar create/edit form
+     *
+     * @param string $action     Request action 'form-edit|form-new'
+     * @param array  $calendar   Calendar properties (e.g. id, color)
+     * @param array  $formfields Edit form fields
+     *
+     * @return string HTML content of the form
+     */
+    public function calendar_form($action, $calendar, $formfields)
+    {
+        $table = new html_table('cols' => 2, 'class' => 'propform');
+
+        foreach ($formfields as $col => $colprop) {
+            $label = !empty($colprop'label') ? $colprop'label' : $rcmail->gettext("$domain.$col");
+
+            $table->add('title', html::label($colprop'id', rcube::Q($label)));
+            $table->add(null, $colprop'value');
         }
 
-        // add stripped record to cache
-        if (empty($cached)) {
-          $cache_records = array(
-            'ID'       => $contact'ID',
-            'name'     => $event'_displayname',
-            'birthday' => $event'start'->format('Y-m-d'),
-          );
+        return $table->show();
+    }
+
+    /**
+     * Compose a list of birthday events from the contact records in the user's address books.
+     *
+     * This is a default implementation using Roundcube's address book API.
+     * It can be overriden with a more optimized version by the individual drivers.
+     *
+     * @param int    $start         Event's new start (unix timestamp)
+     * @param int    $end           Event's new end (unix timestamp)
+     * @param string $search        Search query (optional)
+     * @param int    $modifiedsince Only list events modified since this time (unix timestamp)
+     *
+     * @return array A list of event records
+     */
+    public function load_birthday_events($start, $end, $search = null, $modifiedsince = null)
+    {
+        // ignore update requests for simplicity reasons
+        if (!empty($modifiedsince)) {
+            return ;
         }
 
-        // filter by search term (only name is involved here)
-        if (!empty($search) && strpos(mb_strtolower($event'title'), $search) === false) {
-          continue;
+        // convert to DateTime for comparisons
+        $start  = new DateTime('@'.$start);
+        $end    = new DateTime('@'.$end);
+        // extract the current year
+        $year   = $start->format('Y');
+        $year2  = $end->format('Y');
+
+        $events = ;
+        $search = mb_strtolower($search);
+        $rcmail = rcmail::get_instance();
+        $cache  = $rcmail->get_cache('calendar.birthdays', 'db', 3600);
+        $cache->expunge();
+
+        $alarm_type   = $rcmail->config->get('calendar_birthdays_alarm_type', '');
+        $alarm_offset = $rcmail->config->get('calendar_birthdays_alarm_offset', '-1D');
+        $alarms       = $alarm_type ? $alarm_offset . ':' . $alarm_type : null;
+
+        // let the user select the address books to consider in prefs
+        $selected_sources = $rcmail->config->get('calendar_birthday_adressbooks');
+        $sources = $selected_sources ?: array_keys($rcmail->get_address_sources(false, true));
+
+        foreach ($sources as $source) {
+            $abook = $rcmail->get_address_book($source);
+
+            // skip LDAP address books unless selected by the user
+            if (!$abook || ($abook instanceof rcube_ldap && empty($selected_sources))) {
+                continue;
+            }
+
+            // skip collected recipients/senders addressbooks
+            if (is_a($abook, 'rcube_addresses')) {
+                continue;
+            }
+
+            $abook->set_pagesize(10000);
+
+            // check for cached results
+            $cache_records = ;
+            $cached = $cache->get($source);
+
+            // iterate over (cached) contacts
+            foreach (($cached ?: $abook->search('*', '', 2, true, true, 'birthday')) as $contact) {
+                $event = self::parse_contact($contact, $source);
+
+                if (empty($event)) {
+                    continue;
+                }
+
+                // add stripped record to cache
+                if (empty($cached)) {
+                    $cache_records = 
+                        'ID'       => $contact'ID',
+                        'name'     => $event'_displayname',
+                        'birthday' => $event'start'->format('Y-m-d'),
+                    ;
+                }
+
+                // filter by search term (only name is involved here)
+                if (!empty($search) && strpos(mb_strtolower($event'title'), $search) === false) {
+                    continue;
+                }
+
+                $bday  = clone $event'start';
+                $byear = $bday->format('Y');
+
+                // quick-and-dirty recurrence computation: just replace the year
+                $bday->setDate($year, $bday->format('n'), $bday->format('j'));
+                $bday->setTime(12, 0, 0);
+                $this_year = $year;
+
+                // date range reaches over multiple years: use end year if not in range
+                if (($bday > $end || $bday < $start) && $year2 != $year) {
+                    $bday->setDate($year2, $bday->format('n'), $bday->format('j'));
+                    $this_year = $year2;
+                }
+
+                // birthday is within requested range
+                if ($bday <= $end && $bday >= $start) {
+                    unset($event'_displayname');
+                    $event'alarms' = $alarms;
+
+                    // if this is not the first occurence modify event details
+                    // but not when this is "all birthdays feed" request
+                    if ($year2 - $year < 10 && ($age = ($this_year - $byear))) {
+                        $label = 'name' => 'birthdayage', 'vars' => 'age' => $age;
+
+                        $event'description' = $rcmail->gettext($label, 'calendar');
+                        $event'start'       = $bday;
+                        $event'end'         = clone $bday;
+
+                        unset($event'recurrence');
+                    }
+
+                    // add the main instance
+                    $events = $event;
+                }
+            }
+
+            // store collected contacts in cache
+            if (empty($cached)) {
+                $cache->write($source, $cache_records);
+            }
         }
 
-        $bday  = clone $event'start';
-        $byear = $bday->format('Y');
+        return $events;
+    }
 
-        // quick-and-dirty recurrence computation: just replace the year
-        $bday->setDate($year, $bday->format('n'), $bday->format('j'));
-        $bday->setTime(12, 0, 0);
-        $this_year = $year;
+    /**
+     * Get a single birthday calendar event
+     */
+    public function get_birthday_event($id)
+    {
+        // decode $id
+        list(, $source, $contact_id, $year) = explode(':', rcube_ldap::dn_decode($id));
 
-        // date range reaches over multiple years: use end year if not in range
-        if (($bday > $end || $bday < $start) && $year2 != $year) {
-          $bday->setDate($year2, $bday->format('n'), $bday->format('j'));
-          $this_year = $year2;
-        }
+        $rcmail = rcmail::get_instance();
 
-        // birthday is within requested range
-        if ($bday <= $end && $bday >= $start) {
-          unset($event'_displayname');
-          $event'alarms' = $alarms;
-
-          // if this is not the first occurence modify event details
-          // but not when this is "all birthdays feed" request
-          if ($year2 - $year < 10 && ($age = ($this_year - $byear))) {
-            $event'description' = $rcmail->gettext(array('name' => 'birthdayage', 'vars' => array('age' => $age)), 'calendar');
-            $event'start'       = $bday;
-            $event'end'         = clone $bday;
-            unset($event'recurrence');
-          }
-
-          // add the main instance
-          $events = $event;
+        if (strlen($source) && $contact_id && ($abook = $rcmail->get_address_book($source))) {
+            if ($contact = $abook->get_record($contact_id, true)) {
+                return self::parse_contact($contact, $source);
+            }
         }
-      }
-
-      // store collected contacts in cache
-      if (empty($cached)) {
-        $cache->write($source, $cache_records);
-      }
     }
 
-    return $events;
-  }
+    /**
+     * Parse contact and create an event for its birthday
+     *
+     * @param array  $contact Contact data
+     * @param string $source  Addressbook source ID
+     *
+     * @return array|null Birthday event data
+     */
+    public static function parse_contact($contact, $source)
+    {
+        if (!is_array($contact)) {
+            return;
+        }
 
-  /**
-   * Get a single birthday calendar event
-   */
-  public function get_birthday_event($id)
-  {
-    // decode $id
-    list(,$source,$contact_id,$year) = explode(':', rcube_ldap::dn_decode($id));
+        if (!empty($contact'birthday') && is_array($contact'birthday')) {
+            $contact'birthday' = reset($contact'birthday');
+        }
 
-    $rcmail = rcmail::get_instance();
+        if (empty($contact'birthday')) {
+            return;
+        }
 
-    if (strlen($source) && $contact_id && ($abook = $rcmail->get_address_book($source))) {
-      if ($contact = $abook->get_record($contact_id, true)) {
-        return self::parse_contact($contact, $source);
-      }
-    }
-  }
-
-  /**
-   * Parse contact and create an event for its birthday
-   *
-   * @param array  $contact Contact data
-   * @param string $source  Addressbook source ID
-   *
-   * @return array Birthday event data
-   */
-  public static function parse_contact($contact, $source)
-  {
-    if (!is_array($contact)) {
-      return;
-    }
+        try {
+            $bday = $contact'birthday';
+            if (!$bday instanceof DateTime) {
+                $bday = new DateTime($bday, new DateTimezone('UTC'));
+            }
+            $bday->_dateonly = true;
+        }
+        catch (Exception $e) {
+            rcube::raise_error(
+                    'code' => 600,
+                    'file' => __FILE__,
+                    'line' => __LINE__,
+                    'message' => 'BIRTHDAY PARSE ERROR: ' . $e->getMessage()
+                ,
+                true, false
+            );
+            return;
+        }
 
-    if (is_array($contact'birthday')) {
-      $contact'birthday' = reset($contact'birthday');
+        $rcmail       = rcmail::get_instance();
+        $birthyear    = $bday->format('Y');
+        $display_name = rcube_addressbook::compose_display_name($contact);
+        $label        = 'name' => 'birthdayeventtitle', 'vars' => 'name' => $display_name;
+        $event_title  = $rcmail->gettext($label, 'calendar');
+        $uid          = rcube_ldap::dn_encode('bday:' . $source . ':' . $contact'ID' . ':' . $birthyear);
+
+        return 
+            'id'           => $uid,
+            'uid'          => $uid,
+            'calendar'     => self::BIRTHDAY_CALENDAR_ID,
+            'title'        => $event_title,
+            'description'  => '',
+            'allday'       => true,
+            'start'        => $bday,
+            'end'          => clone $bday,
+            'recurrence'   => 'FREQ' => 'YEARLY', 'INTERVAL' => 1,
+            'free_busy'    => 'free',
+            '_displayname' => $display_name,
+        ;
     }
 
-    if (empty($contact'birthday')) {
-      return;
+    /**
+     * Store alarm dismissal for birtual birthay events
+     *
+     * @param string $event_id Event identifier
+     * @param int    $snooze   Suspend the alarm for this number of seconds
+     */
+    public function dismiss_birthday_alarm($event_id, $snooze = 0)
+    {
+        $rcmail = rcmail::get_instance();
+        $cache  = $rcmail->get_cache('calendar.birthdayalarms', 'db', 86400 * 30);
+        $cache->remove($event_id);
+
+        // compute new notification time or disable if not snoozed
+        $notifyat = $snooze > 0 ? time() + $snooze : null;
+        $cache->set($event_id, 'snooze' => $snooze, 'notifyat' => $notifyat);
+
+        return true;
     }
 
-    try {
-      $bday = $contact'birthday';
-      if (!$bday instanceof DateTime) {
-        $bday = new DateTime($bday, new DateTimezone('UTC'));
-      }
-      $bday->_dateonly = true;
+    /**
+     * Handler for user_delete plugin hook
+     *
+     * @param array $args Hash array with hook arguments
+     *
+     * @return array Return arguments for plugin hooks
+     */
+    public function user_delete($args)
+    {
+        // TO BE OVERRIDDEN
+        return $args;
     }
-    catch (Exception $e) {
-      rcube::raise_error(array(
-          'code' => 600, 'type' => 'php',
-          'file' => __FILE__, 'line' => __LINE__,
-          'message' => 'BIRTHDAY PARSE ERROR: ' . $e->getMessage()),
-        true, false);
-      return;
-    }
-
-    $rcmail       = rcmail::get_instance();
-    $birthyear    = $bday->format('Y');
-    $display_name = rcube_addressbook::compose_display_name($contact);
-    $label        = array('name' => 'birthdayeventtitle', 'vars' => array('name' => $display_name));
-    $event_title  = $rcmail->gettext($label, 'calendar');
-    $uid          = rcube_ldap::dn_encode('bday:' . $source . ':' . $contact'ID' . ':' . $birthyear);
-
-    $event = array(
-      'id'           => $uid,
-      'uid'          => $uid,
-      'calendar'     => self::BIRTHDAY_CALENDAR_ID,
-      'title'        => $event_title,
-      'description'  => '',
-      'allday'       => true,
-      'start'        => $bday,
-      'end'          => clone $bday,
-      'recurrence'   => array('FREQ' => 'YEARLY', 'INTERVAL' => 1),
-      'free_busy'    => 'free',
-      '_displayname' => $display_name,
-    );
-
-    return $event;
-  }
-
-  /**
-   * Store alarm dismissal for birtual birthay events
-   *
-   * @param  string  Event identifier
-   * @param  integer Suspend the alarm for this number of seconds
-   */
-  public function dismiss_birthday_alarm($event_id, $snooze = 0)
-  {
-    $rcmail = rcmail::get_instance();
-    $cache  = $rcmail->get_cache('calendar.birthdayalarms', 'db', 86400 * 30);
-    $cache->remove($event_id);
-
-    // compute new notification time or disable if not snoozed
-    $notifyat = $snooze > 0 ? time() + $snooze : null;
-    $cache->set($event_id, array('snooze' => $snooze, 'notifyat' => $notifyat));
-
-    return true;
-  }
-
-  /**
-   * Handler for user_delete plugin hook
-   *
-   * @param array Hash array with hook arguments
-   * @return array Return arguments for plugin hooks
-   */
-  public function user_delete($args)
-  {
-    // TO BE OVERRIDDEN
-    return $args;
-  }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/database/SQL/mysql.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/database/SQL/mysql.initial.sql Changed

@@ -8,8 +8,7 @@
  * @licence GNU AGPL
  * @copyright (c) 2010 Lazlo Westerhof - Netherlands
  * @copyright (c) 2014 Kolab Systems AG
- *
- **/
+ */
 
 CREATE TABLE IF NOT EXISTS `calendars` (
   `calendar_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -21,7 +20,7 @@
   INDEX `user_name_idx` (`user_id`, `name`),
   CONSTRAINT `fk_calendars_user_id` FOREIGN KEY (`user_id`)
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `events` (
   `event_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -55,7 +54,7 @@
   INDEX `calendar_notify_idx` (`calendar_id`,`notifyat`),
   CONSTRAINT `fk_events_calendar_id` FOREIGN KEY (`calendar_id`)
     REFERENCES `calendars`(`calendar_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `attachments` (
   `attachment_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -67,7 +66,7 @@
   PRIMARY KEY(`attachment_id`),
   CONSTRAINT `fk_attachments_event_id` FOREIGN KEY (`event_id`)
     REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `itipinvitations` (
   `token` VARCHAR(64) NOT NULL,
@@ -80,6 +79,6 @@
   INDEX `uid_idx` (`user_id`,`event_uid`),
   CONSTRAINT `fk_itipinvitations_user_id` FOREIGN KEY (`user_id`)
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-REPLACE INTO system (name, value) VALUES ('calendar-database-version', '2015022700');
+REPLACE INTO `system` (`name`, `value`) VALUES ('calendar-database-version', '2021102600');

iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/database/SQL/mysql/2021102600.sql Added

@@ -0,0 +1,24 @@
+-- changing table format and dropping foreign keys is needed for some versions of MySQL
+ALTER TABLE `calendars` DROP FOREIGN KEY `fk_calendars_user_id`;
+ALTER TABLE `events` DROP FOREIGN KEY`fk_events_calendar_id`;
+ALTER TABLE `attachments` DROP FOREIGN KEY`fk_attachments_event_id`;
+ALTER TABLE `itipinvitations` DROP FOREIGN KEY`fk_itipinvitations_user_id`;
+
+ALTER TABLE `calendars` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `events` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `attachments` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `itipinvitations` ROW_FORMAT=DYNAMIC;
+
+ALTER TABLE `calendars` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `events` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `attachments` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `itipinvitations` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+ALTER TABLE `calendars` ADD CONSTRAINT `fk_calendars_user_id` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `events` ADD CONSTRAINT `fk_events_calendar_id` FOREIGN KEY (`calendar_id`)
+    REFERENCES `calendars`(`calendar_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `attachments` ADD CONSTRAINT `fk_attachments_event_id` FOREIGN KEY (`event_id`)
+    REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `itipinvitations` ADD CONSTRAINT `fk_itipinvitations_user_id` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/database/SQL/postgres.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/database/SQL/postgres.initial.sql Changed

iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/database/SQL/postgres/2021102600.sql Added

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/database/SQL/sqlite.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/database/SQL/sqlite.initial.sql Changed

iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/database/SQL/sqlite/2021102600.sql Added

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/database/database_driver.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/database/database_driver.php Changed

@@ -136,7 +136,7 @@
             $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
             $id     = self::BIRTHDAY_CALENDAR_ID;
 
-            if (!$active || !in_array($id, $hidden)) {
+            if (empty($active) || !in_array($id, $hidden)) {
                 $calendars$id = array(
                     'id'         => $id,
                     'name'       => $this->cal->gettext('birthdays'),
@@ -172,7 +172,7 @@
             $this->rc->user->ID,
             $prop'name',
             strval($prop'color'),
-            $prop'showalarms' ? 1 : 0
+            !empty($prop'showalarms') ? 1 : 0
         );
 
         if ($result) {
@@ -321,24 +321,24 @@
             . " VALUES (?, $now, $now, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
             $event'calendar',
             strval($event'uid'),
-            intval($event'recurrence_id'),
-            strval($event'_instance'),
-            intval($event'isexception'),
+            isset($event'recurrence_id') ? intval($event'recurrence_id') : 0,
+            isset($event'_instance') ? strval($event'_instance') : '',
+            isset($event'isexception') ? intval($event'isexception') : 0,
             $event'start'->format(self::DB_DATE_FORMAT),
             $event'end'->format(self::DB_DATE_FORMAT),
             intval($event'all_day'),
             $event'_recurrence',
             strval($event'title'),
-            strval($event'description'),
-            strval($event'location'),
-            join(',', (array)$event'categories'),
-            strval($event'url'),
+            isset($event'description') ? strval($event'description') : '',
+            isset($event'location') ? strval($event'location') : '',
+            isset($event'categories') ? join(',', (array) $event'categories') : '',
+            isset($event'url') ? strval($event'url') : '',
             intval($event'free_busy'),
             intval($event'priority'),
             intval($event'sensitivity'),
-            strval($event'status'),
+            isset($event'status') ? strval($event'status') : '',
             $event'attendees',
-            $event'alarms',
+            isset($event'alarms') ? $event'alarms' : null,
             $event'notifyat'
         );
 
@@ -381,7 +381,7 @@
 
             // increment sequence number
             if (empty($event'sequence') && $reschedule) {
-                $event'sequence' = max($event'sequence', $old'sequence') + 1;
+                $event'sequence' = $old'sequence' + 1;
             }
 
             // modify a recurring event, check submitted savemode to do the right things
@@ -389,11 +389,12 @@
                 $master = $old'recurrence_id' ? $this->get_event(array('id' => $old'recurrence_id')) : $old;
 
                 // keep saved exceptions (not submitted by the client)
-                if ($old'recurrence''EXDATE') {
+                if (!empty($old'recurrence''EXDATE')) {
                     $event'recurrence''EXDATE' = $old'recurrence''EXDATE';
                 }
 
-                switch ($event'_savemode') {
+                $savemode = isset($event'_savemode') ? $event'_savemode' : null;
+                switch ($savemode) {
                 case 'new':
                     $event'uid' = $this->cal->generate_uid();
                     return $this->new_event($event);
@@ -582,10 +583,12 @@
 
         // iterate through the list of properties considered 'significant' for scheduling
         foreach (self::$scheduling_properties as $prop) {
-            $a = $old$prop;
-            $b = $event$prop;
+            $a = isset($old$prop) ? $old$prop : null;
+            $b = isset($event$prop) ? $event$prop : null;
 
-            if ($event'allday' && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
+            if (!empty($event'allday') && ($prop == 'start' || $prop == 'end')
+                && $a instanceof DateTime && $b instanceof DateTime
+            ) {
                 $a = $a->format('Y-m-d');
                 $b = $b->format('Y-m-d');
             }
@@ -596,10 +599,10 @@
                 $b = array_filter($b);
 
                 // advanced rrule comparison: no rescheduling if series was shortened
-                if ($a'COUNT' && $b'COUNT' && $b'COUNT' < $a'COUNT') {
+                if (!empty($a'COUNT') && !empty($b'COUNT') && $b'COUNT' < $a'COUNT') {
                     unset($a'COUNT', $b'COUNT');
                 }
-                else if ($a'UNTIL' && $b'UNTIL' && $b'UNTIL' < $a'UNTIL') {
+                else if (!empty($a'UNTIL') && !empty($b'UNTIL') && $b'UNTIL' < $a'UNTIL') {
                     unset($a'UNTIL', $b'UNTIL');
                 }
             }
@@ -652,24 +655,24 @@
         }
 
         // compose vcalendar-style recurrencue rule from structured data
-        $rrule = $event'recurrence' ? libcalendaring::to_rrule($event'recurrence') : '';
+        $rrule = !empty($event'recurrence') ? libcalendaring::to_rrule($event'recurrence') : '';
+
+        $sensitivity = strtolower($event'sensitivity');
+        $free_busy   = strtolower($event'free_busy');
 
         $event'_recurrence' = rtrim($rrule, ';');
-        $event'free_busy'   = intval($this->free_busy_mapstrtolower($event'free_busy'));
-        $event'sensitivity' = intval($this->sensitivity_mapstrtolower($event'sensitivity'));
+        $event'free_busy'   = isset($this->free_busy_map$free_busy) ? $this->free_busy_map$free_busy : null;
+        $event'sensitivity' = isset($this->sensitivity_map$sensitivity) ? $this->sensitivity_map$sensitivity : null;
+        $event'all_day'     = !empty($event'allday') ? 1 : 0;
 
         if ($event'free_busy' == 'tentative') {
             $event'status' = 'TENTATIVE';
         }
 
-        if (isset($event'allday')) {
-            $event'all_day' = $event'allday' ? 1 : 0;
-        }
-
         // compute absolute time to notify the user
         $event'notifyat' = $this->_get_notification($event);
 
-        if (is_array($event'valarms')) {
+        if (!empty($event'valarms')) {
             $event'alarms' = $this->serialize_alarms($event'valarms');
         }
 
@@ -689,7 +692,7 @@
      */
     private function _get_notification($event)
     {
-        if ($event'valarms' && $event'start' > new DateTime()) {
+        if (!empty($event'valarms') && $event'start' > new DateTime()) {
             $alarm = libcalendaring::get_next_alarm($event);
 
             if ($alarm'time' && in_array($alarm'action', $this->alarm_types)) {
@@ -714,26 +717,23 @@
         );
 
         foreach ($set_cols as $col) {
-            if (is_object($event$col) && is_a($event$col, 'DateTime')) {
+            if (!empty($event$col) && is_a($event$col, 'DateTime')) {
                 $sql_args$col = $event$col->format(self::DB_DATE_FORMAT);
             }
-            else if (is_array($event$col)) {
-                $sql_args$col = join(',', $event$col);
-            }
             else if (array_key_exists($col, $event)) {
-                $sql_args$col = $event$col;
+                $sql_args$col = is_array($event$col) ? join(',', $event$col) : $event$col;
             }
         }
 
-        if ($event'_recurrence') {
+        if (!empty($event'_recurrence')) {
             $sql_args'recurrence' = $event'_recurrence';
         }
 
-        if ($event'_instance') {
+        if (!empty($event'_instance')) {
             $sql_args'instance' = $event'_instance';
         }
 
-        if ($event'_fromcalendar' && $event'_fromcalendar' != $event'calendar') {
+        if (!empty($event'_fromcalendar') && $event'_fromcalendar' != $event'calendar') {
             $sql_args'calendar_id' = $event'calendar';
         }
 
@@ -763,7 +763,7 @@
         }
 
         // remove attachments
-        if ($success && !empty($event'deleted_attachments')) {
+        if ($success && !empty($event'deleted_attachments') && is_array($event'deleted_attachments')) {
             foreach ($event'deleted_attachments' as $attachment) {
                 $this->remove_attachment($attachment, $event'id');
             }
@@ -822,7 +822,7 @@
 
                 // skip exceptions
                 // TODO: merge updated data from master event
-                if ($exdata$datestr) {
+                if (!empty($exdata$datestr)) {
                     continue;
                 }
 
@@ -831,7 +831,7 @@
                 $next_end->add($duration);
 
                 $notify_at = $this->_get_notification(array(
-                        'alarms' => $event'alarms',
+                        'alarms' => !empty($event'alarms') ? $event'alarms' : null,
                         'start'  => $next_start,
                         'end'    => $next_end,
                         'status' => $event'status'
@@ -860,13 +860,13 @@
                 }
 
                 // stop adding events for inifinite recurrence after 20 years
-                if (++$count > 999 || (!$recurrence->recurEnd && !$recurrence->recurCount && $next_start->format('Y') > date('Y') + 20)) {
+                if (++$count > 999 || (empty($recurrence->recurEnd) && empty($recurrence->recurCount) && $next_start->format('Y') > date('Y') + 20)) {
                     break;
                 }
             }
 
             // remove all exceptions after recurrence end
-            if ($next_end && !empty($exceptions)) {
+            if (!empty($next_end) && !empty($exceptions)) {
                 $this->rc->db->query(
                     "DELETE FROM `{$this->db_events}`"
                     . " WHERE `recurrence_id` = ? AND `isexception` = 1 AND `start` > ?"
@@ -1025,11 +1025,11 @@
      */
     public function get_event($event, $scope = 0, $full = false)
     {
-        $id  = is_array($event) ? ($event'id' ?: $event'uid') : $event;
-        $cal = is_array($event) ? $event'calendar' : null;
+        $id  = is_array($event) ? (!empty($event'id') ? $event'id' : $event'uid') : $event;
+        $cal = is_array($event) && !empty($event'calendar') ? $event'calendar' : null;
         $col = is_array($event) && is_numeric($id) ? 'event_id' : 'uid';
 
-        if ($this->cache$id) {
+        if (!empty($this->cache$id)) {
             return $this->cache$id;
         }
 
@@ -1039,15 +1039,15 @@
         }
 
         $where_add = '';
-        if (is_array($event) && !$event'id' && !empty($event'_instance')) {
+        if (is_array($event) && empty($event'id') && !empty($event'_instance')) {
             $where_add = " AND e.instance = " . $this->rc->db->quote($event'_instance');
         }
 
         if ($scope & self::FILTER_ACTIVE) {
-            $calendars = $this->calendars;
-            foreach ($calendars as $idx => $cal) {
-                if (!$cal'active') {
-                    unset($calendars$idx);
+            $calendars = ;
+            foreach ($this->calendars as $idx => $cal) {
+                if (!empty($cal'active')) {
+                    $calendars = $idx;
                 }
             }
             $cals = join(',', $calendars);
@@ -1099,11 +1099,12 @@
 
         // compose (slow) SQL query for searching
         // FIXME: improve searching using a dedicated col and normalized values
+        $sql_add = '';
         if ($query) {
             foreach (array('title','location','description','categories','attendees') as $col) {
                 $sql_query = $this->rc->db->ilike($col, '%'.$query.'%');
             }
-            $sql_add = " AND (" . join(' OR ', $sql_query) . ")";
+            $sql_add .= " AND (" . join(' OR ', $sql_query) . ")";
         }
 
         if (!$virtual) {
@@ -1155,7 +1156,7 @@
 
         // add events from the address books birthday calendar
         if (in_array(self::BIRTHDAY_CALENDAR_ID, $calendars) && empty($query)) {
-            $events = array_merge($events, $this->load_birthday_events($start, $end, $search, $modifiedsince));
+            $events = array_merge($events, $this->load_birthday_events($start, $end, null, $modifiedsince));
         }
 
         return $events;
@@ -1229,7 +1230,7 @@
             }
         }
 
-        if ($event'_attachments' > 0) {
+        if (!empty($event'_attachments')) {
             $event'attachments' = (array)$this->list_attachments($event);
         }
 
@@ -1398,7 +1399,7 @@
                     . "SELECT `event_id` FROM `{$this->db_events}`"
                     . " WHERE `event_id` = ? AND `calendar_id` IN ({$this->calendar_ids}))",
                 $id,
-                $event'recurrence_id' ? $event'recurrence_id' : $event'id'
+                !empty($event'recurrence_id') ? $event'recurrence_id' : $event'id'
             );
 
             if ($result && ($arr = $this->rc->db->fetch_assoc($result))) {

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql Changed

@@ -1,7 +1,6 @@
 /**
  * Roundcube Calendar Kolab backend
  *
- * @version @package_version@
  * @author Thomas Bruederli
  * @licence GNU AGPL
  **/
@@ -14,7 +13,7 @@
   PRIMARY KEY(`alarm_id`,`user_id`),
   CONSTRAINT `fk_kolab_alarms_user_id` FOREIGN KEY (`user_id`)
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `itipinvitations` (
   `token` VARCHAR(64) NOT NULL,
@@ -27,6 +26,6 @@
   INDEX `uid_idx` (`event_uid`,`user_id`),
   CONSTRAINT `fk_itipinvitations_user_id` FOREIGN KEY (`user_id`)
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-REPLACE INTO system (name, value) VALUES ('calendar-kolab-version', '2014041700');
+REPLACE INTO `system` (`name`, `value`) VALUES ('calendar-kolab-version', '2021102600');

iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/kolab/SQL/mysql/2021102600.sql Added

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/kolab/SQL/sqlite.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/kolab/SQL/sqlite.initial.sql Changed

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_calendar.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

@@ -26,888 +26,933 @@
 
 class kolab_calendar extends kolab_storage_folder_api
 {
-  public $ready = false;
-  public $rights = 'lrs';
-  public $editable = false;
-  public $attachments = true;
-  public $alarms = false;
-  public $history = false;
-  public $subscriptions = true;
-  public $categories = array();
-  public $storage;
-
-  public $type = 'event';
-
-  protected $cal;
-  protected $events = array();
-  protected $search_fields = array('title', 'description', 'location', 'attendees', 'categories');
-
-  /**
-   * Factory method to instantiate a kolab_calendar object
-   *
-   * @param string  Calendar ID (encoded IMAP folder name)
-   * @param object  calendar plugin object
-   * @return object kolab_calendar instance
-   */
-  public static function factory($id, $calendar)
-  {
-    $imap = $calendar->rc->get_storage();
-    $imap_folder = kolab_storage::id_decode($id);
-    $info = $imap->folder_info($imap_folder, true);
-    if (empty($info) || $info'noselect' || strpos(kolab_storage::folder_type($imap_folder), 'event') !== 0) {
-      return new kolab_user_calendar($imap_folder, $calendar);
-    }
-    else {
-      return new kolab_calendar($imap_folder, $calendar);
-    }
-  }
-
-  /**
-   * Default constructor
-   */
-  public function __construct($imap_folder, $calendar)
-  {
-    $this->cal = $calendar;
-    $this->imap = $calendar->rc->get_storage();
-    $this->name = $imap_folder;
-
-    // ID is derrived from folder name
-    $this->id = kolab_storage::folder_id($this->name, true);
-    $old_id   = kolab_storage::folder_id($this->name, false);
-
-    // fetch objects from the given IMAP folder
-    $this->storage = kolab_storage::get_folder($this->name);
-    $this->ready = $this->storage && $this->storage->valid;
-
-    // Set writeable and alarms flags according to folder permissions
-    if ($this->ready) {
-      if ($this->storage->get_namespace() == 'personal') {
-        $this->editable = true;
-        $this->rights = 'lrswikxteav';
-        $this->alarms = true;
-      }
-      else {
-        $rights = $this->storage->get_myrights();
-        if ($rights && !PEAR::isError($rights)) {
-          $this->rights = $rights;
-          if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false)
-            $this->editable = strpos($rights, 'i');;
-        }
-      }
-      
-      // user-specific alarms settings win
-      $prefs = $this->cal->rc->config->get('kolab_calendars', array());
-      if (isset($prefs$this->id'showalarms'))
-        $this->alarms = $prefs$this->id'showalarms';
-      else if (isset($prefs$old_id'showalarms'))
-        $this->alarms = $prefs$old_id'showalarms';
-    }
+    public $ready         = false;
+    public $rights        = 'lrs';
+    public $editable      = false;
+    public $attachments   = true;
+    public $alarms        = false;
+    public $history       = false;
+    public $subscriptions = true;
+    public $categories    = ;
+    public $storage;
+
+    public $type = 'event';
+
+    protected $cal;
+    protected $events = ;
+    protected $search_fields = 'title', 'description', 'location', 'attendees', 'categories';
+
+    /**
+     * Factory method to instantiate a kolab_calendar object
+     *
+     * @param string  Calendar ID (encoded IMAP folder name)
+     * @param object  Calendar plugin object
+     *
+     * @return kolab_calendar Self instance
+     */
+    public static function factory($id, $calendar)
+    {
+        $imap = $calendar->rc->get_storage();
+        $imap_folder = kolab_storage::id_decode($id);
+        $info = $imap->folder_info($imap_folder, true);
+
+        if (
+            empty($info)
+            || !empty($info'noselect')
+            || strpos(kolab_storage::folder_type($imap_folder), 'event') !== 0
+        ) {
+            return new kolab_user_calendar($imap_folder, $calendar);
+        }
 
-    $this->default = $this->storage->default;
-    $this->subtype = $this->storage->subtype;
-  }
-
-
-  /**
-   * Getter for the IMAP folder name
-   *
-   * @return string Name of the IMAP folder
-   */
-  public function get_realname()
-  {
-    return $this->name;
-  }
-
-  /**
-   *
-   */
-  public function get_title()
-  {
-    return null;
-  }
-
-
-  /**
-   * Return color to display this calendar
-   */
-  public function get_color($default = null)
-  {
-    // color is defined in folder METADATA
-    if ($color = $this->storage->get_color()) {
-      return $color;
+        return new kolab_calendar($imap_folder, $calendar);
     }
 
-    // calendar color is stored in user prefs (temporary solution)
-    $prefs = $this->cal->rc->config->get('kolab_calendars', array());
-
-    if (!empty($prefs$this->id) && !empty($prefs$this->id'color'))
-      return $prefs$this->id'color';
-
-    return $default ?: 'cc0000';
-  }
-
-  /**
-   * Compose an URL for CalDAV access to this calendar (if configured)
-   */
-  public function get_caldav_url()
-  {
-    if ($template = $this->cal->rc->config->get('calendar_caldav_url', null)) {
-      return strtr($template, array(
-        '%h' => $_SERVER'HTTP_HOST',
-        '%u' => urlencode($this->cal->rc->get_user_name()),
-        '%i' => urlencode($this->storage->get_uid()),
-        '%n' => urlencode($this->name),
-      ));
-    }
+    /**
+     * Default constructor
+     */
+    public function __construct($imap_folder, $calendar)
+    {
+        $this->cal  = $calendar;
+        $this->imap = $calendar->rc->get_storage();
+        $this->name = $imap_folder;
 
-    return false;
-  }
+        // ID is derrived from folder name
+        $this->id = kolab_storage::folder_id($this->name, true);
+        $old_id   = kolab_storage::folder_id($this->name, false);
 
+        // fetch objects from the given IMAP folder
+        $this->storage = kolab_storage::get_folder($this->name);
+        $this->ready   = $this->storage && $this->storage->valid;
+
+        // Set writeable and alarms flags according to folder permissions
+        if ($this->ready) {
+            if ($this->storage->get_namespace() == 'personal') {
+                $this->editable = true;
+                $this->rights = 'lrswikxteav';
+                $this->alarms = true;
+            }
+            else {
+                $rights = $this->storage->get_myrights();
+                if ($rights && !PEAR::isError($rights)) {
+                    $this->rights = $rights;
+                    if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
+                        $this->editable = strpos($rights, 'i');;
+                    }
+                }
+            }
+
+            // user-specific alarms settings win
+            $prefs = $this->cal->rc->config->get('kolab_calendars', );
+            if (isset($prefs$this->id'showalarms')) {
+                $this->alarms = $prefs$this->id'showalarms';
+            }
+            else if (isset($prefs$old_id'showalarms')) {
+                $this->alarms = $prefs$old_id'showalarms';
+            }
+        }
 
-  /**
-   * Update properties of this calendar folder
-   *
-   * @see calendar_driver::edit_calendar()
-   */
-  public function update(&$prop)
-  {
-    $prop'oldname' = $this->get_realname();
-    $newfolder = kolab_storage::folder_update($prop);
+        $this->default = $this->storage->default;
+        $this->subtype = $this->storage->subtype;
+    }
 
-    if ($newfolder === false) {
-      $this->cal->last_error = $this->cal->gettext(kolab_storage::$last_error);
-      return false;
+    /**
+     * Getter for the IMAP folder name
+     *
+     * @return string Name of the IMAP folder
+     */
+    public function get_realname()
+    {
+        return $this->name;
     }
 
-    // create ID
-    return kolab_storage::folder_id($newfolder);
-  }
-
-  /**
-   * Getter for a single event object
-   */
-  public function get_event($id)
-  {
-    // remove our occurrence identifier if it's there
-    $master_id = preg_replace('/-\d{8}(T\d{6})?$/', '', $id);
-
-    // directly access storage object
-    if (!$this->events$id && $master_id == $id && ($record = $this->storage->get_object($id))) {
-      $this->events$id = $this->_to_driver_event($record, true);
+    /**
+     *
+     */
+    public function get_title()
+    {
+        return null;
     }
 
-    // maybe a recurring instance is requested
-    if (!$this->events$id && $master_id != $id) {
-      $instance_id = substr($id, strlen($master_id) + 1);
+    /**
+     * Return color to display this calendar
+     */
+    public function get_color($default = null)
+    {
+        // color is defined in folder METADATA
+        if ($color = $this->storage->get_color()) {
+            return $color;
+        }
 
-      if ($record = $this->storage->get_object($master_id)) {
-        $master = $this->_to_driver_event($record);
-      }
+        // calendar color is stored in user prefs (temporary solution)
+        $prefs = $this->cal->rc->config->get('kolab_calendars', );
 
-      if ($master) {
-        // check for match in top-level exceptions (aka loose single occurrences)
-        if ($master'_formatobj' && ($instance = $master'_formatobj'->get_instance($instance_id))) {
-          $this->events$id = $this->_to_driver_event($instance, false, true, $master);
+        if (!empty($prefs$this->id) && !empty($prefs$this->id'color')) {
+            return $prefs$this->id'color';
         }
-        // check for match on the first instance already
-        else if ($master'_instance' && $master'_instance' == $instance_id) {
-          $this->events$id = $master;
+
+        return $default ?: 'cc0000';
+    }
+
+    /**
+     * Compose an URL for CalDAV access to this calendar (if configured)
+     */
+    public function get_caldav_url()
+    {
+        if ($template = $this->cal->rc->config->get('calendar_caldav_url', null)) {
+            return strtr($template, 
+                    '%h' => $_SERVER'HTTP_HOST',
+                    '%u' => urlencode($this->cal->rc->get_user_name()),
+                    '%i' => urlencode($this->storage->get_uid()),
+                    '%n' => urlencode($this->name),
+            );
         }
-        else if (is_array($master'recurrence')) {
-          // For performance reasons we'll get only the specific instance
-          if (($date = substr($id, strlen($master_id) + 1, 8)) && strlen($date) == 8 && is_numeric($date)) {
-            $start_date = new DateTime($date . 'T000000', $master'start'->getTimezone());
-          }
 
-          $this->get_recurring_events($record, $start_date ?: $master'start', null, $id, 1);
+        return false;
+    }
+
+    /**
+     * Update properties of this calendar folder
+     *
+     * @see calendar_driver::edit_calendar()
+     */
+    public function update(&$prop)
+    {
+        $prop'oldname' = $this->get_realname();
+        $newfolder = kolab_storage::folder_update($prop);
+
+        if ($newfolder === false) {
+            $this->cal->last_error = $this->cal->gettext(kolab_storage::$last_error);
+            return false;
         }
-      }
+
+        // create ID
+        return kolab_storage::folder_id($newfolder);
     }
 
-    return $this->events$id;
-  }
+    /**
+     * Getter for a single event object
+     */
+    public function get_event($id)
+    {
+        // remove our occurrence identifier if it's there
+        $master_id = preg_replace('/-\d{8}(T\d{6})?$/', '', $id);
 
-  /**
-   * Get attachment body
-   * @see calendar_driver::get_attachment_body()
-   */
-  public function get_attachment_body($id, $event)
-  {
-    if (!$this->ready)
-        return false;
+        // directly access storage object
+        if (empty($this->events$id) && $master_id == $id && ($record = $this->storage->get_object($id))) {
+            $this->events$id = $this->_to_driver_event($record, true);
+        }
 
-    $data = $this->storage->get_attachment($event'id', $id);
+        // maybe a recurring instance is requested
+        if (empty($this->events$id) && $master_id != $id) {
+            $instance_id = substr($id, strlen($master_id) + 1);
+
+            if ($record = $this->storage->get_object($master_id)) {
+                $master = $this->_to_driver_event($record);
+            }
 
-    if ($data == null) {
-        // try again with master UID
-        $uid = preg_replace('/-\d+(T\d{6})?$/', '', $event'id');
-        if ($uid != $event'id') {
-            $data = $this->storage->get_attachment($uid, $id);
+            if ($master) {
+                // check for match in top-level exceptions (aka loose single occurrences)
+                if (!empty($master'_formatobj') && ($instance = $master'_formatobj'->get_instance($instance_id))) {
+                    $this->events$id = $this->_to_driver_event($instance, false, true, $master);
+                }
+                // check for match on the first instance already
+                else if (!empty($master'_instance') && $master'_instance' == $instance_id) {
+                    $this->events$id = $master;
+                }
+                else if (!empty($master'recurrence')) {
+                    $start_date = $master'start';
+                    // For performance reasons we'll get only the specific instance
+                    if (($date = substr($id, strlen($master_id) + 1, 8)) && strlen($date) == 8 && is_numeric($date)) {
+                        $start_date = new DateTime($date . 'T000000', $master'start'->getTimezone());
+                    }
+
+                    $this->get_recurring_events($record, $start_date, null, $id, 1);
+                }
+            }
         }
-    }
 
-    return $data;
-  }
-
-  /**
-   * @param  integer Event's new start (unix timestamp)
-   * @param  integer Event's new end (unix timestamp)
-   * @param  string  Search query (optional)
-   * @param  boolean Include virtual events (optional)
-   * @param  array   Additional parameters to query storage
-   * @param  array   Additional query to filter events
-   * @return array A list of event records
-   */
-  public function list_events($start, $end, $search = null, $virtual = 1, $query = array(), $filter_query = null)
-  {
-    // convert to DateTime for comparisons
-    // #5190: make the range a little bit wider
-    // to workaround possible timezone differences
-    try {
-      $start = new DateTime('@' . ($start - 12 * 3600));
-    }
-    catch (Exception $e) {
-      $start = new DateTime('@0');
-    }
-    try {
-      $end = new DateTime('@' . ($end + 12 * 3600));
-    }
-    catch (Exception $e) {
-      $end = new DateTime('today +10 years');
+        return $this->events$id;
     }
 
-    // get email addresses of the current user
-    $user_emails = $this->cal->get_user_emails();
+    /**
+     * Get attachment body
+     * @see calendar_driver::get_attachment_body()
+     */
+    public function get_attachment_body($id, $event)
+    {
+        if (!$this->ready) {
+            return false;
+        }
 
-    // query Kolab storage
-    $query = array('dtstart', '<=', $end);
-    $query = array('dtend',   '>=', $start);
+        $data = $this->storage->get_attachment($event'id', $id);
 
-    if (is_array($filter_query)) {
-      $query = array_merge($query, $filter_query);
-    }
+        if ($data == null) {
+            // try again with master UID
+            $uid = preg_replace('/-\d+(T\d{6})?$/', '', $event'id');
+            if ($uid != $event'id') {
+                $data = $this->storage->get_attachment($uid, $id);
+            }
+        }
 
-    if (!empty($search)) {
-        $search = mb_strtolower($search);
-        $words = rcube_utils::tokenize_string($search, 1);
-        foreach (rcube_utils::normalize_string($search, true) as $word) {
-            $query = array('words', 'LIKE', $word);
+        return $data;
+    }
+
+    /**
+     * @param  int    Event's new start (unix timestamp)
+     * @param  int    Event's new end (unix timestamp)
+     * @param  string Search query (optional)
+     * @param  bool   Include virtual events (optional)
+     * @param  array  Additional parameters to query storage
+     * @param  array  Additional query to filter events
+     *
+     * @return array A list of event records
+     */
+    public function list_events($start, $end, $search = null, $virtual = 1, $query = , $filter_query = null)
+    {
+        // convert to DateTime for comparisons
+        // #5190: make the range a little bit wider
+        // to workaround possible timezone differences
+        try {
+            $start = new DateTime('@' . ($start - 12 * 3600));
+        }
+        catch (Exception $e) {
+            $start = new DateTime('@0');
+        }
+        try {
+            $end = new DateTime('@' . ($end + 12 * 3600));
+        }
+        catch (Exception $e) {
+            $end = new DateTime('today +10 years');
         }
-    }
-    else {
-      $words = array();
-    }
 
-    // set partstat filter to skip pending and declined invitations
-    if (empty($filter_query) && $this->cal->rc->config->get('kolab_invitation_calendars')
-      && $this->get_namespace() != 'other'
-    ) {
-      $partstat_exclude = array('NEEDS-ACTION','DECLINED');
-    }
-    else {
-      $partstat_exclude = array();
-    }
+        // get email addresses of the current user
+        $user_emails = $this->cal->get_user_emails();
 
-    $events = array();
-    foreach ($this->storage->select($query) as $record) {
-      $event = $this->_to_driver_event($record, !$virtual, false);
-
-      // remember seen categories
-      if ($event'categories') {
-        $cat = is_array($event'categories') ? $event'categories'0 : $event'categories';
-        $this->categories$cat++;
-      }
-
-      // list events in requested time window
-      if ($event'start' <= $end && $event'end' >= $start) {
-        unset($event'_attendees');
-        $add = true;
-        // skip the first instance of a recurring event if listed in exdate
-        if ($virtual && !empty($event'recurrence''EXDATE')) {
-          $event_date = $event'start'->format('Ymd');
-          $event_tz   = $event'start'->getTimezone();
-
-          foreach ((array) $event'recurrence''EXDATE' as $exdate) {
-            $ex = clone $exdate;
-            $ex->setTimezone($event_tz);
-
-            if ($ex->format('Ymd') == $event_date) {
-              $add = false;
-              break;
-            }
-          }
-        }
-
-        // find and merge exception for the first instance
-        if ($virtual && !empty($event'recurrence') && is_array($event'recurrence''EXCEPTIONS')) {
-          foreach ($event'recurrence''EXCEPTIONS' as $exception) {
-            if ($event'_instance' == $exception'_instance') {
-              unset($exception'calendar', $exception'className', $exception'_folder_id');
-              // clone date objects from main event before adjusting them with exception data
-              if (is_object($event'start')) $event'start' = clone $record'start';
-              if (is_object($event'end'))   $event'end'   = clone $record'end';
-              kolab_driver::merge_exception_data($event, $exception);
-            }
-          }
-        }
-
-        if ($add)
-          $events = $event;
-      }
-
-      // resolve recurring events
-      if ($record'recurrence' && $virtual == 1) {
-        $events = array_merge($events, $this->get_recurring_events($record, $start, $end));
-      }
-      // add top-level exceptions (aka loose single occurrences)
-      else if (is_array($record'exceptions')) {
-        foreach ($record'exceptions' as $ex) {
-          $component = $this->_to_driver_event($ex, false, false, $record);
-          if ($component'start' <= $end && $component'end' >= $start) {
-            $events = $component;
-          }
-        }
-      }
-    }
+        // query Kolab storage
+        $query = 'dtstart', '<=', $end;
+        $query = 'dtend',   '>=', $start;
 
-    // post-filter all events by fulltext search and partstat values
-    $me = $this;
-    $events = array_filter($events, function($event) use ($words, $partstat_exclude, $user_emails, $me) {
-      // fulltext search
-      if (count($words)) {
-        $hits = 0;
-        foreach ($words as $word) {
-          $hits += $me->fulltext_match($event, $word, false);
+        if (is_array($filter_query)) {
+            $query = array_merge($query, $filter_query);
         }
-        if ($hits < count($words)) {
-          return false;
+
+        $words = ;
+        $partstat_exclude = ;
+        $events = ;
+
+        if (!empty($search)) {
+            $search = mb_strtolower($search);
+            $words  = rcube_utils::tokenize_string($search, 1);
+            foreach (rcube_utils::normalize_string($search, true) as $word) {
+                $query = 'words', 'LIKE', $word;
+            }
         }
-      }
 
-      // partstat filter
-      if (count($partstat_exclude) && is_array($event'attendees')) {
-        foreach ($event'attendees' as $attendee) {
-          if (in_array($attendee'email', $user_emails) && in_array($attendee'status', $partstat_exclude)) {
-            return false;
-          }
-        }
-      }
-
-      return true;
-    });
-
-    // Apply event-to-mail relations
-    $config = kolab_storage_config::get_instance();
-    $config->apply_links($events);
-
-    // avoid session race conditions that will loose temporary subscriptions
-    $this->cal->rc->session->nowrite = true;
-
-    return $events;
-  }
-
-  /**
-   * Get number of events in the given calendar
-   *
-   * @param  integer Date range start (unix timestamp)
-   * @param  integer Date range end (unix timestamp)
-   * @param  array   Additional query to filter events
-   *
-   * @return integer Count
-   */
-  public function count_events($start, $end = null, $filter_query = null)
-  {
-    // convert to DateTime for comparisons
-    try {
-      $start = new DateTime('@'.$start);
-    }
-    catch (Exception $e) {
-      $start = new DateTime('@0');
-    }
-    if ($end) {
-      try {
-        $end = new DateTime('@'.$end);
-      }
-      catch (Exception $e) {
-        $end = null;
-      }
-    }
+        // set partstat filter to skip pending and declined invitations
+        if (empty($filter_query)
+            && $this->cal->rc->config->get('kolab_invitation_calendars')
+            && $this->get_namespace() != 'other'
+        ) {
+            $partstat_exclude = 'NEEDS-ACTION', 'DECLINED';
+        }
 
-    // query Kolab storage
-    $query = array('dtend',   '>=', $start);
+        foreach ($this->storage->select($query) as $record) {
+            $event = $this->_to_driver_event($record, !$virtual, false);
 
-    if ($end)
-      $query = array('dtstart', '<=', $end);
+            // remember seen categories
+            if (!empty($event'categories')) {
+                $cat = is_array($event'categories') ? $event'categories'0 : $event'categories';
+                $this->categories$cat++;
+            }
 
-    // add query to exclude pending/declined invitations
-    if (empty($filter_query)) {
-      foreach ($this->cal->get_user_emails() as $email) {
-        $query = array('tags', '!=', 'x-partstat:' . $email . ':needs-action');
-        $query = array('tags', '!=', 'x-partstat:' . $email . ':declined');
-      }
-    }
-    else if (is_array($filter_query)) {
-      $query = array_merge($query, $filter_query);
-    }
+            // list events in requested time window
+            if ($event'start' <= $end && $event'end' >= $start) {
+                unset($event'_attendees');
+                $add = true;
+
+                // skip the first instance of a recurring event if listed in exdate
+                if ($virtual && !empty($event'recurrence''EXDATE')) {
+                    $event_date = $event'start'->format('Ymd');
+                    $event_tz   = $event'start'->getTimezone();
+
+                    foreach ((array) $event'recurrence''EXDATE' as $exdate) {
+                        $ex = clone $exdate;
+                        $ex->setTimezone($event_tz);
+
+                        if ($ex->format('Ymd') == $event_date) {
+                            $add = false;
+                            break;
+                        }
+                    }
+                }
+
+                // find and merge exception for the first instance
+                if ($virtual && !empty($event'recurrence') && !empty($event'recurrence''EXCEPTIONS')) {
+                    foreach ($event'recurrence''EXCEPTIONS' as $exception) {
+                        if ($event'_instance' == $exception'_instance') {
+                            unset($exception'calendar', $exception'className', $exception'_folder_id');
+                            // clone date objects from main event before adjusting them with exception data
+                            if (is_object($event'start')) {
+                                $event'start' = clone $record'start';
+                            }
+                            if (is_object($event'end')) {
+                                $event'end' = clone $record'end';
+                            }
+                            kolab_driver::merge_exception_data($event, $exception);
+                        }
+                    }
+                }
+
+                if ($add) {
+                    $events = $event;
+                }
+            }
 
-    // we rely the Kolab storage query (no post-filtering)
-    return $this->storage->count($query);
-  }
-
-  /**
-   * Create a new event record
-   *
-   * @see calendar_driver::new_event()
-   *
-   * @return mixed The created record ID on success, False on error
-   */
-  public function insert_event($event)
-  {
-    if (!is_array($event))
-      return false;
-
-    // email links are stored separately
-    $links = $event'links';
-    unset($event'links');
-
-    //generate new event from RC input
-    $object = $this->_from_driver_event($event);
-    $saved  = $this->storage->save($object, 'event');
-
-    if (!$saved) {
-      rcube::raise_error(array(
-        'code' => 600, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Error saving event object to Kolab server"),
-        true, false);
-      $saved = false;
-    }
-    else {
-      // save links in configuration.relation object
-      if ($this->save_links($event'uid', $links)) {
-        $object'links' = $links;
-      }
+            // resolve recurring events
+            if (!empty($record'recurrence') && $virtual == 1) {
+                $events = array_merge($events, $this->get_recurring_events($record, $start, $end));
+            }
+            // add top-level exceptions (aka loose single occurrences)
+            else if (!empty($record'exceptions')) {
+                foreach ($record'exceptions' as $ex) {
+                    $component = $this->_to_driver_event($ex, false, false, $record);
+                    if ($component'start' <= $end && $component'end' >= $start) {
+                        $events = $component;
+                    }
+                }
+            }
+        }
 
-      $this->events = array($event'uid' => $this->_to_driver_event($object, true));
-    }
+        // post-filter all events by fulltext search and partstat values
+        $me = $this;
+        $events = array_filter($events, function($event) use ($words, $partstat_exclude, $user_emails, $me) {
+            // fulltext search
+            if (count($words)) {
+                $hits = 0;
+                foreach ($words as $word) {
+                    $hits += $me->fulltext_match($event, $word, false);
+                }
+                if ($hits < count($words)) {
+                    return false;
+                }
+            }
 
-    return $saved;
-  }
-
-  /**
-   * Update a specific event record
-   *
-   * @see calendar_driver::new_event()
-   *
-   * @return boolean True on success, False on error
-   */
-  public function update_event($event, $exception_id = null)
-  {
-    $updated = false;
-    $old = $this->storage->get_object($event'uid' ?: $event'id');
-    if (!$old || PEAR::isError($old))
-      return false;
-
-    // email links are stored separately
-    $links = $event'links';
-    unset($event'links');
-
-    $object = $this->_from_driver_event($event, $old);
-    $saved  = $this->storage->save($object, 'event', $old'uid');
-
-    if (!$saved) {
-      rcube::raise_error(array(
-        'code' => 600, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Error saving event object to Kolab server"),
-        true, false);
-    }
-    else {
-      // save links in configuration.relation object
-      if ($this->save_links($event'uid', $links)) {
-        $object'links' = $links;
-      }
-
-      $updated = true;
-      $this->events = array($event'uid' => $this->_to_driver_event($object, true));
-
-      // refresh local cache with recurring instances
-      if ($exception_id) {
-        $this->get_recurring_events($object, $event'start', $event'end', $exception_id);
-      }
-    }
+            // partstat filter
+            if (count($partstat_exclude) && !empty($event'attendees')) {
+                foreach ($event'attendees' as $attendee) {
+                    if (
+                        in_array($attendee'email', $user_emails)
+                        && in_array($attendee'status', $partstat_exclude)
+                    ) {
+                        return false;
+                    }
+                }
+            }
 
-    return $updated;
-  }
-
-  /**
-   * Delete an event record
-   *
-   * @see calendar_driver::remove_event()
-   *
-   * @return boolean True on success, False on error
-   */
-  public function delete_event($event, $force = true)
-  {
-    $deleted = $this->storage->delete($event'uid' ?: $event'id', $force);
-
-    if (!$deleted) {
-      rcube::raise_error(array(
-          'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-          'message' => sprintf("Error deleting event object '%s' from Kolab server", $event'id')),
-        true, false);
-    }
+            return true;
+        });
+
+        // Apply event-to-mail relations
+        $config = kolab_storage_config::get_instance();
+        $config->apply_links($events);
+
+        // avoid session race conditions that will loose temporary subscriptions
+        $this->cal->rc->session->nowrite = true;
+
+        return $events;
+    }
+
+    /**
+     * Get number of events in the given calendar
+     *
+     * @param int   Date range start (unix timestamp)
+     * @param int   Date range end (unix timestamp)
+     * @param array Additional query to filter events
+     *
+     * @return int Count
+     */
+    public function count_events($start, $end = null, $filter_query = null)
+    {
+        // convert to DateTime for comparisons
+        try {
+            $start = new DateTime('@'.$start);
+        }
+        catch (Exception $e) {
+            $start = new DateTime('@0');
+        }
+        if ($end) {
+            try {
+                $end = new DateTime('@'.$end);
+            }
+            catch (Exception $e) {
+                $end = null;
+            }
+        }
 
-    return $deleted;
-  }
-
-  /**
-   * Restore deleted event record
-   *
-   * @see calendar_driver::undelete_event()
-   *
-   * @return boolean True on success, False on error
-   */
-  public function restore_event($event)
-  {
-    // Make sure this is not an instance identifier
-    $uid = preg_replace('/-\d{8}(T\d{6})?$/', '', $event'id');
-
-    if ($this->storage->undelete($uid)) {
-        return true;
-    }
-    else {
-        rcube::raise_error(array(
-          'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-          'message' => sprintf("Error undeleting the event object '%s' from the Kolab server", $event'id')),
-        true, false);
-    }
+        // query Kolab storage
+        $query = 'dtend',   '>=', $start;
 
-    return false;
-  }
-
-  /**
-   * Find messages linked with an event
-   */
-  protected function get_links($uid)
-  {
-    $storage = kolab_storage_config::get_instance();
-    return $storage->get_object_links($uid);
-  }
-
-  /**
-   *
-   */
-  protected function save_links($uid, $links)
-  {
-    $storage = kolab_storage_config::get_instance();
-    return $storage->save_object_links($uid, (array) $links);
-  }
-
-  /**
-   * Create instances of a recurring event
-   *
-   * @param array    $event    Hash array with event properties
-   * @param DateTime $start    Start date of the recurrence window
-   * @param DateTime $end      End date of the recurrence window
-   * @param string   $event_id ID of a specific recurring event instance
-   * @param int      $limit    Max. number of instances to return
-   *
-   * @return array List of recurring event instances
-   */
-  public function get_recurring_events($event, $start, $end = null, $event_id = null, $limit = null)
-  {
-    $object = $event'_formatobj';
-    if (!$object) {
-      $rec    = $this->storage->get_object($event'uid' ?: $event'id');
-      $object = $rec'_formatobj';
-    }
+        if ($end) {
+            $query = 'dtstart', '<=', $end;
+        }
 
-    if (!is_object($object))
-      return array();
+        // add query to exclude pending/declined invitations
+        if (empty($filter_query)) {
+            foreach ($this->cal->get_user_emails() as $email) {
+                $query = 'tags', '!=', 'x-partstat:' . $email . ':needs-action';
+                $query = 'tags', '!=', 'x-partstat:' . $email . ':declined';
+            }
+        }
+        else if (is_array($filter_query)) {
+            $query = array_merge($query, $filter_query);
+        }
 
-    // determine a reasonable end date if none given
-    if (!$end) {
-      $end = clone $event'start';
-      $end->add(new DateInterval('P100Y'));
+        // we rely the Kolab storage query (no post-filtering)
+        return $this->storage->count($query);
     }
 
-    // copy the recurrence rule from the master event (to be used in the UI)
-    $recurrence_rule = $event'recurrence';
-    unset($recurrence_rule'EXCEPTIONS', $recurrence_rule'EXDATE');
+    /**
+     * Create a new event record
+     *
+     * @see calendar_driver::new_event()
+     *
+     * @return array|false The created record ID on success, False on error
+     */
+    public function insert_event($event)
+    {
+        if (!is_array($event)) {
+            return false;
+        }
 
-    // read recurrence exceptions first
-    $events = array();
-    $exdata = array();
-    $futuredata = array();
-    $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+        // email links are stored separately
+        $links = !empty($event'links') ? $event'links' : ;
+        unset($event'links');
+
+        //generate new event from RC input
+        $object = $this->_from_driver_event($event);
+        $saved  = $this->storage->save($object, 'event');
+
+        if (!$saved) {
+            rcube::raise_error(
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Error saving event object to Kolab server"
+                ,
+                true, false
+            );
+            $saved = false;
+        }
+        else {
+            // save links in configuration.relation object
+            if ($this->save_links($event'uid', $links)) {
+                $object'links' = $links;
+            }
 
-    if (is_array($event'recurrence''EXCEPTIONS')) {
-      foreach ($event'recurrence''EXCEPTIONS' as $exception) {
-        if (!$exception'_instance')
-          $exception'_instance' = libcalendaring::recurrence_instance_identifier($exception, $event'allday');
+            $this->events = $event'uid' => $this->_to_driver_event($object, true);
+        }
+
+        return $saved;
+    }
 
-        $rec_event = $this->_to_driver_event($exception, false, false, $event);
-        $rec_event'id' = $event'uid' . '-' . $exception'_instance';
-        $rec_event'isexception' = 1;
+    /**
+     * Update a specific event record
+     *
+     * @see calendar_driver::new_event()
+     *
+     * @return bool True on success, False on error
+     */
+    public function update_event($event, $exception_id = null)
+    {
+        $updated = false;
+        $old = $this->storage->get_object(!empty($event'uid') ? $event'uid' : $event'id');
 
-        // found the specifically requested instance: register exception (single occurrence wins)
-        if ($rec_event'id' == $event_id && (!$this->events$event_id || $this->events$event_id'thisandfuture')) {
-          $rec_event'recurrence' = $recurrence_rule;
-          $rec_event'recurrence_id' = $event'uid';
-          $this->events$rec_event'id' = $rec_event;
+        if (!$old || PEAR::isError($old)) {
+            return false;
         }
 
-        // remember this exception's date
-        $exdate = substr($exception'_instance', 0, 8);
-        if (!$exdata$exdate || $exdata$exdate'thisandfuture') {
-          $exdata$exdate = $rec_event;
+        // email links are stored separately
+        $links = !empty($event'links') ? $event'links' : ;
+        unset($event'links');
+
+        $object = $this->_from_driver_event($event, $old);
+        $saved  = $this->storage->save($object, 'event', $old'uid');
+
+        if (!$saved) {
+            rcube::raise_error(
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Error saving event object to Kolab server"
+                ,
+                true, false
+            );
         }
-        if ($rec_event'thisandfuture') {
-          $futuredata$exdate = $rec_event;
+        else {
+            // save links in configuration.relation object
+            if ($this->save_links($event'uid', $links)) {
+                $object'links' = $links;
+            }
+
+            $updated = true;
+            $this->events = $event'uid' => $this->_to_driver_event($object, true);
+
+            // refresh local cache with recurring instances
+            if ($exception_id) {
+                $this->get_recurring_events($object, $event'start', $event'end', $exception_id);
+            }
         }
-      }
-    }
 
-    // found the specifically requested instance, exiting...
-    if ($event_id && !empty($this->events$event_id)) {
-      return array($this->events$event_id);
-    }
+        return $updated;
+    }
+
+    /**
+     * Delete an event record
+     *
+     * @see calendar_driver::remove_event()
+     *
+     * @return bool True on success, False on error
+     */
+    public function delete_event($event, $force = true)
+    {
+        $deleted = $this->storage->delete(!empty($event'uid') ? $event'uid' : $event'id', $force);
+
+        if (!$deleted) {
+            rcube::raise_error(
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => sprintf("Error deleting event object '%s' from Kolab server", $event'id')
+                ,
+                true, false
+            );
+        }
 
-    // Check first occurrence, it might have been moved
-    if ($first = $exdata$event'start'->format('Ymd')) {
-      // return it only if not already in the result, but in the requested period
-      if (!($event'start' <= $end && $event'end' >= $start)
-        && ($first'start' <= $end && $first'end' >= $start)
-      ) {
-          $events = $first;
-      }
+        return $deleted;
     }
 
-    if ($limit && count($events) >= $limit) {
-      return $events;
-    }
+    /**
+     * Restore deleted event record
+     *
+     * @see calendar_driver::undelete_event()
+     *
+     * @return bool True on success, False on error
+     */
+    public function restore_event($event)
+    {
+        // Make sure this is not an instance identifier
+        $uid = preg_replace('/-\d{8}(T\d{6})?$/', '', $event'id');
 
-    // use libkolab to compute recurring events
-    $recurrence = new kolab_date_recurrence($object);
+        if ($this->storage->undelete($uid)) {
+            return true;
+        }
 
-    $i = 0;
-    while ($next_event = $recurrence->next_instance()) {
-      $datestr     = $next_event'start'->format('Ymd');
-      $instance_id = $next_event'start'->format($recurrence_id_format);
+        rcube::raise_error(
+                'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                'message' => sprintf("Error undeleting the event object '%s' from the Kolab server", $event'id')
+            ,
+            true, false
+        );
 
-      // use this event data for future recurring instances
-      if ($futuredata$datestr)
-        $overlay_data = $futuredata$datestr;
+        return false;
+    }
 
-      $rec_id      = $event'uid' . '-' . $instance_id;
-      $exception   = $exdata$datestr ?: $overlay_data;
-      $event_start = $next_event'start';
-      $event_end   = $next_event'end';
+    /**
+     * Find messages linked with an event
+     */
+    protected function get_links($uid)
+    {
+        $storage = kolab_storage_config::get_instance();
+        return $storage->get_object_links($uid);
+    }
+
+    /**
+     *
+     */
+    protected function save_links($uid, $links)
+    {
+        $storage = kolab_storage_config::get_instance();
+        return $storage->save_object_links($uid, (array) $links);
+    }
+
+    /**
+     * Create instances of a recurring event
+     *
+     * @param array    $event    Hash array with event properties
+     * @param DateTime $start    Start date of the recurrence window
+     * @param DateTime $end      End date of the recurrence window
+     * @param string   $event_id ID of a specific recurring event instance
+     * @param int      $limit    Max. number of instances to return
+     *
+     * @return array List of recurring event instances
+     */
+    public function get_recurring_events($event, $start, $end = null, $event_id = null, $limit = null)
+    {
+        if (empty($event'_formatobj')) {
+            $rec    = $this->storage->get_object(!empty($event'uid') ? $event'uid' : $event'id');
+            $object = $rec'_formatobj';
+        }
+        else {
+            $object = $event'_formatobj';
+        }
 
-      // copy some event from exception to get proper start/end dates
-      if ($exception) {
-        $event_copy = $next_event;
-        kolab_driver::merge_exception_dates($event_copy, $exception);
-        $event_start = $event_copy'start';
-        $event_end   = $event_copy'end';
-      }
+        if (!is_object($object)) {
+            return ;
+        }
 
-      // add to output if in range
-      if (($event_start <= $end && $event_end >= $start) || ($event_id && $rec_id == $event_id)) {
-        $rec_event = $this->_to_driver_event($next_event, false, false, $event);
-        $rec_event'_instance' = $instance_id;
-        $rec_event'_count' = $i + 1;
+        // determine a reasonable end date if none given
+        if (!$end) {
+            $end = clone $event'start';
+            $end->add(new DateInterval('P100Y'));
+        }
 
-        if ($exception)  // copy data from exception
-          kolab_driver::merge_exception_data($rec_event, $exception);
+        // read recurrence exceptions first
+        $events = ;
+        $exdata = ;
+        $futuredata = ;
+        $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+
+        if (!empty($event'recurrence')) {
+            // copy the recurrence rule from the master event (to be used in the UI)
+            $recurrence_rule = $event'recurrence';
+            unset($recurrence_rule'EXCEPTIONS', $recurrence_rule'EXDATE');
+
+            if (!empty($event'recurrence''EXCEPTIONS')) {
+                foreach ($event'recurrence''EXCEPTIONS' as $exception) {
+                    if (empty($exception'_instance')) {
+                        $exception'_instance' = libcalendaring::recurrence_instance_identifier($exception, !empty($event'allday'));
+                    }
+
+                    $rec_event = $this->_to_driver_event($exception, false, false, $event);
+                    $rec_event'id' = $event'uid' . '-' . $exception'_instance';
+                    $rec_event'isexception' = 1;
+
+                    // found the specifically requested instance: register exception (single occurrence wins)
+                    if (
+                        $rec_event'id' == $event_id
+                        && (empty($this->events$event_id) || !empty($this->events$event_id'thisandfuture'))
+                    ) {
+                        $rec_event'recurrence' = $recurrence_rule;
+                        $rec_event'recurrence_id' = $event'uid';
+                        $this->events$rec_event'id' = $rec_event;
+                    }
+
+                    // remember this exception's date
+                    $exdate = substr($exception'_instance', 0, 8);
+                    if (empty($exdata$exdate) || !empty($exdata$exdate'thisandfuture')) {
+                        $exdata$exdate = $rec_event;
+                    }
+                    if (!empty($rec_event'thisandfuture')) {
+                        $futuredata$exdate = $rec_event;
+                    }
+                }
+            }
+        }
 
-        $rec_event'id' = $rec_id;
-        $rec_event'recurrence_id' = $event'uid';
-        $rec_event'recurrence' = $recurrence_rule;
-        unset($rec_event'_attendees');
-        $events = $rec_event;
+        // found the specifically requested instance, exiting...
+        if ($event_id && !empty($this->events$event_id)) {
+            return $this->events$event_id;
+        }
 
-        if ($rec_id == $event_id) {
-          $this->events$rec_id = $rec_event;
-          break;
+        // Check first occurrence, it might have been moved
+        if ($first = $exdata$event'start'->format('Ymd')) {
+            // return it only if not already in the result, but in the requested period
+            if (!($event'start' <= $end && $event'end' >= $start)
+                && ($first'start' <= $end && $first'end' >= $start)
+            ) {
+                $events = $first;
+            }
         }
 
         if ($limit && count($events) >= $limit) {
-          return $events;
+            return $events;
         }
-      }
-      else if ($next_event'start' > $end)  // stop loop if out of range
-        break;
 
-      // avoid endless recursion loops
-      if (++$i > 100000)
-          break;
-    }
+        // use libkolab to compute recurring events
+        $recurrence = new kolab_date_recurrence($object);
 
-    return $events;
-  }
+        $i = 0;
+        while ($next_event = $recurrence->next_instance()) {
+            $datestr     = $next_event'start'->format('Ymd');
+            $instance_id = $next_event'start'->format($recurrence_id_format);
 
-  /**
-   * Convert from Kolab_Format to internal representation
-   */
-  private function _to_driver_event($record, $noinst = false, $links = true, $master_event = null)
-  {
-    $record'calendar' = $this->id;
+            // use this event data for future recurring instances
+            if (!empty($futuredata$datestr)) {
+                $overlay_data = $futuredata$datestr;
+            }
 
-    // remove (possibly outdated) cached parameters
-    unset($record'_folder_id', $record'className');
+            $rec_id      = $event'uid' . '-' . $instance_id;
+            $exception   = !empty($exdata$datestr) ? $exdata$datestr : $overlay_data;
+            $event_start = $next_event'start';
+            $event_end   = $next_event'end';
+
+            // copy some event from exception to get proper start/end dates
+            if ($exception) {
+                $event_copy = $next_event;
+                kolab_driver::merge_exception_dates($event_copy, $exception);
+                $event_start = $event_copy'start';
+                $event_end   = $event_copy'end';
+            }
 
-    if ($links && !array_key_exists('links', $record)) {
-      $record'links' = $this->get_links($record'uid');
-    }
+            // add to output if in range
+            if (($event_start <= $end && $event_end >= $start) || ($event_id && $rec_id == $event_id)) {
+                $rec_event = $this->_to_driver_event($next_event, false, false, $event);
+                $rec_event'_instance' = $instance_id;
+                $rec_event'_count' = $i + 1;
+
+                if ($exception) {
+                    // copy data from exception
+                    kolab_driver::merge_exception_data($rec_event, $exception);
+                }
+
+                $rec_event'id' = $rec_id;
+                $rec_event'recurrence_id' = $event'uid';
+                $rec_event'recurrence' = $recurrence_rule;
+                unset($rec_event'_attendees');
+                $events = $rec_event;
+
+                if ($rec_id == $event_id) {
+                    $this->events$rec_id = $rec_event;
+                    break;
+                }
+
+                if ($limit && count($events) >= $limit) {
+                    return $events;
+                }
+            }
+            else if ($next_event'start' > $end) {
+                // stop loop if out of range
+                break;
+            }
 
-    $ns = $this->get_namespace();
+            // avoid endless recursion loops
+            if (++$i > 100000) {
+                break;
+            }
+        }
 
-    if ($ns == 'other') {
-      $record'className' = 'fc-event-ns-other';
+        return $events;
     }
 
-    if ($ns == 'other' || !$this->cal->rc->config->get('kolab_invitation_calendars')) {
-      $record = kolab_driver::add_partstat_class($record, array('NEEDS-ACTION', 'DECLINED'), $this->get_owner());
+    /**
+     * Convert from Kolab_Format to internal representation
+     */
+    private function _to_driver_event($record, $noinst = false, $links = true, $master_event = null)
+    {
+        $record'calendar' = $this->id;
 
-      // Modify invitation status class name, when invitation calendars are disabled
-      // we'll use opacity only for declined/needs-action events
-      $record'className' = str_replace('-invitation', '', $record'className');
-    }
+        // remove (possibly outdated) cached parameters
+        unset($record'_folder_id', $record'className');
 
-    // add instance identifier to first occurrence (master event)
-    $recurrence_id_format = libcalendaring::recurrence_id_format($master_event ? $master_event : $record);
-    if (!$noinst && $record'recurrence' && !$record'recurrence_id' && !$record'_instance') {
-      $record'_instance' = $record'start'->format($recurrence_id_format);
-    }
-    else if (is_a($record'recurrence_date', 'DateTime')) {
-      $record'_instance' = $record'recurrence_date'->format($recurrence_id_format);
-    }
+        if ($links && !array_key_exists('links', $record)) {
+            $record'links' = $this->get_links($record'uid');
+        }
 
-    // clean up exception data
-    if ($record'recurrence' && is_array($record'recurrence''EXCEPTIONS')) {
-      array_walk($record'recurrence''EXCEPTIONS', function(&$exception) {
-        unset($exception'_mailbox', $exception'_msguid', $exception'_formatobj', $exception'_attachments');
-      });
-    }
+        $ns = $this->get_namespace();
 
-    return $record;
-  }
-
-   /**
-   * Convert the given event record into a data structure that can be passed to Kolab_Storage backend for saving
-   * (opposite of self::_to_driver_event())
-   */
-  private function _from_driver_event($event, $old = array())
-  {
-    // set current user as ORGANIZER
-    if ($identity = $this->cal->rc->user->list_emails(true)) {
-      $event'attendees' = (array) $event'attendees';
-      $found = false;
-
-      // there can be only resources on attendees list (T1484)
-      // let's check the existence of an organizer
-      foreach ($event'attendees' as $attendee) {
-        if ($attendee'role' == 'ORGANIZER') {
-          $found = true;
-          break;
-        }
-      }
-
-      if (!$found) {
-        $event'attendees' = array('role' => 'ORGANIZER', 'name' => $identity'name', 'email' => $identity'email');
-      }
-
-      $event'_owner' = $identity'email';
-    }
+        if ($ns == 'other') {
+            $record'className' = 'fc-event-ns-other';
+        }
 
-    // remove EXDATE values if RDATE is given
-    if (!empty($event'recurrence''RDATE')) {
-      $event'recurrence''EXDATE' = array();
-    }
+        if ($ns == 'other' || !$this->cal->rc->config->get('kolab_invitation_calendars')) {
+            $record = kolab_driver::add_partstat_class($record, 'NEEDS-ACTION', 'DECLINED', $this->get_owner());
 
-    // remove recurrence information (e.g. EXDATES and EXCEPTIONS) entirely
-    if ($event'recurrence' && empty($event'recurrence''FREQ') && empty($event'recurrence''RDATE')) {
-      $event'recurrence' = array();
-    }
+            // Modify invitation status class name, when invitation calendars are disabled
+            // we'll use opacity only for declined/needs-action events
+            $record'className' = str_replace('-invitation', '', $record'className');
+        }
 
-    // keep 'comment' from initial itip invitation
-    if (!empty($old'comment')) {
-      $event'comment' = $old'comment';
-    }
+        // add instance identifier to first occurrence (master event)
+        $recurrence_id_format = libcalendaring::recurrence_id_format($master_event ? $master_event : $record);
+        if (!$noinst && !empty($record'recurrence') && empty($record'recurrence_id') && empty($record'_instance')) {
+            $record'_instance' = $record'start'->format($recurrence_id_format);
+        }
+        else if (isset($record'recurrence_date') && is_a($record'recurrence_date', 'DateTime')) {
+            $record'_instance' = $record'recurrence_date'->format($recurrence_id_format);
+        }
 
-    // remove some internal properties which should not be cached
-    $cleanup_fn = function(&$event) {
-      unset($event'_savemode', $event'_fromcalendar', $event'_identity', $event'_folder_id',
-        $event'calendar', $event'className', $event'recurrence_id',
-        $event'attachments', $event'deleted_attachments');
-    };
-
-    $cleanup_fn($event);
-
-    // clean up exception data
-    if (is_array($event'exceptions')) {
-      array_walk($event'exceptions', function(&$exception) use ($cleanup_fn) {
-        unset($exception'_mailbox', $exception'_msguid', $exception'_formatobj');
-        $cleanup_fn($exception);
-      });
-    }
+        // clean up exception data
+        if (!empty($record'recurrence') && !empty($record'recurrence''EXCEPTIONS')) {
+            array_walk($record'recurrence''EXCEPTIONS', function(&$exception) {
+                unset($exception'_mailbox', $exception'_msguid', $exception'_formatobj', $exception'_attachments');
+            });
+        }
 
-    // copy meta data (starting with _) from old object
-    foreach ((array)$old as $key => $val) {
-      if (!isset($event$key) && $key0 == '_')
-        $event$key = $val;
-    }
+        return $record;
+    }
+
+    /**
+     * Convert the given event record into a data structure that can be passed to Kolab_Storage backend for saving
+     * (opposite of self::_to_driver_event())
+     */
+    private function _from_driver_event($event, $old = )
+    {
+        // set current user as ORGANIZER
+        if ($identity = $this->cal->rc->user->list_emails(true)) {
+            $event'attendees' = !empty($event'attendees') ? $event'attendees' : ;
+            $found = false;
+
+            // there can be only resources on attendees list (T1484)
+            // let's check the existence of an organizer
+            foreach ($event'attendees' as $attendee) {
+                if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
+                    $found = true;
+                    break;
+                }
+            }
+
+            if (!$found) {
+                $event'attendees' = 'role' => 'ORGANIZER', 'name' => $identity'name', 'email' => $identity'email';
+            }
+
+            $event'_owner' = $identity'email';
+        }
+
+        // remove EXDATE values if RDATE is given
+        if (!empty($event'recurrence''RDATE')) {
+            $event'recurrence''EXDATE' = ;
+        }
+
+        // remove recurrence information (e.g. EXDATES and EXCEPTIONS) entirely
+        if (!empty($event'recurrence') && empty($event'recurrence''FREQ') && empty($event'recurrence''RDATE')) {
+            $event'recurrence' = ;
+        }
 
-    return $event;
-  }
-
-  /**
-   * Match the given word in the event contents
-   */
-  public function fulltext_match($event, $word, $recursive = true)
-  {
-    $hits = 0;
-    foreach ($this->search_fields as $col) {
-      $sval = is_array($event$col) ? self::_complex2string($event$col) : $event$col;
-      if (empty($sval))
-        continue;
-
-      // do a simple substring matching (to be improved)
-      $val = mb_strtolower($sval);
-      if (strpos($val, $word) !== false) {
-        $hits++;
-        break;
-      }
+        // keep 'comment' from initial itip invitation
+        if (!empty($old'comment')) {
+            $event'comment' = $old'comment';
+        }
+
+        // remove some internal properties which should not be cached
+        $cleanup_fn = function(&$event) {
+            unset($event'_savemode', $event'_fromcalendar', $event'_identity', $event'_folder_id',
+                $event'calendar', $event'className', $event'recurrence_id',
+                $event'attachments', $event'deleted_attachments');
+        };
+
+        $cleanup_fn($event);
+
+        // clean up exception data
+        if (!empty($event'exceptions')) {
+            array_walk($event'exceptions', function(&$exception) use ($cleanup_fn) {
+                unset($exception'_mailbox', $exception'_msguid', $exception'_formatobj');
+                $cleanup_fn($exception);
+            });
+        }
+
+        // copy meta data (starting with _) from old object
+        foreach ((array) $old as $key => $val) {
+            if (!isset($event$key) && $key0 == '_') {
+                $event$key = $val;
+            }
+        }
+
+        return $event;
     }
 
-    return $hits;
-  }
-
-  /**
-   * Convert a complex event attribute to a string value
-   */
-  private static function _complex2string($prop)
-  {
-      static $ignorekeys = array('role','status','rsvp');
-
-      $out = '';
-      if (is_array($prop)) {
-          foreach ($prop as $key => $val) {
-              if (is_numeric($key)) {
-                  $out .= self::_complex2string($val);
-              }
-              else if (!in_array($key, $ignorekeys)) {
-                $out .= $val . ' ';
-            }
-          }
-      }
-      else if (is_string($prop) || is_numeric($prop)) {
-          $out .= $prop . ' ';
-      }
-
-      return rtrim($out);
-  }
+    /**
+     * Match the given word in the event contents
+     */
+    public function fulltext_match($event, $word, $recursive = true)
+    {
+        $hits = 0;
+        foreach ($this->search_fields as $col) {
+            if (empty($event$col)) {
+                continue;
+            }
 
+            $sval = is_array($event$col) ? self::_complex2string($event$col) : $event$col;
+            if (empty($sval)) {
+                continue;
+            }
+
+            // do a simple substring matching (to be improved)
+            $val = mb_strtolower($sval);
+            if (strpos($val, $word) !== false) {
+                $hits++;
+                break;
+            }
+        }
+
+        return $hits;
+    }
+
+    /**
+     * Convert a complex event attribute to a string value
+     */
+    private static function _complex2string($prop)
+    {
+        static $ignorekeys = 'role', 'status', 'rsvp';
+
+        $out = '';
+        if (is_array($prop)) {
+            foreach ($prop as $key => $val) {
+                if (is_numeric($key)) {
+                    $out .= self::_complex2string($val);
+                }
+                else if (!in_array($key, $ignorekeys)) {
+                    $out .= $val . ' ';
+                }
+            }
+        }
+        else if (is_string($prop) || is_numeric($prop)) {
+            $out .= $prop . ' ';
+        }
+
+        return rtrim($out);
+    }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_driver.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -25,2409 +25,2621 @@
 
 class kolab_driver extends calendar_driver
 {
-  const INVITATIONS_CALENDAR_PENDING  = '--invitation--pending';
-  const INVITATIONS_CALENDAR_DECLINED = '--invitation--declined';
-
-  // features this backend supports
-  public $alarms = true;
-  public $attendees = true;
-  public $freebusy = true;
-  public $attachments = true;
-  public $undelete = true;
-  public $alarm_types = array('DISPLAY','AUDIO');
-  public $categoriesimmutable = true;
-
-  private $rc;
-  private $cal;
-  private $calendars;
-  private $has_writeable = false;
-  private $freebusy_trigger = false;
-  private $bonnie_api = false;
-
-  /**
-   * Default constructor
-   */
-  public function __construct($cal)
-  {
-    $cal->require_plugin('libkolab');
-
-    // load helper classes *after* libkolab has been loaded (#3248)
-    require_once(dirname(__FILE__) . '/kolab_calendar.php');
-    require_once(dirname(__FILE__) . '/kolab_user_calendar.php');
-    require_once(dirname(__FILE__) . '/kolab_invitation_calendar.php');
-
-    $this->cal = $cal;
-    $this->rc  = $cal->rc;
-
-    $this->cal->register_action('push-freebusy', array($this, 'push_freebusy'));
-    $this->cal->register_action('calendar-acl', array($this, 'calendar_acl'));
-
-    $this->freebusy_trigger = $this->rc->config->get('calendar_freebusy_trigger', false);
-
-    if (kolab_storage::$version == '2.0') {
-        $this->alarm_types = array('DISPLAY');
-        $this->alarm_absolute = false;
-    }
+    const INVITATIONS_CALENDAR_PENDING  = '--invitation--pending';
+    const INVITATIONS_CALENDAR_DECLINED = '--invitation--declined';
+
+    // features this backend supports
+    public $alarms              = true;
+    public $attendees           = true;
+    public $freebusy            = true;
+    public $attachments         = true;
+    public $undelete            = true;
+    public $alarm_types         = 'DISPLAY', 'AUDIO';
+    public $categoriesimmutable = true;
+
+    private $rc;
+    private $cal;
+    private $calendars;
+    private $has_writeable    = false;
+    private $freebusy_trigger = false;
+    private $bonnie_api       = false;
+
+    /**
+     * Default constructor
+     */
+    public function __construct($cal)
+    {
+        $cal->require_plugin('libkolab');
+
+        // load helper classes *after* libkolab has been loaded (#3248)
+        require_once(__DIR__ . '/kolab_calendar.php');
+        require_once(__DIR__ . '/kolab_user_calendar.php');
+        require_once(__DIR__ . '/kolab_invitation_calendar.php');
+
+        $this->cal = $cal;
+        $this->rc  = $cal->rc;
+
+        $this->cal->register_action('push-freebusy', $this, 'push_freebusy');
+        $this->cal->register_action('calendar-acl', $this, 'calendar_acl');
+
+        $this->freebusy_trigger = $this->rc->config->get('calendar_freebusy_trigger', false);
+
+        if (kolab_storage::$version == '2.0') {
+            $this->alarm_types    = 'DISPLAY';
+            $this->alarm_absolute = false;
+        }
 
-    // get configuration for the Bonnie API
-    $this->bonnie_api = libkolab::get_bonnie_api();
+        // get configuration for the Bonnie API
+        $this->bonnie_api = libkolab::get_bonnie_api();
 
-    // calendar uses fully encoded identifiers
-    kolab_storage::$encode_ids = true;
-  }
+        // calendar uses fully encoded identifiers
+        kolab_storage::$encode_ids = true;
+    }
 
+    /**
+     * Read available calendars from server
+     */
+    private function _read_calendars()
+    {
+        // already read sources
+        if (isset($this->calendars)) {
+            return $this->calendars;
+        }
 
-  /**
-   * Read available calendars from server
-   */
-  private function _read_calendars()
-  {
-    // already read sources
-    if (isset($this->calendars))
-      return $this->calendars;
+        // get all folders that have "event" type, sorted by namespace/name
+        $folders = kolab_storage::sort_folders(
+            kolab_storage::get_folders('event') + kolab_storage::get_user_folders('event', true)
+        );
 
-    // get all folders that have "event" type, sorted by namespace/name
-    $folders = kolab_storage::sort_folders(kolab_storage::get_folders('event') + kolab_storage::get_user_folders('event', true));
+        $this->calendars = ;
 
-    $this->calendars = array();
-    foreach ($folders as $folder) {
-      $calendar = $this->_to_calendar($folder);
-      if ($calendar->ready) {
-        $this->calendars$calendar->id = $calendar;
-        if ($calendar->editable) {
-          $this->has_writeable = true;
+        foreach ($folders as $folder) {
+            $calendar = $this->_to_calendar($folder);
+            if ($calendar->ready) {
+                $this->calendars$calendar->id = $calendar;
+                if ($calendar->editable) {
+                    $this->has_writeable = true;
+                }
+            }
         }
-      }
+
+        return $this->calendars;
     }
 
-    return $this->calendars;
-  }
+    /**
+     * Convert kolab_storage_folder into kolab_calendar
+     */
+    private function _to_calendar($folder)
+    {
+        if ($folder instanceof kolab_calendar) {
+            return $folder;
+        }
+
+        if ($folder instanceof kolab_storage_folder_user) {
+            $calendar = new kolab_user_calendar($folder, $this->cal);
+            $calendar->subscriptions = count($folder->children) > 0;
+        }
+        else {
+            $calendar = new kolab_calendar($folder->name, $this->cal);
+        }
 
-  /**
-   * Convert kolab_storage_folder into kolab_calendar
-   */
-  private function _to_calendar($folder)
-  {
-    if ($folder instanceof kolab_calendar) {
-      return $folder;
+        return $calendar;
     }
 
-    if ($folder instanceof kolab_storage_folder_user) {
-      $calendar = new kolab_user_calendar($folder, $this->cal);
-      $calendar->subscriptions = count($folder->children) > 0;
+    /**
+     * Get a list of available calendars from this source
+     *
+     * @param int    $filter Bitmask defining filter criterias
+     * @param object $tree   Reference to hierarchical folder tree object
+     *
+     * @return array List of calendars
+     */
+    public function list_calendars($filter = 0, &$tree = null)
+    {
+        $this->_read_calendars();
+
+        // attempt to create a default calendar for this user
+        if (!$this->has_writeable) {
+            if ($this->create_calendar('name' => 'Calendar', 'color' => 'cc0000')) {
+                unset($this->calendars);
+                $this->_read_calendars();
+            }
+        }
+
+        $delim     = $this->rc->get_storage()->get_hierarchy_delimiter();
+        $folders   = $this->filter_calendars($filter);
+        $calendars = ;
+
+        // include virtual folders for a full folder tree
+        if (!is_null($tree)) {
+            $folders = kolab_storage::folder_hierarchy($folders, $tree);
+        }
+
+        $parents = array_keys($this->calendars);
+
+        foreach ($folders as $id => $cal) {
+            $imap_path = explode($delim, $cal->name);
+
+            // find parent
+            do {
+                array_pop($imap_path);
+                $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
+            }
+            while (count($imap_path) > 1 && !in_array($parent_id, $parents));
+
+            // restore "real" parent ID
+            if ($parent_id && !in_array($parent_id, $parents)) {
+                $parent_id = kolab_storage::folder_id($cal->get_parent());
+            }
+
+            $parents = $cal->id;
+
+            if ($cal->virtual) {
+                $calendars$cal->id = 
+                    'id'       => $cal->id,
+                    'name'     => $cal->get_name(),
+                    'listname' => $cal->get_foldername(),
+                    'editname' => $cal->get_foldername(),
+                    'virtual'  => true,
+                    'editable' => false,
+                    'group'    => $cal->get_namespace(),
+                ;
+            }
+            else {
+                // additional folders may come from kolab_storage::folder_hierarchy() above
+                // make sure we deal with kolab_calendar instances
+                $cal = $this->_to_calendar($cal);
+                $this->calendars$cal->id = $cal;
+
+                $is_user = ($cal instanceof kolab_user_calendar);
+
+                $calendars$cal->id = 
+                    'id'        => $cal->id,
+                    'name'      => $cal->get_name(),
+                    'listname'  => $cal->get_foldername(),
+                    'editname'  => $cal->get_foldername(),
+                    'title'     => $cal->get_title(),
+                    'color'     => $cal->get_color(),
+                    'editable'  => $cal->editable,
+                    'group'     => $is_user ? 'other user' : $cal->get_namespace(),
+                    'active'    => $cal->is_active(),
+                    'owner'     => $cal->get_owner(),
+                    'removable' => !$cal->default,
+                ;
+
+                if (!$is_user) {
+                    $calendars$cal->id += 
+                        'default'    => $cal->default,
+                        'rights'     => $cal->rights,
+                        'showalarms' => $cal->alarms,
+                        'history'    => !empty($this->bonnie_api),
+                        'children'   => true,  // TODO: determine if that folder indeed has child folders
+                        'parent'     => $parent_id,
+                        'subtype'    => $cal->subtype,
+                        'caldavurl'  => $cal->get_caldav_url(),
+                    ;
+                }
+            }
+
+            if ($cal->subscriptions) {
+                $calendars$cal->id'subscribed' = $cal->is_subscribed();
+            }
+        }
+
+        // list virtual calendars showing invitations
+        if ($this->rc->config->get('kolab_invitation_calendars') && !($filter & self::FILTER_INSERTABLE)) {
+            foreach (self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED as $id) {
+                $cal = new kolab_invitation_calendar($id, $this->cal);
+                if (!($filter & self::FILTER_ACTIVE) || $cal->is_active()) {
+                    $calendars$id = 
+                        'id'         => $cal->id,
+                        'name'       => $cal->get_name(),
+                        'listname'   => $cal->get_name(),
+                        'editname'   => $cal->get_foldername(),
+                        'title'      => $cal->get_title(),
+                        'color'      => $cal->get_color(),
+                        'editable'   => $cal->editable,
+                        'rights'     => $cal->rights,
+                        'showalarms' => $cal->alarms,
+                        'history'    => !empty($this->bonnie_api),
+                        'group'      => 'x-invitations',
+                        'default'    => false,
+                        'active'     => $cal->is_active(),
+                        'owner'      => $cal->get_owner(),
+                        'children'   => false,
+                        'counts'     => $id == self::INVITATIONS_CALENDAR_PENDING,
+                    ;
+
+
+                    if (is_object($tree)) {
+                        $tree->children = $cal;
+                    }
+                }
+            }
+        }
+
+        // append the virtual birthdays calendar
+        if ($this->rc->config->get('calendar_contact_birthdays', false) && !($filter & self::FILTER_INSERTABLE)) {
+            $id    = self::BIRTHDAY_CALENDAR_ID;
+            $prefs = $this->rc->config->get('kolab_calendars', );  // read local prefs
+
+            if (!($filter & self::FILTER_ACTIVE) || !empty($prefs$id'active')) {
+                $calendars$id = 
+                    'id'         => $id,
+                    'name'       => $this->cal->gettext('birthdays'),
+                    'listname'   => $this->cal->gettext('birthdays'),
+                    'color'      => !empty($prefs$id'color') ? $prefs$id'color' : '87CEFA',
+                    'active'     => !empty($prefs$id'active'),
+                    'showalarms' => (bool) $this->rc->config->get('calendar_birthdays_alarm_type'),
+                    'group'      => 'x-birthdays',
+                    'editable'   => false,
+                    'default'    => false,
+                    'children'   => false,
+                    'history'    => false,
+                ;
+            }
+        }
+
+        return $calendars;
     }
-    else {
-      $calendar = new kolab_calendar($folder->name, $this->cal);
+
+    /**
+     * Get list of calendars according to specified filters
+     *
+     * @param int Bitmask defining restrictions. See FILTER_* constants for possible values.
+     *
+     * @return array List of calendars
+     */
+    protected function filter_calendars($filter)
+    {
+        $this->_read_calendars();
+
+        $calendars = ;
+
+        $plugin = $this->rc->plugins->exec_hook('calendar_list_filter', 
+            'list'      => $this->calendars,
+            'calendars' => $calendars,
+            'filter'    => $filter,
+        );
+
+        if ($plugin'abort') {
+            return $plugin'calendars';
+        }
+
+        $personal = $filter & self::FILTER_PERSONAL;
+        $shared   = $filter & self::FILTER_SHARED;
+
+        foreach ($this->calendars as $cal) {
+            if (!$cal->ready) {
+                continue;
+            }
+            if (($filter & self::FILTER_WRITEABLE) && !$cal->editable) {
+                continue;
+            }
+            if (($filter & self::FILTER_INSERTABLE) && !$cal->editable) {
+                continue;
+            }
+            if (($filter & self::FILTER_ACTIVE) && !$cal->is_active()) {
+                continue;
+            }
+            if (($filter & self::FILTER_PRIVATE) && $cal->subtype != 'private') {
+                continue;
+            }
+            if (($filter & self::FILTER_CONFIDENTIAL) && $cal->subtype != 'confidential') {
+                continue;
+            }
+            if ($personal || $shared) {
+                $ns = $cal->get_namespace();
+                if (!(($personal && $ns == 'personal') || ($shared && $ns == 'shared'))) {
+                    continue;
+                }
+            }
+
+            $calendars$cal->id = $cal;
+        }
+
+        return $calendars;
     }
 
-    return $calendar;
-  }
-
-  /**
-   * Get a list of available calendars from this source
-   *
-   * @param integer $filter Bitmask defining filter criterias
-   * @param object $tree   Reference to hierarchical folder tree object
-   *
-   * @return array List of calendars
-   */
-  public function list_calendars($filter = 0, &$tree = null)
-  {
-    $this->_read_calendars();
-
-    // attempt to create a default calendar for this user
-    if (!$this->has_writeable) {
-      if ($this->create_calendar(array('name' => 'Calendar', 'color' => 'cc0000'))) {
-        unset($this->calendars);
+    /**
+     * Get the kolab_calendar instance for the given calendar ID
+     *
+     * @param string Calendar identifier (encoded imap folder name)
+     *
+     * @return kolab_calendar Object nor null if calendar doesn't exist
+     */
+    public function get_calendar($id)
+    {
         $this->_read_calendars();
-      }
+
+        // create calendar object if necesary
+        if (empty($this->calendars$id)) {
+            if (in_array($id, self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED)) {
+                return new kolab_invitation_calendar($id, $this->cal);
+            }
+
+            // for unsubscribed calendar folders
+            if ($id !== self::BIRTHDAY_CALENDAR_ID) {
+                $calendar = kolab_calendar::factory($id, $this->cal);
+                if ($calendar->ready) {
+                    $this->calendars$calendar->id = $calendar;
+                }
+            }
+        }
+
+        return !empty($this->calendars$id) ? $this->calendars$id : null;
+    }
+
+    /**
+     * Create a new calendar assigned to the current user
+     *
+     * @param array Hash array with calendar properties
+     *    name: Calendar name
+     *   color: The color of the calendar
+     *
+     * @return mixed ID of the calendar on success, False on error
+     */
+    public function create_calendar($prop)
+    {
+        $prop'type'       = 'event';
+        $prop'active'     = true;
+        $prop'subscribed' = true;
+
+        $folder = kolab_storage::folder_update($prop);
+
+        if ($folder === false) {
+            $this->last_error = $this->cal->gettext(kolab_storage::$last_error);
+            return false;
+        }
+
+        // create ID
+        $id = kolab_storage::folder_id($folder);
+
+        // save color in user prefs (temp. solution)
+        $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+
+        if (isset($prop'color')) {
+            $prefs'kolab_calendars'$id'color' = $prop'color';
+        }
+
+        if (isset($prop'showalarms')) {
+            $prefs'kolab_calendars'$id'showalarms' = !empty($prop'showalarms');
+        }
+
+        if (!empty($prefs'kolab_calendars'$id)) {
+            $this->rc->user->save_prefs($prefs);
+        }
+
+        return $id;
     }
 
-    $delim     = $this->rc->get_storage()->get_hierarchy_delimiter();
-    $folders   = $this->filter_calendars($filter);
-    $calendars = array();
-
-    // include virtual folders for a full folder tree
-    if (!is_null($tree))
-      $folders = kolab_storage::folder_hierarchy($folders, $tree);
-
-    $parents = array_keys($this->calendars);
-
-    foreach ($folders as $id => $cal) {
-      $imap_path = explode($delim, $cal->name);
-
-      // find parent
-      do {
-        array_pop($imap_path);
-        $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
-      }
-      while (count($imap_path) > 1 && !in_array($parent_id, $parents));
-
-      // restore "real" parent ID
-      if ($parent_id && !in_array($parent_id, $parents)) {
-          $parent_id = kolab_storage::folder_id($cal->get_parent());
-      }
-
-      $parents = $cal->id;
-
-      if ($cal->virtual) {
-        $calendars$cal->id = array(
-          'id'       => $cal->id,
-          'name'     => $cal->get_name(),
-          'listname' => $cal->get_foldername(),
-          'editname' => $cal->get_foldername(),
-          'virtual'  => true,
-          'editable' => false,
-          'group'    => $cal->get_namespace(),
-        );
-      }
-      else {
-        // additional folders may come from kolab_storage::folder_hierarchy() above
-        // make sure we deal with kolab_calendar instances
-        $cal = $this->_to_calendar($cal);
-        $this->calendars$cal->id = $cal;
-
-        $is_user = ($cal instanceof kolab_user_calendar);
-
-        $calendars$cal->id = array(
-          'id'        => $cal->id,
-          'name'      => $cal->get_name(),
-          'listname'  => $cal->get_foldername(),
-          'editname'  => $cal->get_foldername(),
-          'title'     => $cal->get_title(),
-          'color'     => $cal->get_color(),
-          'editable'  => $cal->editable,
-          'group'     => $is_user ? 'other user' : $cal->get_namespace(),
-          'active'    => $cal->is_active(),
-          'owner'     => $cal->get_owner(),
-          'removable' => !$cal->default,
-        );
+    /**
+     * Update properties of an existing calendar
+     *
+     * @see calendar_driver::edit_calendar()
+     */
+    public function edit_calendar($prop)
+    {
+        if (!empty($prop'id') && ($cal = $this->get_calendar($prop'id'))) {
+            $id = $cal->update($prop);
+        }
+        else {
+            $id = $prop'id';
+        }
+
+        // fallback to local prefs
+        $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+        unset($prefs'kolab_calendars'$prop'id''color', $prefs'kolab_calendars'$prop'id''showalarms');
+
+        if (isset($prop'color')) {
+            $prefs'kolab_calendars'$id'color' = $prop'color';
+        }
+
+        if (isset($prop'showalarms') && $id == self::BIRTHDAY_CALENDAR_ID) {
+            $prefs'calendar_birthdays_alarm_type' = $prop'showalarms' ? $this->alarm_types0 : '';
+        }
+        else if (isset($prop'showalarms')) {
+            $prefs'kolab_calendars'$id'showalarms' = !empty($prop'showalarms');
+        }
+
+        if (!empty($prefs'kolab_calendars'$id)) {
+            $this->rc->user->save_prefs($prefs);
+        }
+
+        return true;
+    }
+
+    /**
+     * Set active/subscribed state of a calendar
+     *
+     * @see calendar_driver::subscribe_calendar()
+     */
+    public function subscribe_calendar($prop)
+    {
+        if (!empty($prop'id') && ($cal = $this->get_calendar($prop'id')) && !empty($cal->storage)) {
+            $ret = false;
+            if (isset($prop'permanent')) {
+                $ret |= $cal->storage->subscribe(intval($prop'permanent'));
+            }
+            if (isset($prop'active')) {
+                $ret |= $cal->storage->activate(intval($prop'active'));
+            }
+
+            // apply to child folders, too
+            if (!empty($prop'recursive')) {
+                foreach ((array) kolab_storage::list_folders($cal->storage->name, '*', 'event') as $subfolder) {
+                    if (isset($prop'permanent')) {
+                        if ($prop'permanent') {
+                            kolab_storage::folder_subscribe($subfolder);
+                        }
+                        else {
+                            kolab_storage::folder_unsubscribe($subfolder);
+                        }
+                    }
+
+                    if (isset($prop'active')) {
+                        if ($prop'active') {
+                            kolab_storage::folder_activate($subfolder);
+                        }
+                        else {
+                            kolab_storage::folder_deactivate($subfolder);
+                        }
+                    }
+                }
+            }
+            return $ret;
+        }
+        else {
+            // save state in local prefs
+            $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+            $prefs'kolab_calendars'$prop'id''active' = !empty($prop'active');
+            $this->rc->user->save_prefs($prefs);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Delete the given calendar with all its contents
+     *
+     * @see calendar_driver::delete_calendar()
+     */
+    public function delete_calendar($prop)
+    {
+        if (!empty($prop'id') && ($cal = $this->get_calendar($prop'id'))) {
+            $folder = $cal->get_realname();
+
+            // TODO: unsubscribe if no admin rights
+            if (kolab_storage::folder_delete($folder)) {
+                // remove color in user prefs (temp. solution)
+                $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+                unset($prefs'kolab_calendars'$prop'id');
+
+                $this->rc->user->save_prefs($prefs);
+                return true;
+            }
+            else {
+                $this->last_error = kolab_storage::$last_error;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Search for shared or otherwise not listed calendars the user has access
+     *
+     * @param string Search string
+     * @param string Section/source to search
+     *
+     * @return array List of calendars
+     */
+    public function search_calendars($query, $source)
+    {
+        if (!kolab_storage::setup()) {
+            return ;
+        }
+
+        $this->calendars = ;
+        $this->search_more_results = false;
+
+        // find unsubscribed IMAP folders that have "event" type
+        if ($source == 'folders') {
+            foreach ((array) kolab_storage::search_folders('event', $query, 'other') as $folder) {
+                $calendar = new kolab_calendar($folder->name, $this->cal);
+                $this->calendars$calendar->id = $calendar;
+            }
+        }
+        // find other user's virtual calendars
+        else if ($source == 'users') {
+            // we have slightly more space, so display twice the number
+            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;
+
+            foreach (kolab_storage::search_users($query, 0, , $limit, $count) as $user) {
+                $calendar = new kolab_user_calendar($user, $this->cal);
+                $this->calendars$calendar->id = $calendar;
+
+                // search for calendar folders shared by this user
+                foreach (kolab_storage::list_user_folders($user, 'event', false) as $foldername) {
+                    $cal = new kolab_calendar($foldername, $this->cal);
+                    $this->calendars$cal->id = $cal;
+                    $calendar->subscriptions = true;
+                }
+            }
+
+            if ($count > $limit) {
+                $this->search_more_results = true;
+            }
+        }
+
+        // don't list the birthday calendar
+        $this->rc->config->set('calendar_contact_birthdays', false);
+        $this->rc->config->set('kolab_invitation_calendars', false);
 
-        if (!$is_user) {
-          $calendars$cal->id += array(
-            'default'    => $cal->default,
-            'rights'     => $cal->rights,
-            'showalarms' => $cal->alarms,
-            'history'    => !empty($this->bonnie_api),
-            'children'   => true,  // TODO: determine if that folder indeed has child folders
-            'parent'     => $parent_id,
-            'subtype'    => $cal->subtype,
-            'caldavurl'  => $cal->get_caldav_url(),
-          );
-        }
-      }
-
-      if ($cal->subscriptions) {
-        $calendars$cal->id'subscribed' = $cal->is_subscribed();
-      }
+        return $this->list_calendars();
     }
 
-    // list virtual calendars showing invitations
-    if ($this->rc->config->get('kolab_invitation_calendars') && !($filter & self::FILTER_INSERTABLE)) {
-      foreach (array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED) as $id) {
-        $cal = new kolab_invitation_calendar($id, $this->cal);
-        if (!($filter & self::FILTER_ACTIVE) || $cal->is_active()) {
-          $calendars$id = array(
-            'id'       => $cal->id,
-            'name'     => $cal->get_name(),
-            'listname' => $cal->get_name(),
-            'editname' => $cal->get_foldername(),
-            'title'    => $cal->get_title(),
-            'color'    => $cal->get_color(),
-            'editable' => $cal->editable,
-            'rights'    => $cal->rights,
-            'showalarms' => $cal->alarms,
-            'history'  => !empty($this->bonnie_api),
-            'group'    => 'x-invitations',
-            'default'  => false,
-            'active'   => $cal->is_active(),
-            'owner'    => $cal->get_owner(),
-            'children' => false,
-          );
-
-          if ($id == self::INVITATIONS_CALENDAR_PENDING) {
-            $calendars$id'counts' = true;
-          }
-
-          if (is_object($tree)) {
-            $tree->children = $cal;
-          }
-        }
-      }
+    /**
+     * Fetch a single event
+     *
+     * @see calendar_driver::get_event()
+     * @return array Hash array with event properties, false if not found
+     */
+    public function get_event($event, $scope = 0, $full = false)
+    {
+        if (is_array($event)) {
+            $id  = !empty($event'id') ? $event'id' : $event'uid';
+            $cal = $event'calendar';
+
+            // we're looking for a recurring instance: expand the ID to our internal convention for recurring instances
+            if (empty($event'id') && !empty($event'_instance')) {
+                $id .= '-' . $event'_instance';
+            }
+        }
+        else {
+            $id = $event;
+        }
+
+        if (!empty($cal)) {
+            if ($storage = $this->get_calendar($cal)) {
+                $result = $storage->get_event($id);
+                return self::to_rcube_event($result);
+            }
+
+            // get event from the address books birthday calendar
+            if ($cal == self::BIRTHDAY_CALENDAR_ID) {
+                return $this->get_birthday_event($id);
+            }
+        }
+        // iterate over all calendar folders and search for the event ID
+        else {
+            foreach ($this->filter_calendars($scope) as $calendar) {
+                if ($result = $calendar->get_event($id)) {
+                    return self::to_rcube_event($result);
+                }
+            }
+        }
+
+        return false;
     }
 
-    // append the virtual birthdays calendar
-    if ($this->rc->config->get('calendar_contact_birthdays', false) && !($filter & self::FILTER_INSERTABLE)) {
-      $id = self::BIRTHDAY_CALENDAR_ID;
-      $prefs = $this->rc->config->get('kolab_calendars', array());  // read local prefs
-      if (!($filter & self::FILTER_ACTIVE) || $prefs$id'active') {
-        $calendars$id = array(
-          'id'         => $id,
-          'name'       => $this->cal->gettext('birthdays'),
-          'listname'   => $this->cal->gettext('birthdays'),
-          'color'      => $prefs$id'color' ?: '87CEFA',
-          'active'     => (bool)$prefs$id'active',
-          'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
-          'group'      => 'x-birthdays',
-          'editable'   => false,
-          'default'    => false,
-          'children'   => false,
-          'history'    => false,
+    /**
+     * Add a single event to the database
+     *
+     * @see calendar_driver::new_event()
+     */
+    public function new_event($event)
+    {
+        if (!$this->validate($event)) {
+            return false;
+        }
+
+        $event = self::from_rcube_event($event);
+
+        if (!$event'calendar') {
+            $this->_read_calendars();
+            $cal_ids = array_keys($this->calendars);
+            $event'calendar' = reset($cal_ids);
+        }
+
+        if ($storage = $this->get_calendar($event'calendar')) {
+            // if this is a recurrence instance, append as exception to an already existing object for this UID
+            if (!empty($event'recurrence_date') && ($master = $storage->get_event($event'uid'))) {
+                self::add_exception($master, $event);
+                $success = $storage->update_event($master);
+            }
+            else {
+                $success = $storage->insert_event($event);
+            }
+
+            if ($success && $this->freebusy_trigger) {
+                $this->rc->output->command('plugin.ping_url', 'action' => 'calendar/push-freebusy', 'source' => $storage->id);
+                $this->freebusy_trigger = false; // disable after first execution (#2355)
+            }
+
+            return $success;
+        }
+
+        return false;
+    }
+
+    /**
+     * Update an event entry with the given data
+     *
+     * @see calendar_driver::new_event()
+     * @return bool True on success, False on error
+     */
+    public function edit_event($event)
+    {
+        if (!($storage = $this->get_calendar($event'calendar'))) {
+            return false;
+        }
+
+        return $this->update_event(self::from_rcube_event($event, $storage->get_event($event'id')));
+    }
+
+    /**
+     * Extended event editing with possible changes to the argument
+     *
+     * @param array  Hash array with event properties
+     * @param string New participant status
+     * @param array  List of hash arrays with updated attendees
+     *
+     * @return bool True on success, False on error
+     */
+    public function edit_rsvp(&$event, $status, $attendees)
+    {
+        $update_event = $event;
+
+        // apply changes to master (and all exceptions)
+        if ($event'_savemode' == 'all' && !empty($event'recurrence_id')) {
+            if ($storage = $this->get_calendar($event'calendar')) {
+                $update_event = $storage->get_event($event'recurrence_id');
+                $update_event'_savemode' = $event'_savemode';
+                $update_event'id' = $update_event'uid';
+                unset($update_event'recurrence_id');
+                calendar::merge_attendee_data($update_event, $attendees);
+            }
+        }
+
+        if ($ret = $this->update_attendees($update_event, $attendees)) {
+            // replace with master event (for iTip reply)
+            $event = self::to_rcube_event($update_event);
+
+            // re-assign to the according (virtual) calendar
+            if ($this->rc->config->get('kolab_invitation_calendars')) {
+                if (strtoupper($status) == 'DECLINED') {
+                    $event'calendar' = self::INVITATIONS_CALENDAR_DECLINED;
+                }
+                else if (strtoupper($status) == 'NEEDS-ACTION') {
+                    $event'calendar' = self::INVITATIONS_CALENDAR_PENDING;
+                }
+                else if (!empty($event'_folder_id')) {
+                    $event'calendar' = $event'_folder_id';
+                }
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Update the participant status for the given attendees
+     *
+     * @see calendar_driver::update_attendees()
+     */
+    public function update_attendees(&$event, $attendees)
+    {
+        // for this-and-future updates, merge the updated attendees onto all exceptions in range
+        if (
+            ($event'_savemode' == 'future' && !empty($event'recurrence_id'))
+            || (!empty($event'recurrence') && empty($event'recurrence_id'))
+        ) {
+            if (!($storage = $this->get_calendar($event'calendar'))) {
+                return false;
+            }
+
+            // load master event
+            $master = !empty($event'recurrence_id') ? $storage->get_event($event'recurrence_id') : $event;
+
+            // apply attendee update to each existing exception
+            if (!empty($master'recurrence') && !empty($master'recurrence''EXCEPTIONS')) {
+                $saved = false;
+                foreach ($master'recurrence''EXCEPTIONS' as $i => $exception) {
+                    // merge the new event properties onto future exceptions
+                    if ($exception'_instance' >= strval($event'_instance')) {
+                        calendar::merge_attendee_data($master'recurrence''EXCEPTIONS'$i, $attendees);
+                    }
+                    // update a specific instance
+                    if ($exception'_instance' == $event'_instance' && $exception'thisandfuture') {
+                        $saved = true;
+                    }
+                }
+
+                // add the given event as new exception
+                if (!$saved && $event'id' != $master'id') {
+                    $event'thisandfuture' = true;
+                    $master'recurrence''EXCEPTIONS' = $event;
+                }
+
+                // set link to top-level exceptions
+                $master'exceptions' = &$master'recurrence''EXCEPTIONS';
+
+                return $this->update_event($master);
+            }
+        }
+
+        // just update the given event (instance)
+        return $this->update_event($event);
+    }
+
+    /**
+     * Move a single event
+     *
+     * @see calendar_driver::move_event()
+     * @return boolean True on success, False on error
+     */
+    public function move_event($event)
+    {
+        if (($storage = $this->get_calendar($event'calendar')) && ($ev = $storage->get_event($event'id'))) {
+            unset($ev'sequence');
+            self::clear_attandee_noreply($ev);
+
+            return $this->update_event($event + $ev);
+        }
+
+        return false;
+    }
+
+    /**
+     * Resize a single event
+     *
+     * @see calendar_driver::resize_event()
+     * @return boolean True on success, False on error
+     */
+    public function resize_event($event)
+    {
+        if (($storage = $this->get_calendar($event'calendar')) && ($ev = $storage->get_event($event'id'))) {
+            unset($ev'sequence');
+            self::clear_attandee_noreply($ev);
+
+            return $this->update_event($event + $ev);
+        }
+
+        return false;
+    }
+
+    /**
+     * Remove a single event
+     *
+     * @param array Hash array with event properties:
+     *      id: Event identifier
+     * @param bool  Remove record(s) irreversible (mark as deleted otherwise)
+     *
+     * @return bool True on success, False on error
+     */
+    public function remove_event($event, $force = true)
+    {
+        $ret      = true;
+        $success  = false;
+        $savemode = isset($event'_savemode') ? $event'_savemode' : null;
+
+        if (!$force) {
+            unset($event'attendees');
+            $this->rc->session->remove('calendar_event_undo');
+            $this->rc->session->remove('calendar_restore_event_data');
+            $sess_data = $event;
+        }
+
+        if (($storage = $this->get_calendar($event'calendar')) && ($event = $storage->get_event($event'id'))) {
+            $event'_savemode' = $savemode;
+            $decline  = $event'_decline';
+            $savemode = 'all';
+            $master   = $event;
+
+            // read master if deleting a recurring event
+            if (!empty($event'recurrence') || !empty($event'recurrence_id') || !empty($event'isexception')) {
+                $master = $storage->get_event($event'uid');
+
+                if (!empty($event'_savemode')) {
+                    $savemode = $event'_savemode';
+                }
+                else if (!empty($event'_instance') || !empty($event'isexception')) {
+                    $savemode = 'current';
+                }
+
+                // force 'current' mode for single occurrences stored as exception
+                if (empty($event'recurrence') && empty($event'recurrence_id') && !empty($event'isexception')) {
+                    $savemode = 'current';
+                }
+            }
+
+            // removing an exception instance
+            if ((!empty($event'recurrence_id') || !empty($event'isexception')) && !empty($master'exceptions')) {
+                foreach ($master'exceptions' as $i => $exception) {
+                    if ($exception'_instance' == $event'_instance') {
+                        unset($master'exceptions'$i);
+                        // set event date back to the actual occurrence
+                        if (!empty($exception'recurrence_date')) {
+                            $event'start' = $exception'recurrence_date';
+                        }
+                    }
+                }
+
+                if (!empty($master'recurrence')) {
+                    $master'recurrence''EXCEPTIONS' = &$master'exceptions';
+                }
+            }
+
+            switch ($savemode) {
+            case 'current':
+                $_SESSION'calendar_restore_event_data' = $master;
+
+                // remove the matching RDATE entry
+                if (!empty($master'recurrence''RDATE')) {
+                    foreach ($master'recurrence''RDATE' as $j => $rdate) {
+                        if ($rdate->format('Ymd') == $event'start'->format('Ymd')) {
+                            unset($master'recurrence''RDATE'$j);
+                            break;
+                        }
+                    }
+                }
+
+                // add exception to master event
+                $master'recurrence''EXDATE' = $event'start';
+
+                $success = $storage->update_event($master);
+                break;
+
+            case 'future':
+                $master'_instance' = libcalendaring::recurrence_instance_identifier($master);
+                if ($master'_instance' != $event'_instance') {
+                    $_SESSION'calendar_restore_event_data' = $master;
+
+                    // set until-date on master event
+                    $master'recurrence''UNTIL' = clone $event'start';
+                    $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
+                    unset($master'recurrence''COUNT');
+
+                    // if all future instances are deleted, remove recurrence rule entirely (bug #1677)
+                    if ($master'recurrence''UNTIL'->format('Ymd') == $master'start'->format('Ymd')) {
+                        $master'recurrence' = ;
+                    }
+                    // remove matching RDATE entries
+                    else if (!empty($master'recurrence''RDATE')) {
+                        foreach ($master'recurrence''RDATE' as $j => $rdate) {
+                            if ($rdate->format('Ymd') == $event'start'->format('Ymd')) {
+                                $master'recurrence''RDATE' = array_slice($master'recurrence''RDATE', 0, $j);
+                                break;
+                            }
+                        }
+                    }
+
+                    $success = $storage->update_event($master);
+                    $ret = $master'uid';
+                    break;
+                }
+
+            default:  // 'all' is default
+                // removing the master event with loose exceptions (not recurring though)
+                if (!empty($event'recurrence_date') && empty($master'recurrence') && !empty($master'exceptions')) {
+                    // make the first exception the new master
+                    $newmaster = array_shift($master'exceptions');
+                    $newmaster'exceptions'   = $master'exceptions';
+                    $newmaster'_attachments' = $master'_attachments';
+                    $newmaster'_mailbox'     = $master'_mailbox';
+                    $newmaster'_msguid'      = $master'_msguid';
+
+                    $success = $storage->update_event($newmaster);
+                }
+                else if ($decline && $this->rc->config->get('kolab_invitation_calendars')) {
+                    // don't delete but set PARTSTAT=DECLINED
+                    if ($this->cal->lib->set_partstat($master, 'DECLINED')) {
+                        $success = $storage->update_event($master);
+                    }
+                }
+
+                if (!$success) {
+                    $success = $storage->delete_event($master, $force);
+                }
+                break;
+            }
+        }
+
+        if ($success && !$force) {
+            if (!empty($master'_folder_id')) {
+                $sess_data'_folder_id' = $master'_folder_id';
+            }
+            $_SESSION'calendar_event_undo' = 'ts' => time(), 'data' => $sess_data;
+        }
+
+        if ($success && $this->freebusy_trigger) {
+            $this->rc->output->command('plugin.ping_url', 
+                    'action' => 'calendar/push-freebusy',
+                    // _folder_id may be set by invitations calendar
+                    'source' => !empty($master'_folder_id') ? $master'_folder_id' : $storage->id,
+            );
+        }
+
+        return $success ? $ret : false;
+    }
+
+    /**
+     * Restore a single deleted event
+     *
+     * @param array Hash array with event properties:
+     *                    id: Event identifier
+     *              calendar: Event calendar
+     *
+     * @return bool True on success, False on error
+     */
+    public function restore_event($event)
+    {
+        if ($storage = $this->get_calendar($event'calendar')) {
+            if (!empty($_SESSION'calendar_restore_event_data')) {
+                $success = $storage->update_event($event = $_SESSION'calendar_restore_event_data');
+            }
+            else {
+                $success = $storage->restore_event($event);
+            }
+
+            if ($success && $this->freebusy_trigger) {
+                $this->rc->output->command('plugin.ping_url', 
+                        'action' => 'calendar/push-freebusy',
+                        // _folder_id may be set by invitations calendar
+                        'source' => !empty($event'_folder_id') ? $event'_folder_id' : $storage->id,
+                );
+            }
+
+            return $success;
+        }
+
+        return false;
+    }
+
+    /**
+     * Wrapper to update an event object depending on the given savemode
+     */
+    private function update_event($event)
+    {
+        if (!($storage = $this->get_calendar($event'calendar'))) {
+            return false;
+        }
+
+        // move event to another folder/calendar
+        if (!empty($event'_fromcalendar') && $event'_fromcalendar' != $event'calendar') {
+            if (!($fromcalendar = $this->get_calendar($event'_fromcalendar'))) {
+                return false;
+            }
+
+            $old = $fromcalendar->get_event($event'id');
+
+            if ($event'_savemode' != 'new') {
+                if (!$fromcalendar->storage->move($old'uid', $storage->storage)) {
+                    return false;
+                }
+
+                $fromcalendar = $storage;
+            }
+        }
+        else {
+            $fromcalendar = $storage;
+        }
+
+        $success     = false;
+        $savemode    = 'all';
+        $attachments = ;
+        $old = $master = $storage->get_event($event'id');
+
+        if (!$old || empty($old'start')) {
+            rcube::raise_error(
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Failed to load event object to update: id=" . $event'id'
+                ,
+                true, false
+            );
+            return false;
+        }
+
+        // modify a recurring event, check submitted savemode to do the right things
+        if (!empty($old'recurrence') || !empty($old'recurrence_id') || !empty($old'isexception')) {
+            $master = $storage->get_event($old'uid');
+
+            if (!empty($event'_savemode')) {
+                $savemode = $event'_savemode';
+            }
+            else {
+                $savemode = (!empty($old'recurrence_id') || !empty($old'isexception')) ? 'current' : 'all';
+            }
+
+            // this-and-future on the first instance equals to 'all'
+            if ($savemode == 'future' && !empty($master'start')
+                && $old'_instance' == libcalendaring::recurrence_instance_identifier($master)
+            ) {
+                $savemode = 'all';
+            }
+            // force 'current' mode for single occurrences stored as exception
+            else if (empty($old'recurrence') && empty($old'recurrence_id') && !empty($old'isexception')) {
+                $savemode = 'current';
+            }
+
+            // Stick to the master timezone for all occurrences (Bifrost#T104637)
+            $master_tz = $master'start'->getTimezone();
+            $event_tz  = $event'start'->getTimezone();
+
+            if ($master_tz->getName() != $event_tz->getName()) {
+                $event'start'->setTimezone($master_tz);
+                $event'end'->setTimezone($master_tz);
+            }
+        }
+
+        // check if update affects scheduling and update attendee status accordingly
+        $reschedule = $this->check_scheduling($event, $old, true);
+
+        // keep saved exceptions (not submitted by the client)
+        if (!empty($old'recurrence''EXDATE') && !isset($event'recurrence''EXDATE')) {
+            $event'recurrence''EXDATE' = $old'recurrence''EXDATE';
+        }
+
+        if (isset($event'recurrence''EXCEPTIONS')) {
+            // exceptions already provided (e.g. from iCal import)
+            $with_exceptions = true;
+        }
+        else if (!empty($old'recurrence''EXCEPTIONS')) {
+            $event'recurrence''EXCEPTIONS' = $old'recurrence''EXCEPTIONS';
+        }
+        else if (!empty($old'exceptions')) {
+            $event'exceptions' = $old'exceptions';
+        }
+
+        // remove some internal properties which should not be saved
+        unset($event'_savemode', $event'_fromcalendar', $event'_identity', $event'_owner',
+            $event'_notify', $event'_method', $event'_sender', $event'_sender_utf', $event'_size'
         );
-      }
+
+        switch ($savemode) {
+        case 'new':
+            // save submitted data as new (non-recurring) event
+            $event'recurrence' = ;
+            $event'_copyfrom'  = $master'_msguid';
+            $event'_mailbox'   = $master'_mailbox';
+            $event'uid'        = $this->cal->generate_uid();
+
+            unset($event'recurrence_id', $event'recurrence_date', $event'_instance', $event'id');
+
+            // copy attachment metadata to new event
+            $event = self::from_rcube_event($event, $master);
+
+            self::clear_attandee_noreply($event);
+            if ($success = $storage->insert_event($event)) {
+                $success = $event'uid';
+            }
+            break;
+
+        case 'future':
+            // create a new recurring event
+            $event'_copyfrom' = $master'_msguid';
+            $event'_mailbox'  = $master'_mailbox';
+            $event'uid'       = $this->cal->generate_uid();
+
+            unset($event'recurrence_id', $event'recurrence_date', $event'_instance', $event'id');
+
+            // copy attachment metadata to new event
+            $event = self::from_rcube_event($event, $master);
+
+            // remove recurrence exceptions on re-scheduling
+            if ($reschedule) {
+                unset($event'recurrence''EXCEPTIONS', $event'exceptions', $master'recurrence''EXDATE');
+            }
+            else if (isset($event'recurrence''EXCEPTIONS') && is_array($event'recurrence''EXCEPTIONS')) {
+                // only keep relevant exceptions
+                $event'recurrence''EXCEPTIONS' = array_filter(
+                    $event'recurrence''EXCEPTIONS',
+                    function($exception) use ($event) {
+                        return $exception'start' > $event'start';
+                    }
+                );
+                if (isset($event'recurrence''EXDATE') && is_array($event'recurrence''EXDATE')) {
+                    $event'recurrence''EXDATE' = array_filter(
+                        $event'recurrence''EXDATE',
+                        function($exdate) use ($event) {
+                            return $exdate > $event'start';
+                        }
+                    );
+                }
+                // set link to top-level exceptions
+                $event'exceptions' = &$event'recurrence''EXCEPTIONS';
+            }
+
+            // compute remaining occurrences
+            if ($event'recurrence''COUNT') {
+                if (empty($old'_count')) {
+                    $old'_count' = $this->get_recurrence_count($master, $old'start');
+                }
+                $event'recurrence''COUNT' -= intval($old'_count');
+            }
+
+            // remove fixed weekday when date changed
+            if ($old'start'->format('Y-m-d') != $event'start'->format('Y-m-d')) {
+                if (!empty($event'recurrence''BYDAY') && strlen($event'recurrence''BYDAY') == 2) {
+                    unset($event'recurrence''BYDAY');
+                }
+                if (!empty($old'recurrence''BYMONTH') && $old'recurrence''BYMONTH' == $old'start'->format('n')) {
+                    unset($event'recurrence''BYMONTH');
+                }
+            }
+
+            // set until-date on master event
+            $master'recurrence''UNTIL' = clone $old'start';
+            $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
+            unset($master'recurrence''COUNT');
+
+            // remove all exceptions after $event'start'
+            if (isset($master'recurrence''EXCEPTIONS') && is_array($master'recurrence''EXCEPTIONS')) {
+                $master'recurrence''EXCEPTIONS' = array_filter(
+                    $master'recurrence''EXCEPTIONS',
+                    function($exception) use ($event) {
+                        return $exception'start' < $event'start';
+                    }
+                );
+                // set link to top-level exceptions
+                $master'exceptions' = &$master'recurrence''EXCEPTIONS';
+            }
+
+            if (isset($master'recurrence''EXDATE') && is_array($master'recurrence''EXDATE')) {
+                $master'recurrence''EXDATE' = array_filter(
+                    $master'recurrence''EXDATE',
+                    function($exdate) use ($event) {
+                        return $exdate < $event'start';
+                    }
+                );
+            }
+
+            // save new event
+            if ($success = $storage->insert_event($event)) {
+                $success = $event'uid';
+
+                // update master event (no rescheduling!)
+                self::clear_attandee_noreply($master);
+                $storage->update_event($master);
+            }
+            break;
+
+        case 'current':
+            // recurring instances shall not store recurrence rules and attachments
+            $event'recurrence'    = ;
+            $event'thisandfuture' = $savemode == 'future';
+            unset($event'attachments', $event'id');
+
+            // increment sequence of this instance if scheduling is affected
+            if ($reschedule) {
+                $event'sequence' = max($old'sequence', $master'sequence') + 1;
+            }
+            else if (!isset($event'sequence')) {
+                $event'sequence' = !empty($old'sequence') ? $old'sequence' : $master'sequence';
+            }
+
+            // save properties to a recurrence exception instance
+            if (!empty($old'_instance') && isset($master'recurrence''EXCEPTIONS')) {
+                if ($this->update_recurrence_exceptions($master, $event, $old, $savemode)) {
+                    $success = $storage->update_event($master, $old'id');
+                    break;
+                }
+            }
+
+            $add_exception = true;
+
+            // adjust matching RDATE entry if dates changed
+            if (
+                !empty($master'recurrence''RDATE')
+                && ($old_date = $old'start'->format('Ymd')) != $event'start'->format('Ymd')
+            ) {
+                foreach ($master'recurrence''RDATE' as $j => $rdate) {
+                    if ($rdate->format('Ymd') == $old_date) {
+                        $master'recurrence''RDATE'$j = $event'start';
+                        sort($master'recurrence''RDATE');
+                        $add_exception = false;
+                        break;
+                    }
+                }
+            }
+
+            // save as new exception to master event
+            if ($add_exception) {
+                self::add_exception($master, $event, $old);
+            }
+
+            $success = $storage->update_event($master);
+            break;
+
+        default:  // 'all' is the default
+            $event'id'  = $master'uid';
+            $event'uid' = $master'uid';
+
+            // use start date from master but try to be smart on time or duration changes
+            $old_start_date = $old'start'->format('Y-m-d');
+            $old_start_time = !empty($old'allday') ? '' : $old'start'->format('H:i');
+            $old_duration   = self::event_duration($old'start', $old'end', !empty($old'allday'));
+
+            $new_start_date = $event'start'->format('Y-m-d');
+            $new_start_time = !empty($event'allday') ? '' : $event'start'->format('H:i');
+            $new_duration   = self::event_duration($event'start', $event'end', !empty($event'allday'));
+
+            $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
+            $date_shift = $old'start'->diff($event'start');
+
+            // shifted or resized
+            if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
+                $event'start' = $master'start'->add($date_shift);
+                $event'end' = clone $event'start';
+                $event'end'->add(new DateInterval($new_duration));
+
+                // remove fixed weekday, will be re-set to the new weekday in kolab_calendar::update_event()
+                if ($old_start_date != $new_start_date && !empty($event'recurrence')) {
+                    if (!empty($event'recurrence''BYDAY') && strlen($event'recurrence''BYDAY') == 2)
+                        unset($event'recurrence''BYDAY');
+                    if (!empty($old'recurrence''BYMONTH') && $old'recurrence''BYMONTH' == $old'start'->format('n'))
+                        unset($event'recurrence''BYMONTH');
+                }
+            }
+            // dates did not change, use the ones from master
+            else if ($new_start_date . $new_start_time == $old_start_date . $old_start_time) {
+                $event'start' = $master'start';
+                $event'end' = $master'end';
+            }
+
+            // when saving an instance in 'all' mode, copy recurrence exceptions over
+            if (!empty($old'recurrence_id')) {
+                $event'recurrence''EXCEPTIONS' = $master'recurrence''EXCEPTIONS';
+                $event'recurrence''EXDATE'     = $master'recurrence''EXDATE';
+            }
+            else if (!empty($master'_instance')) {
+                $event'_instance'       = $master'_instance';
+                $event'recurrence_date' = $master'recurrence_date';
+            }
+
+            // TODO: forward changes to exceptions (which do not yet have differing values stored)
+            if (!empty($event'recurrence') && !empty($event'recurrence''EXCEPTIONS') && !$with_exceptions) {
+                // determine added and removed attendees
+                $old_attendees = $current_attendees = $added_attendees = ;
+
+                if (!empty($old'attendees')) {
+                    foreach ((array) $old'attendees' as $attendee) {
+                        $old_attendees = $attendee'email';
+                    }
+                }
+
+                if (!empty($event'attendees')) {
+                    foreach ((array) $event'attendees' as $attendee) {
+                        $current_attendees = $attendee'email';
+                        if (!in_array($attendee'email', $old_attendees)) {
+                            $added_attendees = $attendee;
+                        }
+                    }
+                }
+
+                $removed_attendees = array_diff($old_attendees, $current_attendees);
+
+                foreach ($event'recurrence''EXCEPTIONS' as $i => $exception) {
+                    calendar::merge_attendee_data($event'recurrence''EXCEPTIONS'$i, $added_attendees, $removed_attendees);
+                }
+
+                // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
+                if ($old_start_date != $new_start_date || $old_start_time != $new_start_time) {
+                    $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+
+                    foreach ($event'recurrence''EXCEPTIONS' as $i => $exception) {
+                        if (isset($exception'recurrence_date') && is_a($exception'recurrence_date', 'DateTime')) {
+                            $recurrence_id = $exception'recurrence_date';
+                        }
+                        else {
+                            $recurrence_id = rcube_utils::anytodatetime($exception'_instance', $old'start'->getTimezone());
+                        }
+
+                        if ($recurrence_id instanceof DateTime) {
+                            $recurrence_id->add($date_shift);
+                            $event'recurrence''EXCEPTIONS'$i'recurrence_date' = $recurrence_id;
+                            $event'recurrence''EXCEPTIONS'$i'_instance' = $recurrence_id->format($recurrence_id_format);
+                        }
+                    }
+                }
+
+                // set link to top-level exceptions
+                $event'exceptions' = &$event'recurrence''EXCEPTIONS';
+            }
+
+            // unset _dateonly flags in (cached) date objects
+            unset($event'start'->_dateonly, $event'end'->_dateonly);
+
+            $success = $storage->update_event($event) ? $event'id' : false;  // return master UID
+            break;
+        }
+
+        if ($success && $this->freebusy_trigger) {
+            $this->rc->output->command('plugin.ping_url', 
+                    'action' => 'calendar/push-freebusy',
+                    'source' => $storage->id
+            );
+        }
+
+        return $success;
     }
 
-    return $calendars;
-  }
-
-  /**
-   * Get list of calendars according to specified filters
-   *
-   * @param integer Bitmask defining restrictions. See FILTER_* constants for possible values.
-   *
-   * @return array List of calendars
-   */
-  protected function filter_calendars($filter)
-  {
-    $this->_read_calendars();
-
-    $calendars = array();
-
-    $plugin = $this->rc->plugins->exec_hook('calendar_list_filter', array(
-      'list'      => $this->calendars,
-      'calendars' => $calendars,
-      'filter'    => $filter,
-    ));
-
-    if ($plugin'abort') {
-      return $plugin'calendars';
+    /**
+     * Calculate event duration, returns string in DateInterval format
+     */
+    protected static function event_duration($start, $end, $allday = false)
+    {
+        if ($allday) {
+            $diff = $start->diff($end);
+            return 'P' . $diff->days . 'D';
+        }
+
+        return 'PT' . ($end->format('U') - $start->format('U')) . 'S';
     }
 
-    $personal = $filter & self::FILTER_PERSONAL;
-    $shared   = $filter & self::FILTER_SHARED;
-
-    foreach ($this->calendars as $cal) {
-      if (!$cal->ready) {
-        continue;
-      }
-      if (($filter & self::FILTER_WRITEABLE) && !$cal->editable) {
-        continue;
-      }
-      if (($filter & self::FILTER_INSERTABLE) && !$cal->editable) {
-        continue;
-      }
-      if (($filter & self::FILTER_ACTIVE) && !$cal->is_active()) {
-        continue;
-      }
-      if (($filter & self::FILTER_PRIVATE) && $cal->subtype != 'private') {
-        continue;
-      }
-      if (($filter & self::FILTER_CONFIDENTIAL) && $cal->subtype != 'confidential') {
-        continue;
-      }
-      if ($personal || $shared) {
-        $ns = $cal->get_namespace();
-        if (!(($personal && $ns == 'personal') || ($shared && $ns == 'shared'))) {
-          continue;
-        }
-      }
-
-      $calendars$cal->id = $cal;
+    /**
+     * Determine whether the current change affects scheduling and reset attendee status accordingly
+     */
+    public function check_scheduling(&$event, $old, $update = true)
+    {
+        // skip this check when importing iCal/iTip events
+        if (isset($event'sequence') || !empty($event'_method')) {
+            return false;
+        }
+
+        // iterate through the list of properties considered 'significant' for scheduling
+        $kolab_event = !empty($old'_formatobj') ? $old'_formatobj' : new kolab_format_event();
+        $reschedule  = $kolab_event->check_rescheduling($event, $old);
+
+        // reset all attendee status to needs-action (#4360)
+        if ($update && $reschedule && !empty($event'attendees')) {
+            $is_organizer = false;
+            $emails       = $this->cal->get_user_emails();
+            $attendees    = $event'attendees';
+
+            foreach ($attendees as $i => $attendee) {
+                if ($attendee'role' == 'ORGANIZER'
+                    && !empty($attendee'email')
+                    && in_array(strtolower($attendee'email'), $emails)
+                ) {
+                    $is_organizer = true;
+                }
+                else if ($attendee'role' != 'ORGANIZER'
+                    && $attendee'role' != 'NON-PARTICIPANT'
+                    && $attendee'status' != 'DELEGATED'
+                ) {
+                    $attendees$i'status' = 'NEEDS-ACTION';
+                    $attendees$i'rsvp' = true;
+                }
+            }
+
+            // update attendees only if I'm the organizer
+            if ($is_organizer || (!empty($event'organizer') && in_array(strtolower($event'organizer''email'), $emails))) {
+                $event'attendees' = $attendees;
+            }
+        }
+
+        return $reschedule;
     }
 
-    return $calendars;
-  }
-
-  /**
-   * Get the kolab_calendar instance for the given calendar ID
-   *
-   * @param string Calendar identifier (encoded imap folder name)
-   *
-   * @return object kolab_calendar Object nor null if calendar doesn't exist
-   */
-  public function get_calendar($id)
-  {
-    $this->_read_calendars();
-
-    // create calendar object if necesary
-    if (!$this->calendars$id) {
-      if (in_array($id, array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED))) {
-        return new kolab_invitation_calendar($id, $this->cal);
-      }
-      // for unsubscribed calendar folders
-      if ($id !== self::BIRTHDAY_CALENDAR_ID) {
-        $calendar = kolab_calendar::factory($id, $this->cal);
-        if ($calendar->ready) {
-          $this->calendars$calendar->id = $calendar;
-        }
-      }
-    }
+    /**
+     * Apply the given changes to already existing exceptions
+     */
+    protected function update_recurrence_exceptions(&$master, $event, $old, $savemode)
+    {
+        $saved    = false;
+        $existing = null;
+
+        // determine added and removed attendees
+        $added_attendees = $removed_attendees = ;
+
+        if ($savemode == 'future') {
+            $old_attendees = $current_attendees = ;
+
+            if (!empty($old'attendees')) {
+                foreach ((array) $old'attendees' as $attendee) {
+                    $old_attendees = $attendee'email';
+                }
+            }
+
+            if (!empty($event'attendees')) {
+                foreach ((array) $event'attendees' as $attendee) {
+                    $current_attendees = $attendee'email';
+                    if (!in_array($attendee'email', $old_attendees)) {
+                        $added_attendees = $attendee;
+                    }
+                }
+            }
+
+            $removed_attendees = array_diff($old_attendees, $current_attendees);
+        }
+
+        foreach ($master'recurrence''EXCEPTIONS' as $i => $exception) {
+            // update a specific instance
+            if ($exception'_instance' == $old'_instance') {
+                $existing = $i;
+
+                // check savemode against existing exception mode.
+                // if matches, we can update this existing exception
+                $thisandfuture = !empty($exception'thisandfuture');
+                if ($thisandfuture === ($savemode == 'future')) {
+                    $event'_instance'       = $old'_instance';
+                    $event'thisandfuture'   = $old'thisandfuture';
+                    $event'recurrence_date' = $old'recurrence_date';
+                    $master'recurrence''EXCEPTIONS'$i = $event;
+                    $saved = true;
+                }
+            }
+
+            // merge the new event properties onto future exceptions
+            if ($savemode == 'future' && $exception'_instance' >= $old'_instance') {
+                unset($event'thisandfuture');
+                self::merge_exception_data($master'recurrence''EXCEPTIONS'$i, $event, 'attendees');
+
+                if (!empty($added_attendees) || !empty($removed_attendees)) {
+                    calendar::merge_attendee_data($master'recurrence''EXCEPTIONS'$i, $added_attendees, $removed_attendees);
+                }
+            }
+        }
+/*
+        // we could not update the existing exception due to savemode mismatch...
+        if (!$saved && isset($existing) && !empty($master'recurrence''EXCEPTIONS'$existing'thisandfuture')) {
+            // ... try to move the existing this-and-future exception to the next occurrence
+            foreach ($this->get_recurring_events($master, $existing'start') as $candidate) {
+                // our old this-and-future exception is obsolete
+                if (!empty($candidate'thisandfuture')) {
+                    unset($master'recurrence''EXCEPTIONS'$existing);
+                    $saved = true;
+                    break;
+                }
+                // this occurrence doesn't yet have an exception
+                else if (empty($candidate'isexception')) {
+                    $event'_instance' = $candidate'_instance';
+                    $event'recurrence_date' = $candidate'recurrence_date';
+                    $master'recurrence''EXCEPTIONS'$i = $event;
+                    $saved = true;
+                    break;
+                }
+            }
+        }
+*/
+
+        // set link to top-level exceptions
+        $master'exceptions' = &$master'recurrence''EXCEPTIONS';
 
-    return $this->calendars$id;
-  }
-
-  /**
-   * Create a new calendar assigned to the current user
-   *
-   * @param array Hash array with calendar properties
-   *    name: Calendar name
-   *   color: The color of the calendar
-   *
-   * @return mixed ID of the calendar on success, False on error
-   */
-  public function create_calendar($prop)
-  {
-    $prop'type'       = 'event';
-    $prop'active'     = true;
-    $prop'subscribed' = true;
-
-    $folder = kolab_storage::folder_update($prop);
-
-    if ($folder === false) {
-      $this->last_error = $this->cal->gettext(kolab_storage::$last_error);
-      return false;
+        // returning false here will add a new exception
+        return $saved;
     }
 
-    // create ID
-    $id = kolab_storage::folder_id($folder);
-
-    // save color in user prefs (temp. solution)
-    $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', array());
-
-    if (isset($prop'color'))
-      $prefs'kolab_calendars'$id'color' = $prop'color';
-    if (isset($prop'showalarms'))
-      $prefs'kolab_calendars'$id'showalarms' = $prop'showalarms' ? true : false;
-
-    if ($prefs'kolab_calendars'$id)
-      $this->rc->user->save_prefs($prefs);
+    /**
+     * Add or update the given event as an exception to $master
+     */
+    public static function add_exception(&$master, $event, $old = null)
+    {
+        if ($old) {
+            $event'_instance' = $old'_instance';
+            if (empty($event'recurrence_date')) {
+                $event'recurrence_date' = !empty($old'recurrence_date') ? $old'recurrence_date' : $old'start';
+            }
+        }
+        else if (empty($event'recurrence_date')) {
+            $event'recurrence_date' = $event'start';
+        }
 
-    return $id;
-  }
+        if (empty($event'_instance') && is_a($event'recurrence_date', 'DateTime')) {
+            $event'_instance' = libcalendaring::recurrence_instance_identifier($event, !empty($master'allday'));
+        }
 
+        if (!is_array($master'exceptions') && isset($master'recurrence''EXCEPTIONS')) {
+            $master'exceptions' = &$master'recurrence''EXCEPTIONS';
+        }
 
-  /**
-   * Update properties of an existing calendar
-   *
-   * @see calendar_driver::edit_calendar()
-   */
-  public function edit_calendar($prop)
-  {
-    if ($prop'id' && ($cal = $this->get_calendar($prop'id'))) {
-      $id = $cal->update($prop);
-    }
-    else {
-      $id = $prop'id';
-    }
+        $existing = false;
+        foreach ((array) $master'exceptions' as $i => $exception) {
+            if ($exception'_instance' == $event'_instance') {
+                $master'exceptions'$i = $event;
+                $existing = true;
+            }
+        }
 
-    // fallback to local prefs
-    $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', array());
-    unset($prefs'kolab_calendars'$prop'id''color', $prefs'kolab_calendars'$prop'id''showalarms');
-
-    if (isset($prop'color'))
-      $prefs'kolab_calendars'$id'color' = $prop'color';
-
-    if (isset($prop'showalarms') && $id == self::BIRTHDAY_CALENDAR_ID)
-      $prefs'calendar_birthdays_alarm_type' = $prop'showalarms' ? $this->alarm_types0 : '';
-    else if (isset($prop'showalarms'))
-      $prefs'kolab_calendars'$id'showalarms' = $prop'showalarms' ? true : false;
-
-    if (!empty($prefs'kolab_calendars'$id))
-      $this->rc->user->save_prefs($prefs);
-
-    return true;
-  }
-
-
-  /**
-   * Set active/subscribed state of a calendar
-   *
-   * @see calendar_driver::subscribe_calendar()
-   */
-  public function subscribe_calendar($prop)
-  {
-    if ($prop'id' && ($cal = $this->get_calendar($prop'id')) && is_object($cal->storage)) {
-      $ret = false;
-      if (isset($prop'permanent'))
-        $ret |= $cal->storage->subscribe(intval($prop'permanent'));
-      if (isset($prop'active'))
-        $ret |= $cal->storage->activate(intval($prop'active'));
-
-      // apply to child folders, too
-      if ($prop'recursive') {
-        foreach ((array)kolab_storage::list_folders($cal->storage->name, '*', 'event') as $subfolder) {
-          if (isset($prop'permanent'))
-            ($prop'permanent' ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
-          if (isset($prop'active'))
-            ($prop'active' ? kolab_storage::folder_activate($subfolder) : kolab_storage::folder_deactivate($subfolder));
-        }
-      }
-      return $ret;
-    }
-    else {
-      // save state in local prefs
-      $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', array());
-      $prefs'kolab_calendars'$prop'id''active' = (bool)$prop'active';
-      $this->rc->user->save_prefs($prefs);
-      return true;
-    }
+        if (!$existing) {
+            $master'exceptions' = $event;
+        }
 
-    return false;
-  }
-
-
-  /**
-   * Delete the given calendar with all its contents
-   *
-   * @see calendar_driver::delete_calendar()
-   */
-  public function delete_calendar($prop)
-  {
-    if ($prop'id' && ($cal = $this->get_calendar($prop'id'))) {
-      $folder = $cal->get_realname();
-      // TODO: unsubscribe if no admin rights
-      if (kolab_storage::folder_delete($folder)) {
-        // remove color in user prefs (temp. solution)
-        $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', array());
-        unset($prefs'kolab_calendars'$prop'id');
-
-        $this->rc->user->save_prefs($prefs);
         return true;
-      }
-      else
-        $this->last_error = kolab_storage::$last_error;
-    }
-
-    return false;
-  }
-
-
-  /**
-   * Search for shared or otherwise not listed calendars the user has access
-   *
-   * @param string Search string
-   * @param string Section/source to search
-   * @return array List of calendars
-   */
-  public function search_calendars($query, $source)
-  {
-    if (!kolab_storage::setup())
-      return array();
-
-    $this->calendars = array();
-    $this->search_more_results = false;
-
-    // find unsubscribed IMAP folders that have "event" type
-    if ($source == 'folders') {
-      foreach ((array)kolab_storage::search_folders('event', $query, array('other')) as $folder) {
-        $calendar = new kolab_calendar($folder->name, $this->cal);
-        $this->calendars$calendar->id = $calendar;
-      }
-    }
-    // find other user's virtual calendars
-    else if ($source == 'users') {
-      $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
-      foreach (kolab_storage::search_users($query, 0, array(), $limit, $count) as $user) {
-        $calendar = new kolab_user_calendar($user, $this->cal);
-        $this->calendars$calendar->id = $calendar;
-
-        // search for calendar folders shared by this user
-        foreach (kolab_storage::list_user_folders($user, 'event', false) as $foldername) {
-          $cal = new kolab_calendar($foldername, $this->cal);
-          $this->calendars$cal->id = $cal;
-          $calendar->subscriptions = true;
-        }
-      }
-
-      if ($count > $limit) {
-        $this->search_more_results = true;
-      }
-    }
-
-    // don't list the birthday calendar
-    $this->rc->config->set('calendar_contact_birthdays', false);
-    $this->rc->config->set('kolab_invitation_calendars', false);
-
-    return $this->list_calendars();
-  }
-
-
-  /**
-   * Fetch a single event
-   *
-   * @see calendar_driver::get_event()
-   * @return array Hash array with event properties, false if not found
-   */
-  public function get_event($event, $scope = 0, $full = false)
-  {
-    if (is_array($event)) {
-      $id = $event'id' ?: $event'uid';
-      $cal = $event'calendar';
-
-      // we're looking for a recurring instance: expand the ID to our internal convention for recurring instances
-      if (!$event'id' && $event'_instance') {
-        $id .= '-' . $event'_instance';
-      }
-    }
-    else {
-      $id = $event;
     }
 
-    if ($cal) {
-      if ($storage = $this->get_calendar($cal)) {
-        $result = $storage->get_event($id);
-        return self::to_rcube_event($result);
-      }
-      // get event from the address books birthday calendar
-      else if ($cal == self::BIRTHDAY_CALENDAR_ID) {
-        return $this->get_birthday_event($id);
-      }
-    }
-    // iterate over all calendar folders and search for the event ID
-    else {
-      foreach ($this->filter_calendars($scope) as $calendar) {
-        if ($result = $calendar->get_event($id)) {
-          return self::to_rcube_event($result);
+    /**
+     * Remove the noreply flags from attendees
+     */
+    public static function clear_attandee_noreply(&$event)
+    {
+        if (!empty($event'attendees')) {
+            foreach ((array) $event'attendees' as $i => $attendee) {
+                unset($event'attendees'$i'noreply');
+            }
         }
-      }
     }
 
-    return false;
-  }
+    /**
+     * Merge certain properties from the overlay event to the base event object
+     *
+     * @param array The event object to be altered
+     * @param array The overlay event object to be merged over $event
+     * @param array List of properties not allowed to be overwritten
+     */
+    public static function merge_exception_data(&$event, $overlay, $blacklist = null)
+    {
+        $forbidden = 'id','uid','recurrence','recurrence_date','thisandfuture','organizer','_attachments';
 
-  /**
-   * Add a single event to the database
-   *
-   * @see calendar_driver::new_event()
-   */
-  public function new_event($event)
-  {
-    if (!$this->validate($event))
-      return false;
+        if (is_array($blacklist)) {
+            $forbidden = array_merge($forbidden, $blacklist);
+        }
 
-    $event = self::from_rcube_event($event);
+        foreach ($overlay as $prop => $value) {
+            if ($prop == 'start' || $prop == 'end') {
+                // handled by merge_exception_dates() below
+            }
+            else if ($prop == 'thisandfuture' && $overlay'_instance' == $event'_instance') {
+                $event$prop = $value;
+            }
+            else if ($prop0 != '_' && !in_array($prop, $forbidden)) {
+                $event$prop = $value;
+            }
+        }
 
-    if (!$event'calendar') {
-      $this->_read_calendars();
-      $event'calendar' = reset(array_keys($this->calendars));
+        self::merge_exception_dates($event, $overlay);
     }
 
-    if ($storage = $this->get_calendar($event'calendar')) {
-      // if this is a recurrence instance, append as exception to an already existing object for this UID
-      if (!empty($event'recurrence_date') && ($master = $storage->get_event($event'uid'))) {
-        self::add_exception($master, $event);
-        $success = $storage->update_event($master);
-      }
-      else {
-        $success = $storage->insert_event($event);
-      }
-
-      if ($success && $this->freebusy_trigger) {
-        $this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id));
-        $this->freebusy_trigger = false; // disable after first execution (#2355)
-      }
-      
-      return $success;
-    }
+    /**
+     * Merge start/end date from the overlay event to the base event object
+     *
+     * @param array The event object to be altered
+     * @param array The overlay event object to be merged over $event
+     */
+    public static function merge_exception_dates(&$event, $overlay)
+    {
+        // compute date offset from the exception
+        if ($overlay'start' instanceof DateTime && $overlay'recurrence_date' instanceof DateTime) {
+            $date_offset = $overlay'recurrence_date'->diff($overlay'start');
+        }
 
-    return false;
-  }
-
-  /**
-   * Update an event entry with the given data
-   *
-   * @see calendar_driver::new_event()
-   * @return boolean True on success, False on error
-   */
-  public function edit_event($event)
-  {
-     if (!($storage = $this->get_calendar($event'calendar')))
-       return false;
-
-    return $this->update_event(self::from_rcube_event($event, $storage->get_event($event'id')));
-  }
-
-  /**
-   * Extended event editing with possible changes to the argument
-   *
-   * @param array  Hash array with event properties
-   * @param string New participant status
-   * @param array  List of hash arrays with updated attendees
-   * @return boolean True on success, False on error
-   */
-  public function edit_rsvp(&$event, $status, $attendees)
-  {
-    $update_event = $event;
-
-    // apply changes to master (and all exceptions)
-    if ($event'_savemode' == 'all' && $event'recurrence_id') {
-      if ($storage = $this->get_calendar($event'calendar')) {
-        $update_event = $storage->get_event($event'recurrence_id');
-        $update_event'_savemode' = $event'_savemode';
-        $update_event'id' = $update_event'uid';
-        unset($update_event'recurrence_id');
-        calendar::merge_attendee_data($update_event, $attendees);
-      }
+        foreach ('start', 'end' as $prop) {
+            $value = $overlay$prop;
+            if (isset($event$prop) && $event$prop instanceof DateTime) {
+                // set date value if overlay is an exception of the current instance
+                if (substr($overlay'_instance', 0, 8) == substr($event'_instance', 0, 8)) {
+                    $event$prop->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));
+                }
+                // apply date offset
+                else if (!empty($date_offset)) {
+                    $event$prop->add($date_offset);
+                }
+                // adjust time of the recurring event instance
+                $event$prop->setTime($value->format('G'), intval($value->format('i')), intval($value->format('s')));
+            }
+        }
     }
 
-    if ($ret = $this->update_attendees($update_event, $attendees)) {
-      // replace with master event (for iTip reply)
-      $event = self::to_rcube_event($update_event);
-
-      // re-assign to the according (virtual) calendar
-      if ($this->rc->config->get('kolab_invitation_calendars')) {
-        if (strtoupper($status) == 'DECLINED')
-          $event'calendar' = self::INVITATIONS_CALENDAR_DECLINED;
-        else if (strtoupper($status) == 'NEEDS-ACTION')
-          $event'calendar' = self::INVITATIONS_CALENDAR_PENDING;
-        else if ($event'_folder_id')
-          $event'calendar' = $event'_folder_id';
-      }
-    }
+    /**
+     * Get events from source.
+     *
+     * @param int    Event's new start (unix timestamp)
+     * @param int    Event's new end (unix timestamp)
+     * @param string Search query (optional)
+     * @param mixed  List of calendar IDs to load events from (either as array or comma-separated string)
+     * @param bool   Include virtual events (optional)
+     * @param int    Only list events modified since this time (unix timestamp)
+     *
+     * @return array A list of event records
+     */
+    public function load_events($start, $end, $search = null, $calendars = null, $virtual = 1, $modifiedsince = null)
+    {
+        if ($calendars && is_string($calendars)) {
+            $calendars = explode(',', $calendars);
+        }
+        else if (!$calendars) {
+            $this->_read_calendars();
+            $calendars = array_keys($this->calendars);
+        }
 
-    return $ret;
-  }
-
-  /**
-   * Update the participant status for the given attendees
-   *
-   * @see calendar_driver::update_attendees()
-   */
-  public function update_attendees(&$event, $attendees)
-  {
-    // for this-and-future updates, merge the updated attendees onto all exceptions in range
-    if (($event'_savemode' == 'future' && $event'recurrence_id') || (!empty($event'recurrence') && !$event'recurrence_id')) {
-      if (!($storage = $this->get_calendar($event'calendar')))
-        return false;
+        $query      = ;
+        $events     = ;
+        $categories = ;
 
-      // load master event
-      $master = $event'recurrence_id' ? $storage->get_event($event'recurrence_id') : $event;
+        if ($modifiedsince) {
+            $query = 'changed', '>=', $modifiedsince;
+        }
 
-      // apply attendee update to each existing exception
-      if ($master'recurrence' && !empty($master'recurrence''EXCEPTIONS')) {
-        $saved = false;
-        foreach ($master'recurrence''EXCEPTIONS' as $i => $exception) {
-          // merge the new event properties onto future exceptions
-          if ($exception'_instance' >= strval($event'_instance')) {
-            calendar::merge_attendee_data($master'recurrence''EXCEPTIONS'$i, $attendees);
-          }
-          // update a specific instance
-          if ($exception'_instance' == $event'_instance' && $exception'thisandfuture') {
-            $saved = true;
-          }
+        foreach ($calendars as $cid) {
+            if ($storage = $this->get_calendar($cid)) {
+                $events = array_merge($events, $storage->list_events($start, $end, $search, $virtual, $query));
+                $categories += $storage->categories;
+            }
         }
 
-        // add the given event as new exception
-        if (!$saved && $event'id' != $master'id') {
-          $event'thisandfuture' = true;
-          $master'recurrence''EXCEPTIONS' = $event;
+        // add events from the address books birthday calendar
+        if (in_array(self::BIRTHDAY_CALENDAR_ID, $calendars)) {
+            $events = array_merge($events, $this->load_birthday_events($start, $end, $search, $modifiedsince));
         }
 
-        // set link to top-level exceptions
-        $master'exceptions' = &$master'recurrence''EXCEPTIONS';
+        // add new categories to user prefs
+        $old_categories = $this->rc->config->get('calendar_categories', $this->default_categories);
+        $newcats = array_udiff(
+            array_keys($categories),
+            array_keys($old_categories),
+            function($a, $b) { return strcasecmp($a, $b); }
+        );
 
-        return $this->update_event($master);
-      }
-    }
+        if (!empty($newcats)) {
+            foreach ($newcats as $category) {
+                $old_categories$category = '';  // no color set yet
+            }
+            $this->rc->user->save_prefs('calendar_categories' => $old_categories);
+        }
 
-    // just update the given event (instance)
-    return $this->update_event($event);
-  }
-
-  /**
-   * Move a single event
-   *
-   * @see calendar_driver::move_event()
-   * @return boolean True on success, False on error
-   */
-  public function move_event($event)
-  {
-    if (($storage = $this->get_calendar($event'calendar')) && ($ev = $storage->get_event($event'id'))) {
-      unset($ev'sequence');
-      self::clear_attandee_noreply($ev);
-      return $this->update_event($event + $ev);
-    }
+        array_walk($events, 'kolab_driver::to_rcube_event');
 
-    return false;
-  }
-
-  /**
-   * Resize a single event
-   *
-   * @see calendar_driver::resize_event()
-   * @return boolean True on success, False on error
-   */
-  public function resize_event($event)
-  {
-    if (($storage = $this->get_calendar($event'calendar')) && ($ev = $storage->get_event($event'id'))) {
-      unset($ev'sequence');
-      self::clear_attandee_noreply($ev);
-      return $this->update_event($event + $ev);
+        return $events;
     }
 
-    return false;
-  }
-
-  /**
-   * Remove a single event
-   *
-   * @param array   Hash array with event properties:
-   *      id: Event identifier
-   * @param boolean Remove record(s) irreversible (mark as deleted otherwise)
-   *
-   * @return boolean True on success, False on error
-   */
-  public function remove_event($event, $force = true)
-  {
-    $ret      = true;
-    $success  = false;
-    $savemode = $event'_savemode';
-    $decline  = $event'_decline';
-
-    if (!$force) {
-      unset($event'attendees');
-      $this->rc->session->remove('calendar_event_undo');
-      $this->rc->session->remove('calendar_restore_event_data');
-      $sess_data = $event;
+    /**
+     * Get number of events in the given calendar
+     *
+     * @param mixed List of calendar IDs to count events (either as array or comma-separated string)
+     * @param int   Date range start (unix timestamp)
+     * @param int   Date range end (unix timestamp)
+     *
+     * @return array Hash array with counts grouped by calendar ID
+     */
+    public function count_events($calendars, $start, $end = null)
+    {
+        $counts = ;
+
+        if ($calendars && is_string($calendars)) {
+            $calendars = explode(',', $calendars);
+        }
+        else if (!$calendars) {
+            $this->_read_calendars();
+            $calendars = array_keys($this->calendars);
+        }
+
+        foreach ($calendars as $cid) {
+            if ($storage = $this->get_calendar($cid)) {
+                $counts$cid = $storage->count_events($start, $end);
+            }
+        }
+
+         return $counts;
     }
 
-    if (($storage = $this->get_calendar($event'calendar')) && ($event = $storage->get_event($event'id'))) {
-      $event'_savemode' = $savemode;
-      $savemode = 'all';
-      $master   = $event;
+    /**
+     * Get a list of pending alarms to be displayed to the user
+     *
+     * @see calendar_driver::pending_alarms()
+     */
+    public function pending_alarms($time, $calendars = null)
+    {
+        $interval = 300;
+        $time -= $time % 60;
 
-      // read master if deleting a recurring event
-      if ($event'recurrence' || $event'recurrence_id' || $event'isexception') {
-        $master   = $storage->get_event($event'uid');
-        $savemode = $event'_savemode' ?: ($event'_instance' || $event'isexception' ? 'current' : 'all');
+        $slot = $time;
+        $slot -= $slot % $interval;
 
-        // force 'current' mode for single occurrences stored as exception
-        if (!$event'recurrence' && !$event'recurrence_id' && $event'isexception')
-          $savemode = 'current';
-      }
+        $last = $time - max(60, $this->rc->config->get('refresh_interval', 0));
+        $last -= $last % $interval;
 
-      // removing an exception instance
-      if (($event'recurrence_id' || $event'isexception') && is_array($master'exceptions')) {
-        foreach ($master'exceptions' as $i => $exception) {
-          if ($exception'_instance' == $event'_instance') {
-            unset($master'exceptions'$i);
-            // set event date back to the actual occurrence
-            if ($exception'recurrence_date')
-              $event'start' = $exception'recurrence_date';
-          }
+        // only check for alerts once in 5 minutes
+        if ($last == $slot) {
+            return ;
         }
 
-        if (is_array($master'recurrence')) {
-          $master'recurrence''EXCEPTIONS' = &$master'exceptions';
+        if ($calendars && is_string($calendars)) {
+            $calendars = explode(',', $calendars);
         }
-      }
 
-      switch ($savemode) {
-        case 'current':
-          $_SESSION'calendar_restore_event_data' = $master;
+        $time = $slot + $interval;
 
-          // remove the matching RDATE entry
-          if ($master'recurrence''RDATE') {
-            foreach ($master'recurrence''RDATE' as $j => $rdate) {
-              if ($rdate->format('Ymd') == $event'start'->format('Ymd')) {
-                unset($master'recurrence''RDATE'$j);
-                break;
-              }
-            }
-          }
+        $alarms     = ;
+        $candidates = ;
+        $query      = 'tags', '=', 'x-has-alarms';
 
-          // add exception to master event
-          $master'recurrence''EXDATE' = $event'start';
+        $this->_read_calendars();
 
-          $success = $storage->update_event($master);
-          break;
+        foreach ($this->calendars as $cid => $calendar) {
+            // skip calendars with alarms disabled
+            if (!$calendar->alarms || ($calendars && !in_array($cid, $calendars))) {
+                continue;
+            }
 
-        case 'future':
-          $master'_instance' = libcalendaring::recurrence_instance_identifier($master);
-          if ($master'_instance' != $event'_instance') {
-            $_SESSION'calendar_restore_event_data' = $master;
+            foreach ($calendar->list_events($time, $time + 86400 * 365, null, 1, $query) as $e) {
+                // add to list if alarm is set
+                $alarm = libcalendaring::get_next_alarm($e);
+                if ($alarm && !empty($alarm'time') && $alarm'time' >= $last
+                    && in_array($alarm'action', $this->alarm_types)
+                ) {
+                    $id = $alarm'id';  // use alarm-id as primary identifier
+                    $candidates$id = 
+                        'id'       => $id,
+                        'title'    => $e'title',
+                        'location' => $e'location',
+                        'start'    => $e'start',
+                        'end'      => $e'end',
+                        'notifyat' => $alarm'time',
+                        'action'   => $alarm'action',
+                    ;
+                }
+            }
+        }
 
-            // set until-date on master event
-            $master'recurrence''UNTIL' = clone $event'start';
-            $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
-            unset($master'recurrence''COUNT');
+        // get alarm information stored in local database
+        if (!empty($candidates)) {
+            $dbdata = ;
+            $alarm_ids = array_map($this->rc->db, 'quote', array_keys($candidates));
 
-            // if all future instances are deleted, remove recurrence rule entirely (bug #1677)
-            if ($master'recurrence''UNTIL'->format('Ymd') == $master'start'->format('Ymd')) {
-              $master'recurrence' = array();
+            $result = $this->rc->db->query("SELECT *"
+                . " FROM " . $this->rc->db->table_name('kolab_alarms', true)
+                . " WHERE `alarm_id` IN (" . join(',', $alarm_ids) . ")"
+                    . " AND `user_id` = ?",
+                $this->rc->user->ID
+            );
+
+            while ($result && ($e = $this->rc->db->fetch_assoc($result))) {
+                $dbdata$e'alarm_id' = $e;
             }
-            // remove matching RDATE entries
-            else if ($master'recurrence''RDATE') {
-              foreach ($master'recurrence''RDATE' as $j => $rdate) {
-                if ($rdate->format('Ymd') == $event'start'->format('Ymd')) {
-                  $master'recurrence''RDATE' = array_slice($master'recurrence''RDATE', 0, $j);
-                  break;
+
+            foreach ($candidates as $id => $alarm) {
+                // skip dismissed alarms
+                if ($dbdata$id'dismissed') {
+                    continue;
                 }
-              }
-            }
 
-            $success = $storage->update_event($master);
-            $ret = $master'uid';
-            break;
-          }
-
-        default:  // 'all' is default
-          // removing the master event with loose exceptions (not recurring though)
-          if (!empty($event'recurrence_date') && empty($master'recurrence') && !empty($master'exceptions')) {
-            // make the first exception the new master
-            $newmaster = array_shift($master'exceptions');
-            $newmaster'exceptions'   = $master'exceptions';
-            $newmaster'_attachments' = $master'_attachments';
-            $newmaster'_mailbox'     = $master'_mailbox';
-            $newmaster'_msguid'      = $master'_msguid';
-
-            $success = $storage->update_event($newmaster);
-          }
-          else if ($decline && $this->rc->config->get('kolab_invitation_calendars')) {
-            // don't delete but set PARTSTAT=DECLINED
-            if ($this->cal->lib->set_partstat($master, 'DECLINED')) {
-              $success = $storage->update_event($master);
-            }
-          }
-
-          if (!$success)
-            $success = $storage->delete_event($master, $force);
-          break;
-      }
-    }
+                // snooze function may have shifted alarm time
+                $notifyat = $dbdata$id'notifyat' ? strtotime($dbdata$id'notifyat') : $alarm'notifyat';
+                if ($notifyat <= $time) {
+                    $alarms = $alarm;
+                }
+            }
+        }
 
-    if ($success && !$force) {
-      if ($master'_folder_id')
-        $sess_data'_folder_id' = $master'_folder_id';
-      $_SESSION'calendar_event_undo' = array('ts' => time(), 'data' => $sess_data);
+        return $alarms;
     }
 
-    if ($success && $this->freebusy_trigger)
-      $this->rc->output->command('plugin.ping_url', array(
-          'action' => 'calendar/push-freebusy',
-          // _folder_id may be set by invitations calendar
-          'source' => $master'_folder_id' ?: $storage->id,
-      ));
-
-    return $success ? $ret : false;
-  }
-
-  /**
-   * Restore a single deleted event
-   *
-   * @param array Hash array with event properties:
-   *                    id: Event identifier
-   *              calendar: Event calendar
-   *
-   * @return boolean True on success, False on error
-   */
-  public function restore_event($event)
-  {
-    if ($storage = $this->get_calendar($event'calendar')) {
-      if (!empty($_SESSION'calendar_restore_event_data'))
-        $success = $storage->update_event($event = $_SESSION'calendar_restore_event_data');
-      else
-        $success = $storage->restore_event($event);
-
-      if ($success && $this->freebusy_trigger)
-        $this->rc->output->command('plugin.ping_url', array(
-            'action' => 'calendar/push-freebusy',
-            // _folder_id may be set by invitations calendar
-            'source' => $event'_folder_id' ?: $storage->id,
-        ));
-
-      return $success;
-    }
+    /**
+     * Feedback after showing/sending an alarm notification
+     *
+     * @see calendar_driver::dismiss_alarm()
+     */
+    public function dismiss_alarm($alarm_id, $snooze = 0)
+    {
+        $alarms_table = $this->rc->db->table_name('kolab_alarms', true);
 
-    return false;
-  }
+        // delete old alarm entry
+        $this->rc->db->query("DELETE FROM $alarms_table"
+            . " WHERE `alarm_id` = ? AND `user_id` = ?",
+            $alarm_id,
+            $this->rc->user->ID
+        );
 
-  /**
-   * Wrapper to update an event object depending on the given savemode
-   */
-  private function update_event($event)
-  {
-    if (!($storage = $this->get_calendar($event'calendar')))
-      return false;
+        // set new notifyat time or unset if not snoozed
+        $notifyat = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;
 
-    // move event to another folder/calendar
-    if ($event'_fromcalendar' && $event'_fromcalendar' != $event'calendar') {
-      if (!($fromcalendar = $this->get_calendar($event'_fromcalendar')))
-        return false;
+        $query = $this->rc->db->query("INSERT INTO $alarms_table"
+            . " (`alarm_id`, `user_id`, `dismissed`, `notifyat`)"
+            . " VALUES (?, ?, ?, ?)",
+            $alarm_id,
+            $this->rc->user->ID,
+            $snooze > 0 ? 0 : 1,
+            $notifyat
+        );
 
-      $old = $fromcalendar->get_event($event'id');
+        return $this->rc->db->affected_rows($query);
+    }
 
-      if ($event'_savemode' != 'new') {
-        if (!$fromcalendar->storage->move($old'uid', $storage->storage)) {
-          return false;
+    /**
+     * List attachments from the given event
+     */
+    public function list_attachments($event)
+    {
+        if (!($storage = $this->get_calendar($event'calendar'))) {
+            return false;
         }
 
-        $fromcalendar = $storage;
-      }
-    }
-    else
-      $fromcalendar = $storage;
-
-    $success = false;
-    $savemode = 'all';
-    $attachments = array();
-    $old = $master = $storage->get_event($event'id');
-
-    if (!$old || !$old'start') {
-      rcube::raise_error(array(
-        'code' => 600, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Failed to load event object to update: id=" . $event'id'),
-        true, false);
-      return false;
-    }
+        $event = $storage->get_event($event'id');
 
-    // modify a recurring event, check submitted savemode to do the right things
-    if ($old'recurrence' || $old'recurrence_id' || $old'isexception') {
-      $master = $storage->get_event($old'uid');
-      $savemode = $event'_savemode' ?: ($old'recurrence_id' || $old'isexception' ? 'current' : 'all');
-
-      // this-and-future on the first instance equals to 'all'
-      if ($savemode == 'future' && $master'start' && $old'_instance' == libcalendaring::recurrence_instance_identifier($master))
-        $savemode = 'all';
-      // force 'current' mode for single occurrences stored as exception
-      else if (!$old'recurrence' && !$old'recurrence_id' && $old'isexception')
-        $savemode = 'current';
-
-      // Stick to the master timezone for all occurrences (Bifrost#T104637)
-      $master_tz = $master'start'->getTimezone();
-      $event_tz  = $event'start'->getTimezone();
-
-      if ($master_tz->getName() != $event_tz->getName()) {
-        $event'start'->setTimezone($master_tz);
-        $event'end'->setTimezone($master_tz);
-      }
+        return $event'attachments';
     }
 
-    // check if update affects scheduling and update attendee status accordingly
-    $reschedule = $this->check_scheduling($event, $old, true);
-
-    // keep saved exceptions (not submitted by the client)
-    if ($old'recurrence''EXDATE' && !isset($event'recurrence''EXDATE'))
-      $event'recurrence''EXDATE' = $old'recurrence''EXDATE';
-    if (isset($event'recurrence''EXCEPTIONS'))
-      $with_exceptions = true;  // exceptions already provided (e.g. from iCal import)
-    else if ($old'recurrence''EXCEPTIONS')
-      $event'recurrence''EXCEPTIONS' = $old'recurrence''EXCEPTIONS';
-    else if ($old'exceptions')
-      $event'exceptions' = $old'exceptions';
-
-    // remove some internal properties which should not be saved
-    unset($event'_savemode', $event'_fromcalendar', $event'_identity', $event'_owner',
-        $event'_notify', $event'_method', $event'_sender', $event'_sender_utf', $event'_size');
-
-    switch ($savemode) {
-      case 'new':
-        // save submitted data as new (non-recurring) event
-        $event'recurrence' = array();
-        $event'_copyfrom' = $master'_msguid';
-        $event'_mailbox' = $master'_mailbox';
-        $event'uid' = $this->cal->generate_uid();
-        unset($event'recurrence_id', $event'recurrence_date', $event'_instance', $event'id');
-
-        // copy attachment metadata to new event
-        $event = self::from_rcube_event($event, $master);
-
-        self::clear_attandee_noreply($event);
-        if ($success = $storage->insert_event($event))
-          $success = $event'uid';
-        break;
-
-      case 'future':
-        // create a new recurring event
-        $event'_copyfrom' = $master'_msguid';
-        $event'_mailbox' = $master'_mailbox';
-        $event'uid' = $this->cal->generate_uid();
-        unset($event'recurrence_id', $event'recurrence_date', $event'_instance', $event'id');
-
-        // copy attachment metadata to new event
-        $event = self::from_rcube_event($event, $master);
-
-        // remove recurrence exceptions on re-scheduling
-        if ($reschedule) {
-          unset($event'recurrence''EXCEPTIONS', $event'exceptions', $master'recurrence''EXDATE');
-        }
-        else if (is_array($event'recurrence''EXCEPTIONS')) {
-          // only keep relevant exceptions
-          $event'recurrence''EXCEPTIONS' = array_filter($event'recurrence''EXCEPTIONS', function($exception) use ($event) {
-            return $exception'start' > $event'start';
-          });
-          if (is_array($event'recurrence''EXDATE')) {
-            $event'recurrence''EXDATE' = array_filter($event'recurrence''EXDATE', function($exdate) use ($event) {
-              return $exdate > $event'start';
-            });
-          }
-          // set link to top-level exceptions
-          $event'exceptions' = &$event'recurrence''EXCEPTIONS';
+    /**
+     * Get attachment properties
+     */
+    public function get_attachment($id, $event)
+    {
+        if (!($storage = $this->get_calendar($event'calendar'))) {
+            return false;
         }
 
-        // compute remaining occurrences
-        if ($event'recurrence''COUNT') {
-          if (!$old'_count')
-            $old'_count' = $this->get_recurrence_count($master, $old'start');
-          $event'recurrence''COUNT' -= intval($old'_count');
+        // get old revision of event
+        if (!empty($event'rev')) {
+            $event = $this->get_event_revison($event, $event'rev', true);
         }
-
-        // remove fixed weekday when date changed
-        if ($old'start'->format('Y-m-d') != $event'start'->format('Y-m-d')) {
-          if (strlen($event'recurrence''BYDAY') == 2)
-            unset($event'recurrence''BYDAY');
-          if ($old'recurrence''BYMONTH' == $old'start'->format('n'))
-            unset($event'recurrence''BYMONTH');
+        else {
+            $event = $storage->get_event($event'id');
         }
 
-        // set until-date on master event
-        $master'recurrence''UNTIL' = clone $old'start';
-        $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
-        unset($master'recurrence''COUNT');
-
-        // remove all exceptions after $event'start'
-        if (is_array($master'recurrence''EXCEPTIONS')) {
-          $master'recurrence''EXCEPTIONS' = array_filter($master'recurrence''EXCEPTIONS', function($exception) use ($event) {
-            return $exception'start' < $event'start';
-          });
-          // set link to top-level exceptions
-          $master'exceptions' = &$master'recurrence''EXCEPTIONS';
-        }
-        if (is_array($master'recurrence''EXDATE')) {
-          $master'recurrence''EXDATE' = array_filter($master'recurrence''EXDATE', function($exdate) use ($event) {
-            return $exdate < $event'start';
-          });
+        if ($event) {
+            $attachments = isset($event'_attachments') ? $event'_attachments' : $event'attachments';
+            foreach ((array) $attachments as $att) {
+                if ($att'id' == $id) {
+                    return $att;
+                }
+            }
         }
+    }
 
-        // save new event
-        if ($success = $storage->insert_event($event)) {
-          $success = $event'uid';
-
-          // update master event (no rescheduling!)
-          self::clear_attandee_noreply($master);
-          $storage->update_event($master);
+    /**
+     * Get attachment body
+     * @see calendar_driver::get_attachment_body()
+     */
+    public function get_attachment_body($id, $event)
+    {
+        if (!($cal = $this->get_calendar($event'calendar'))) {
+            return false;
         }
-        break;
 
-      case 'current':
-        // recurring instances shall not store recurrence rules and attachments
-        $event'recurrence' = array();
-        $event'thisandfuture' = $savemode == 'future';
-        unset($event'attachments', $event'id');
+        // get old revision of event
+        if (!empty($event'rev')) {
+            if (empty($this->bonnie_api)) {
+                return false;
+            }
+
+            $cid = substr($id, 4);
+
+            // call Bonnie API and get the raw mime message
+            list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+            if ($msg_raw = $this->bonnie_api->rawdata('event', $uid, $event'rev', $mailbox, $msguid)) {
+                // parse the message and find the part with the matching content-id
+                $message = rcube_mime::parse_message($msg_raw);
+                foreach ((array) $message->parts as $part) {
+                    if (!empty($part->headers'content-id') && trim($part->headers'content-id', '<>') == $cid) {
+                        return $part->body;
+                    }
+                }
+            }
 
-        // increment sequence of this instance if scheduling is affected
-        if ($reschedule) {
-          $event'sequence' = max($old'sequence', $master'sequence') + 1;
-        }
-        else if (!isset($event'sequence')) {
-          $event'sequence' = $old'sequence' ?: $master'sequence';
+            return false;
         }
 
-        // save properties to a recurrence exception instance
-        if ($old'_instance' && is_array($master'recurrence''EXCEPTIONS')) {
-          if ($this->update_recurrence_exceptions($master, $event, $old, $savemode)) {
-            $success = $storage->update_event($master, $old'id');
-            break;
-          }
-        }
-
-        $add_exception = true;
-
-        // adjust matching RDATE entry if dates changed
-        if (is_array($master'recurrence''RDATE') && ($old_date = $old'start'->format('Ymd')) != $event'start'->format('Ymd')) {
-          foreach ($master'recurrence''RDATE' as $j => $rdate) {
-            if ($rdate->format('Ymd') == $old_date) {
-              $master'recurrence''RDATE'$j = $event'start';
-              sort($master'recurrence''RDATE');
-              $add_exception = false;
-              break;
-            }
-          }
+        return $cal->get_attachment_body($id, $event);
+    }
+
+    /**
+     * Build a struct representing the given message reference
+     *
+     * @see calendar_driver::get_message_reference()
+     */
+    public function get_message_reference($uri_or_headers, $folder = null)
+    {
+        if (is_object($uri_or_headers)) {
+            $uri_or_headers = kolab_storage_config::get_message_uri($uri_or_headers, $folder);
         }
 
-        // save as new exception to master event
-        if ($add_exception) {
-          self::add_exception($master, $event, $old);
+        if (is_string($uri_or_headers)) {
+            return kolab_storage_config::get_message_reference($uri_or_headers, 'event');
         }
 
-        $success = $storage->update_event($master);
-        break;
+        return false;
+    }
 
-      default:  // 'all' is default
-        $event'id' = $master'uid';
-        $event'uid' = $master'uid';
+    /**
+     * List availabale categories
+     * The default implementation reads them from config/user prefs
+     */
+    public function list_categories()
+    {
+        // FIXME: complete list with categories saved in config objects (KEP:12)
+        return $this->rc->config->get('calendar_categories', $this->default_categories);
+    }
+
+    /**
+     * Create instances of a recurring event
+     *
+     * @param array    Hash array with event properties
+     * @param DateTime Start date of the recurrence window
+     * @param DateTime End date of the recurrence window
+     *
+     * @return array List of recurring event instances
+     */
+    public function get_recurring_events($event, $start, $end = null)
+    {
+        // load the given event data into a libkolabxml container
+        if (empty($event'_formatobj')) {
+            $event_xml = new kolab_format_event();
+            $event_xml->set($event);
+            $event'_formatobj' = $event_xml;
+        }
 
-        // use start date from master but try to be smart on time or duration changes
-        $old_start_date = $old'start'->format('Y-m-d');
-        $old_start_time = $old'allday' ? '' : $old'start'->format('H:i');
-        $old_duration   = self::event_duration($old'start', $old'end', $old'allday');
+        $this->_read_calendars();
+        $storage = reset($this->calendars);
 
-        $new_start_date = $event'start'->format('Y-m-d');
-        $new_start_time = $event'allday' ? '' : $event'start'->format('H:i');
-        $new_duration   = self::event_duration($event'start', $event'end', $event'allday');
+        return $storage->get_recurring_events($event, $start, $end);
+    }
 
-        $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
-        $date_shift = $old'start'->diff($event'start');
+    /**
+     *
+     */
+    private function get_recurrence_count($event, $dtstart)
+    {
+        // load the given event data into a libkolabxml container
+        if (empty($event'_formatobj')) {
+            $event_xml = new kolab_format_event();
+            $event_xml->set($event);
+            $event'_formatobj' = $event_xml;
+        }
 
-        // shifted or resized
-        if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
-          $event'start' = $master'start'->add($date_shift);
-          $event'end' = clone $event'start';
-          $event'end'->add(new DateInterval($new_duration));
+        // use libkolab to compute recurring events
+        $recurrence = new kolab_date_recurrence($event'_formatobj');
 
-          // remove fixed weekday, will be re-set to the new weekday in kolab_calendar::update_event()
-          if ($old_start_date != $new_start_date && $event'recurrence') {
-            if (strlen($event'recurrence''BYDAY') == 2)
-              unset($event'recurrence''BYDAY');
-            if ($old'recurrence''BYMONTH' == $old'start'->format('n'))
-              unset($event'recurrence''BYMONTH');
-          }
-        }
-        // dates did not change, use the ones from master
-        else if ($new_start_date . $new_start_time == $old_start_date . $old_start_time) {
-          $event'start' = $master'start';
-          $event'end' = $master'end';
+        $count = 0;
+        while (($next_event = $recurrence->next_instance()) && $next_event'start' <= $dtstart && $count < 1000) {
+            $count++;
         }
 
-        // when saving an instance in 'all' mode, copy recurrence exceptions over
-        if ($old'recurrence_id') {
-          $event'recurrence''EXCEPTIONS' = $master'recurrence''EXCEPTIONS';
-          $event'recurrence''EXDATE'     = $master'recurrence''EXDATE';
-        }
-        else if ($master'_instance') {
-          $event'_instance' = $master'_instance';
-          $event'recurrence_date' = $master'recurrence_date';
+        return $count;
+    }
+
+    /**
+     * Fetch free/busy information from a person within the given range
+     */
+    public function get_freebusy_list($email, $start, $end)
+    {
+        if (empty($email)/* || $end < time()*/) {
+            return false;
         }
 
-        // TODO: forward changes to exceptions (which do not yet have differing values stored)
-        if (is_array($event'recurrence') && is_array($event'recurrence''EXCEPTIONS') && !$with_exceptions) {
-          // determine added and removed attendees
-          $old_attendees = $current_attendees = $added_attendees = array();
-          foreach ((array)$old'attendees' as $attendee) {
-            $old_attendees = $attendee'email';
-          }
-          foreach ((array)$event'attendees' as $attendee) {
-            $current_attendees = $attendee'email';
-            if (!in_array($attendee'email', $old_attendees)) {
-              $added_attendees = $attendee;
+        // map vcalendar fbtypes to internal values
+        $fbtypemap = 
+            'FREE'            => calendar::FREEBUSY_FREE,
+            'BUSY-TENTATIVE'  => calendar::FREEBUSY_TENTATIVE,
+            'X-OUT-OF-OFFICE' => calendar::FREEBUSY_OOF,
+            'OOF'             => calendar::FREEBUSY_OOF
+        ;
+
+        // ask kolab server first
+        try {
+            $request_config = 
+                'store_body'       => true,
+                'follow_redirects' => true,
+            ;
+
+            $request  = libkolab::http_request(kolab_storage::get_freebusy_url($email), 'GET', $request_config);
+            $response = $request->send();
+
+            // authentication required
+            if ($response->getStatus() == 401) {
+                $request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION'password'));
+                $response = $request->send();
             }
-          }
-          $removed_attendees = array_diff($old_attendees, $current_attendees);
 
-          foreach ($event'recurrence''EXCEPTIONS' as $i => $exception) {
-            calendar::merge_attendee_data($event'recurrence''EXCEPTIONS'$i, $added_attendees, $removed_attendees);
-          }
-
-          // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
-          if ($old_start_date != $new_start_date || $old_start_time != $new_start_time) {
-            $recurrence_id_format = libcalendaring::recurrence_id_format($event);
-            foreach ($event'recurrence''EXCEPTIONS' as $i => $exception) {
-              $recurrence_id = is_a($exception'recurrence_date', 'DateTime') ? $exception'recurrence_date' :
-                  rcube_utils::anytodatetime($exception'_instance', $old'start'->getTimezone());
-              if (is_a($recurrence_id, 'DateTime')) {
-                $recurrence_id->add($date_shift);
-                $event'recurrence''EXCEPTIONS'$i'recurrence_date' = $recurrence_id;
-                $event'recurrence''EXCEPTIONS'$i'_instance' = $recurrence_id->format($recurrence_id_format);
-              }
+            if ($response->getStatus() == 200) {
+                $fbdata = $response->getBody();
             }
-          }
-
-          // set link to top-level exceptions
-          $event'exceptions' = &$event'recurrence''EXCEPTIONS';
-        }
-
-        // unset _dateonly flags in (cached) date objects
-        unset($event'start'->_dateonly, $event'end'->_dateonly);
-
-        $success = $storage->update_event($event) ? $event'id' : false;  // return master UID
-        break;
-    }
 
-    if ($success && $this->freebusy_trigger)
-      $this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id));
+            unset($request, $response);
+        }
+        catch (Exception $e) {
+            PEAR::raiseError("Error fetching free/busy information: " . $e->getMessage());
+        }
 
-    return $success;
-  }
+        // get free-busy url from contacts
+        if (empty($fbdata)) {
+            $fburl = null;
+            foreach ((array) $this->rc->config->get('autocomplete_addressbooks', 'sql') as $book) {
+                $abook = $this->rc->get_address_book($book);
+
+                if ($result = $abook->search('email', $email, true, true, true/*, 'freebusyurl'*/)) {
+                    while ($contact = $result->iterate()) {
+                        if (!empty($contact'freebusyurl')) {
+                            $fbdata = @file_get_contents($contact'freebusyurl');
+                            break;
+                        }
+                    }
+                }
 
-  /**
-   * Calculate event duration, returns string in DateInterval format
-   */
-  protected static function event_duration($start, $end, $allday = false)
-  {
-    if ($allday) {
-      $diff = $start->diff($end);
-      return 'P' . $diff->days . 'D';
-    }
+                if (!empty($fbdata)) {
+                    break;
+                }
+            }
+        }
 
-    return 'PT' . ($end->format('U') - $start->format('U')) . 'S';
-  }
-
-  /**
-   * Determine whether the current change affects scheduling and reset attendee status accordingly
-   */
-  public function check_scheduling(&$event, $old, $update = true)
-  {
-    // skip this check when importing iCal/iTip events
-    if (isset($event'sequence') || !empty($event'_method')) {
-      return false;
-    }
+        // parse free-busy information using Horde classes
+        if (!empty($fbdata)) {
+            $ical = $this->cal->get_ical();
+            $ical->import($fbdata);
+            if ($fb = $ical->freebusy) {
+                $result = ;
+                foreach ($fb'periods' as $tuple) {
+                    list($from, $to, $type) = $tuple;
+                    $result = 
+                        $from->format('U'),
+                        $to->format('U'),
+                        isset($fbtypemap$type) ? $fbtypemap$type : calendar::FREEBUSY_BUSY
+                    ;
+                }
 
-    // iterate through the list of properties considered 'significant' for scheduling
-    $kolab_event = $old'_formatobj' ?: new kolab_format_event();
-    $reschedule = $kolab_event->check_rescheduling($event, $old);
-
-    // reset all attendee status to needs-action (#4360)
-    if ($update && $reschedule && is_array($event'attendees')) {
-      $is_organizer = false;
-      $emails = $this->cal->get_user_emails();
-      $attendees = $event'attendees';
-      foreach ($attendees as $i => $attendee) {
-        if ($attendee'role' == 'ORGANIZER' && $attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
-          $is_organizer = true;
-        }
-        else if ($attendee'role' != 'ORGANIZER' && $attendee'role' != 'NON-PARTICIPANT' && $attendee'status' != 'DELEGATED') {
-          $attendees$i'status' = 'NEEDS-ACTION';
-          $attendees$i'rsvp' = true;
-        }
-      }
-
-      // update attendees only if I'm the organizer
-      if ($is_organizer || ($event'organizer' && in_array(strtolower($event'organizer''email'), $emails))) {
-        $event'attendees' = $attendees;
-      }
-    }
+                // we take 'dummy' free-busy lists as "unknown"
+                if (empty($result) && !empty($fb'comment') && stripos($fb'comment', 'dummy')) {
+                    return false;
+                }
 
-    return $reschedule;
-  }
-
-  /**
-   * Apply the given changes to already existing exceptions
-   */
-  protected function update_recurrence_exceptions(&$master, $event, $old, $savemode)
-  {
-    $saved = false;
-    $existing = null;
-
-    // determine added and removed attendees
-    $added_attendees = $removed_attendees = array();
-    if ($savemode == 'future') {
-      $old_attendees = $current_attendees = array();
-      foreach ((array)$old'attendees' as $attendee) {
-        $old_attendees = $attendee'email';
-      }
-      foreach ((array)$event'attendees' as $attendee) {
-        $current_attendees = $attendee'email';
-        if (!in_array($attendee'email', $old_attendees)) {
-          $added_attendees = $attendee;
-        }
-      }
-      $removed_attendees = array_diff($old_attendees, $current_attendees);
-    }
+                // set period from $start till the begin of the free-busy information as 'unknown'
+                if (!empty($fb'start') && ($fbstart = $fb'start'->format('U')) && $start < $fbstart) {
+                    array_unshift($result, $start, $fbstart, calendar::FREEBUSY_UNKNOWN);
+                }
+                // pad period till $end with status 'unknown'
+                if (!empty($fb'end') && ($fbend = $fb'end'->format('U')) && $fbend < $end) {
+                    $result = $fbend, $end, calendar::FREEBUSY_UNKNOWN;
+                }
 
-    foreach ($master'recurrence''EXCEPTIONS' as $i => $exception) {
-      // update a specific instance
-      if ($exception'_instance' == $old'_instance') {
-        $existing = $i;
-
-        // check savemode against existing exception mode.
-        // if matches, we can update this existing exception
-        if ((bool)$exception'thisandfuture' === ($savemode == 'future')) {
-          $event'_instance' = $old'_instance';
-          $event'thisandfuture' = $old'thisandfuture';
-          $event'recurrence_date' = $old'recurrence_date';
-          $master'recurrence''EXCEPTIONS'$i = $event;
-          $saved = true;
-        }
-      }
-      // merge the new event properties onto future exceptions
-      if ($savemode == 'future' && $exception'_instance' >= $old'_instance') {
-        unset($event'thisandfuture');
-        self::merge_exception_data($master'recurrence''EXCEPTIONS'$i, $event, array('attendees'));
-
-        if (!empty($added_attendees) || !empty($removed_attendees)) {
-          calendar::merge_attendee_data($master'recurrence''EXCEPTIONS'$i, $added_attendees, $removed_attendees);
-        }
-      }
-    }
-/*
-    // we could not update the existing exception due to savemode mismatch...
-    if (!$saved && $existing !== null && $master'recurrence''EXCEPTIONS'$existing'thisandfuture') {
-      // ... try to move the existing this-and-future exception to the next occurrence
-      foreach ($this->get_recurring_events($master, $existing'start') as $candidate) {
-        // our old this-and-future exception is obsolete
-        if ($candidate'thisandfuture') {
-          unset($master'recurrence''EXCEPTIONS'$existing);
-          $saved = true;
-          break;
-        }
-        // this occurrence doesn't yet have an exception
-        else if (!$candidate'isexception') {
-          $event'_instance' = $candidate'_instance';
-          $event'recurrence_date' = $candidate'recurrence_date';
-          $master'recurrence''EXCEPTIONS'$i = $event;
-          $saved = true;
-          break;
-        }
-      }
-    }
-*/
+                return $result;
+            }
+        }
 
-    // set link to top-level exceptions
-    $master'exceptions' = &$master'recurrence''EXCEPTIONS';
-
-    // returning false here will add a new exception
-    return $saved;
-  }
-
-  /**
-   * Add or update the given event as an exception to $master
-   */
-  public static function add_exception(&$master, $event, $old = null)
-  {
-    if ($old) {
-      $event'_instance' = $old'_instance';
-      if (!$event'recurrence_date')
-        $event'recurrence_date' = $old'recurrence_date' ?: $old'start';
-    }
-    else if (!$event'recurrence_date') {
-      $event'recurrence_date' = $event'start';
+        return false;
     }
 
-    if (!$event'_instance' && is_a($event'recurrence_date', 'DateTime')) {
-      $event'_instance' = libcalendaring::recurrence_instance_identifier($event, $master'allday');
-    }
+    /**
+     * Handler to push folder triggers when sent from client.
+     * Used to push free-busy changes asynchronously after updating an event
+     */
+    public function push_freebusy()
+    {
+        // make shure triggering completes
+        set_time_limit(0);
+        ignore_user_abort(true);
 
-    if (!is_array($master'exceptions') && is_array($master'recurrence''EXCEPTIONS')) {
-      $master'exceptions' = &$master'recurrence''EXCEPTIONS';
-    }
+        $cal = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+        if (!($cal = $this->get_calendar($cal))) {
+            return false;
+        }
 
-    $existing = false;
-    foreach ((array)$master'exceptions' as $i => $exception) {
-      if ($exception'_instance' == $event'_instance') {
-        $master'exceptions'$i = $event;
-        $existing = true;
-      }
-    }
+        // trigger updates on folder
+        $trigger = $cal->storage->trigger();
+        if (is_object($trigger) && is_a($trigger, 'PEAR_Error')) {
+            rcube::raise_error(
+                    'code' => 900, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Failed triggering folder. Error was " . $trigger->getMessage()
+                ,
+                true, false
+            );
+        }
 
-    if (!$existing) {
-      $master'exceptions' = $event;
+        exit;
     }
 
-    return true;
-  }
+    /**
+     * Convert from driver format to external caledar app data
+     */
+    public static function to_rcube_event(&$record)
+    {
+        if (!is_array($record)) {
+            return $record;
+        }
 
-  /**
-   * Remove the noreply flags from attendees
-   */
-  public static function clear_attandee_noreply(&$event)
-  {
-    foreach ((array)$event'attendees' as $i => $attendee) {
-      unset($event'attendees'$i'noreply');
-    }
-  }
-
-  /**
-   * Merge certain properties from the overlay event to the base event object
-   *
-   * @param array The event object to be altered
-   * @param array The overlay event object to be merged over $event
-   * @param array List of properties not allowed to be overwritten
-   */
-  public static function merge_exception_data(&$event, $overlay, $blacklist = null)
-  {
-    $forbidden = array('id','uid','recurrence','recurrence_date','thisandfuture','organizer','_attachments');
-
-    if (is_array($blacklist))
-      $forbidden = array_merge($forbidden, $blacklist);
-
-    foreach ($overlay as $prop => $value) {
-      if ($prop == 'start' || $prop == 'end') {
-        // handled by merge_exception_dates() below
-      }
-      else if ($prop == 'thisandfuture' && $overlay'_instance' == $event'_instance') {
-        $event$prop = $value;
-      }
-      else if ($prop0 != '_' && !in_array($prop, $forbidden))
-        $event$prop = $value;
-    }
+        $record'id' = $record'uid';
 
-    self::merge_exception_dates($event, $overlay);
-  }
-
-  /**
-   * Merge start/end date from the overlay event to the base event object
-   *
-   * @param array The event object to be altered
-   * @param array The overlay event object to be merged over $event
-   */
-  public static function merge_exception_dates(&$event, $overlay)
-  {
-    // compute date offset from the exception
-    if ($overlay'start' instanceof DateTime && $overlay'recurrence_date' instanceof DateTime) {
-      $date_offset = $overlay'recurrence_date'->diff($overlay'start');
-    }
+        if (!empty($record'_instance')) {
+            $record'id' .= '-' . $record'_instance';
 
-    foreach (array('start', 'end') as $prop) {
-      $value = $overlay$prop;
-      if (is_object($event$prop) && $event$prop instanceof DateTime) {
-        // set date value if overlay is an exception of the current instance
-        if (substr($overlay'_instance', 0, 8) == substr($event'_instance', 0, 8)) {
-          $event$prop->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));
-        }
-        // apply date offset
-        else if ($date_offset) {
-          $event$prop->add($date_offset);
+            if (empty($record'recurrence_id') && !empty($record'recurrence')) {
+                $record'recurrence_id' = $record'uid';
+            }
         }
-        // adjust time of the recurring event instance
-        $event$prop->setTime($value->format('G'), intval($value->format('i')), intval($value->format('s')));
-      }
-    }
-  }
-
-  /**
-   * Get events from source.
-   *
-   * @param  integer Event's new start (unix timestamp)
-   * @param  integer Event's new end (unix timestamp)
-   * @param  string  Search query (optional)
-   * @param  mixed   List of calendar IDs to load events from (either as array or comma-separated string)
-   * @param  boolean Include virtual events (optional)
-   * @param  integer Only list events modified since this time (unix timestamp)
-   * @return array A list of event records
-   */
-  public function load_events($start, $end, $search = null, $calendars = null, $virtual = 1, $modifiedsince = null)
-  {
-    if ($calendars && is_string($calendars))
-      $calendars = explode(',', $calendars);
-    else if (!$calendars) {
-      $this->_read_calendars();
-      $calendars = array_keys($this->calendars);
-    }
 
-    $query = array();
-    if ($modifiedsince)
-      $query = array('changed', '>=', $modifiedsince);
-
-    $events = $categories = array();
-    foreach ($calendars as $cid) {
-      if ($storage = $this->get_calendar($cid)) {
-        $events = array_merge($events, $storage->list_events($start, $end, $search, $virtual, $query));
-        $categories += $storage->categories;
-      }
-    }
+        // all-day events go from 12:00 - 13:00
+        if (is_a($record'start', 'DateTime') && $record'end' <= $record'start' && !empty($record'allday')) {
+            $record'end' = clone $record'start';
+            $record'end'->add(new DateInterval('PT1H'));
+        }
 
-    // add events from the address books birthday calendar
-    if (in_array(self::BIRTHDAY_CALENDAR_ID, $calendars)) {
-      $events = array_merge($events, $this->load_birthday_events($start, $end, $search, $modifiedsince));
-    }
+        // translate internal '_attachments' to external 'attachments' list
+        if (!empty($record'_attachments')) {
+            foreach ($record'_attachments' as $key => $attachment) {
+                if ($attachment !== false) {
+                    if (empty($attachment'name')) {
+                        $attachment'name' = $key;
+                    }
 
-    // add new categories to user prefs
-    $old_categories = $this->rc->config->get('calendar_categories', $this->default_categories);
-    if ($newcats = array_udiff(array_keys($categories), array_keys($old_categories), function($a, $b){ return strcasecmp($a, $b); })) {
-      foreach ($newcats as $category)
-        $old_categories$category = '';  // no color set yet
-      $this->rc->user->save_prefs(array('calendar_categories' => $old_categories));
-    }
+                    unset($attachment'path', $attachment'content');
+                    $attachments = $attachment;
+                }
+            }
 
-    array_walk($events, 'kolab_driver::to_rcube_event');
-    return $events;
-  }
-
-  /**
-   * Get number of events in the given calendar
-   *
-   * @param  mixed   List of calendar IDs to count events (either as array or comma-separated string)
-   * @param  integer Date range start (unix timestamp)
-   * @param  integer Date range end (unix timestamp)
-   * @return array   Hash array with counts grouped by calendar ID
-   */
-  public function count_events($calendars, $start, $end = null)
-  {
-      $counts = array();
-
-      if ($calendars && is_string($calendars))
-        $calendars = explode(',', $calendars);
-      else if (!$calendars) {
-        $this->_read_calendars();
-        $calendars = array_keys($this->calendars);
-      }
-
-      foreach ($calendars as $cid) {
-        if ($storage = $this->get_calendar($cid)) {
-            $counts$cid = $storage->count_events($start, $end);
-        }
-      }
-
-      return $counts;
-  }
-
-  /**
-   * Get a list of pending alarms to be displayed to the user
-   *
-   * @see calendar_driver::pending_alarms()
-   */
-  public function pending_alarms($time, $calendars = null)
-  {
-    $interval = 300;
-    $time -= $time % 60;
-    
-    $slot = $time;
-    $slot -= $slot % $interval;
-    
-    $last = $time - max(60, $this->rc->config->get('refresh_interval', 0));
-    $last -= $last % $interval;
-    
-    // only check for alerts once in 5 minutes
-    if ($last == $slot)
-      return array();
-    
-    if ($calendars && is_string($calendars))
-      $calendars = explode(',', $calendars);
-    
-    $time = $slot + $interval;
-    
-    $candidates = array();
-    $query = array(array('tags', '=', 'x-has-alarms'));
-
-    $this->_read_calendars();
-
-    foreach ($this->calendars as $cid => $calendar) {
-      // skip calendars with alarms disabled
-      if (!$calendar->alarms || ($calendars && !in_array($cid, $calendars)))
-        continue;
-
-      foreach ($calendar->list_events($time, $time + 86400 * 365, null, 1, $query) as $e) {
-        // add to list if alarm is set
-        $alarm = libcalendaring::get_next_alarm($e);
-        if ($alarm && $alarm'time' && $alarm'time' >= $last && in_array($alarm'action', $this->alarm_types)) {
-          $id = $alarm'id';  // use alarm-id as primary identifier
-          $candidates$id = array(
-            'id'       => $id,
-            'title'    => $e'title',
-            'location' => $e'location',
-            'start'    => $e'start',
-            'end'      => $e'end',
-            'notifyat' => $alarm'time',
-            'action'   => $alarm'action',
-          );
-        }
-      }
-    }
+            $record'attachments' = $attachments;
+        }
 
-    // get alarm information stored in local database
-    if (!empty($candidates)) {
-      $alarm_ids = array_map(array($this->rc->db, 'quote'), array_keys($candidates));
-      $result = $this->rc->db->query("SELECT *"
-        . " FROM " . $this->rc->db->table_name('kolab_alarms', true)
-        . " WHERE `alarm_id` IN (" . join(',', $alarm_ids) . ")"
-          . " AND `user_id` = ?",
-        $this->rc->user->ID
-      );
-
-      while ($result && ($e = $this->rc->db->fetch_assoc($result))) {
-        $dbdata$e'alarm_id' = $e;
-      }
-    }
-    
-    $alarms = array();
-    foreach ($candidates as $id => $alarm) {
-      // skip dismissed alarms
-      if ($dbdata$id'dismissed')
-        continue;
-      
-      // snooze function may have shifted alarm time
-      $notifyat = $dbdata$id'notifyat' ? strtotime($dbdata$id'notifyat') : $alarm'notifyat';
-      if ($notifyat <= $time)
-        $alarms = $alarm;
-    }
-    
-    return $alarms;
-  }
-
-  /**
-   * Feedback after showing/sending an alarm notification
-   *
-   * @see calendar_driver::dismiss_alarm()
-   */
-  public function dismiss_alarm($alarm_id, $snooze = 0)
-  {
-    $alarms_table = $this->rc->db->table_name('kolab_alarms', true);
-    // delete old alarm entry
-    $this->rc->db->query("DELETE FROM $alarms_table"
-      . " WHERE `alarm_id` = ? AND `user_id` = ?",
-      $alarm_id,
-      $this->rc->user->ID
-    );
-
-    // set new notifyat time or unset if not snoozed
-    $notifyat = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;
-
-    $query = $this->rc->db->query("INSERT INTO $alarms_table"
-      . " (`alarm_id`, `user_id`, `dismissed`, `notifyat`)"
-      . " VALUES (?, ?, ?, ?)",
-      $alarm_id,
-      $this->rc->user->ID,
-      $snooze > 0 ? 0 : 1,
-      $notifyat
-    );
-
-    return $this->rc->db->affected_rows($query);
-  }
-
-  /**
-   * List attachments from the given event
-   */
-  public function list_attachments($event)
-  {
-    if (!($storage = $this->get_calendar($event'calendar')))
-      return false;
-
-    $event = $storage->get_event($event'id');
-
-    return $event'attachments';
-  }
-
-  /**
-   * Get attachment properties
-   */
-  public function get_attachment($id, $event)
-  {
-    if (!($storage = $this->get_calendar($event'calendar')))
-      return false;
-
-    // get old revision of event
-    if ($event'rev') {
-      $event = $this->get_event_revison($event, $event'rev', true);
-    }
-    else {
-      $event = $storage->get_event($event'id');
-    }
+        if (!empty($record'attendees')) {
+            foreach ((array) $record'attendees' as $i => $attendee) {
+                if (isset($attendee'delegated-from') && is_array($attendee'delegated-from')) {
+                    $record'attendees'$i'delegated-from' = join(', ', $attendee'delegated-from');
+                }
+                if (isset($attendee'delegated-to') && is_array($attendee'delegated-to')) {
+                    $record'attendees'$i'delegated-to' = join(', ', $attendee'delegated-to');
+                }
+            }
+        }
 
-    if ($event) {
-      $attachments = isset($event'_attachments') ? $event'_attachments' : $event'attachments';
-      foreach ((array) $attachments as $att) {
-        if ($att'id' == $id) {
-          return $att;
+        // Roundcube only supports one category assignment
+        if (!empty($record'categories') && is_array($record'categories')) {
+            $record'categories' = $record'categories'0;
         }
-      }
-    }
-  }
-
-  /**
-   * Get attachment body
-   * @see calendar_driver::get_attachment_body()
-   */
-  public function get_attachment_body($id, $event)
-  {
-    if (!($cal = $this->get_calendar($event'calendar')))
-      return false;
-
-    // get old revision of event
-    if ($event'rev') {
-      if (empty($this->bonnie_api)) {
-        return false;
-      }
 
-      $cid = substr($id, 4);
+        // the cancelled flag transltes into status=CANCELLED
+        if (!empty($record'cancelled')) {
+            $record'status' = 'CANCELLED';
+        }
 
-      // call Bonnie API and get the raw mime message
-      list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
-      if ($msg_raw = $this->bonnie_api->rawdata('event', $uid, $event'rev', $mailbox, $msguid)) {
-        // parse the message and find the part with the matching content-id
-        $message = rcube_mime::parse_message($msg_raw);
-        foreach ((array)$message->parts as $part) {
-          if ($part->headers'content-id' && trim($part->headers'content-id', '<>') == $cid) {
-            return $part->body;
-          }
+        // The web client only supports DISPLAY type of alarms
+        if (!empty($record'alarms')) {
+            $record'alarms' = preg_replace('/:A-Z+$/', ':DISPLAY', $record'alarms');
         }
-      }
 
-      return false;
-    }
+        // remove empty recurrence array
+        if (empty($record'recurrence')) {
+            unset($record'recurrence');
+        }
+        // clean up exception data
+        else if (!empty($record'recurrence''EXCEPTIONS')) {
+            array_walk($record'recurrence''EXCEPTIONS', function(&$exception) {
+                unset($exception'_mailbox', $exception'_msguid',
+                    $exception'_formatobj', $exception'_attachments'
+                );
+            });
+        }
 
-    return $cal->get_attachment_body($id, $event);
-  }
-
-  /**
-   * Build a struct representing the given message reference
-   *
-   * @see calendar_driver::get_message_reference()
-   */
-  public function get_message_reference($uri_or_headers, $folder = null)
-  {
-      if (is_object($uri_or_headers)) {
-          $uri_or_headers = kolab_storage_config::get_message_uri($uri_or_headers, $folder);
-      }
-
-      if (is_string($uri_or_headers)) {
-          return kolab_storage_config::get_message_reference($uri_or_headers, 'event');
-      }
-
-      return false;
-  }
-
-  /**
-   * List availabale categories
-   * The default implementation reads them from config/user prefs
-   */
-  public function list_categories()
-  {
-    // FIXME: complete list with categories saved in config objects (KEP:12)
-    return $this->rc->config->get('calendar_categories', $this->default_categories);
-  }
-
-  /**
-   * Create instances of a recurring event
-   *
-   * @param array  Hash array with event properties
-   * @param object DateTime Start date of the recurrence window
-   * @param object DateTime End date of the recurrence window
-   * @return array List of recurring event instances
-   */
-  public function get_recurring_events($event, $start, $end = null)
-  {
-    // load the given event data into a libkolabxml container
-    if (!$event'_formatobj') {
-      $event_xml = new kolab_format_event();
-      $event_xml->set($event);
-      $event'_formatobj' = $event_xml;
-    }
+        unset($record'_mailbox', $record'_msguid', $record'_type', $record'_size',
+            $record'_formatobj', $record'_attachments', $record'exceptions', $record'x-custom'
+        );
 
-    $this->_read_calendars();
-    $storage = reset($this->calendars);
-    return $storage->get_recurring_events($event, $start, $end);
-  }
-
-  /**
-   *
-   */
-  private function get_recurrence_count($event, $dtstart)
-  {
-    // load the given event data into a libkolabxml container
-    if (!$event'_formatobj') {
-      $event_xml = new kolab_format_event();
-      $event_xml->set($event);
-      $event'_formatobj' = $event_xml;
+        return $record;
     }
 
-    // use libkolab to compute recurring events
-    $recurrence = new kolab_date_recurrence($event'_formatobj');
+    /**
+     *
+     */
+    public static function from_rcube_event($event, $old = )
+    {
+        kolab_format::merge_attachments($event, $old);
 
-    $count = 0;
-    while (($next_event = $recurrence->next_instance()) && $next_event'start' <= $dtstart && $count < 1000) {
-      $count++;
+        return $event;
     }
 
-    return $count;
-  }
-
-  /**
-   * Fetch free/busy information from a person within the given range
-   */
-  public function get_freebusy_list($email, $start, $end)
-  {
-    if (empty($email)/* || $end < time()*/)
-      return false;
-
-    // map vcalendar fbtypes to internal values
-    $fbtypemap = array(
-      'FREE' => calendar::FREEBUSY_FREE,
-      'BUSY-TENTATIVE' => calendar::FREEBUSY_TENTATIVE,
-      'X-OUT-OF-OFFICE' => calendar::FREEBUSY_OOF,
-      'OOF' => calendar::FREEBUSY_OOF);
-
-    // ask kolab server first
-    try {
-      $request_config = array(
-        'store_body'       => true,
-        'follow_redirects' => true,
-      );
-      $request  = libkolab::http_request(kolab_storage::get_freebusy_url($email), 'GET', $request_config);
-      $response = $request->send();
-
-      // authentication required
-      if ($response->getStatus() == 401) {
-        $request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION'password'));
-        $response = $request->send();
-      }
-
-      if ($response->getStatus() == 200)
-        $fbdata = $response->getBody();
-
-      unset($request, $response);
-    }
-    catch (Exception $e) {
-      PEAR::raiseError("Error fetching free/busy information: " . $e->getMessage());
-    }
 
-    // get free-busy url from contacts
-    if (!$fbdata) {
-      $fburl = null;
-      foreach ((array)$this->rc->config->get('autocomplete_addressbooks', 'sql') as $book) {
-        $abook = $this->rc->get_address_book($book);
+    /**
+     * Set CSS class according to the event's attendde partstat
+     */
+    public static function add_partstat_class($event, $partstats, $user = null)
+    {
+        // set classes according to PARTSTAT
+        if (!empty($event'attendees')) {
+            $user_emails = libcalendaring::get_instance()->get_user_emails($user);
+            $partstat = 'UNKNOWN';
 
-        if ($result = $abook->search(array('email'), $email, true, true, true/*, 'freebusyurl'*/)) {
-          while ($contact = $result->iterate()) {
-            if ($fburl = $contact'freebusyurl') {
-              $fbdata = @file_get_contents($fburl);
-              break;
+            foreach ($event'attendees' as $attendee) {
+                if (in_array($attendee'email', $user_emails)) {
+                    $partstat = $attendee'status';
+                    break;
+                }
             }
-          }
-        }
 
-        if ($fbdata)
-          break;
-      }
-    }
+            if (in_array($partstat, $partstats)) {
+                $event'className' = trim($event'className' . ' fc-invitation-' . strtolower($partstat));
+            }
+        }
 
-    // parse free-busy information using Horde classes
-    if ($fbdata) {
-      $ical = $this->cal->get_ical();
-      $ical->import($fbdata);
-      if ($fb = $ical->freebusy) {
-        $result = array();
-        foreach ($fb'periods' as $tuple) {
-          list($from, $to, $type) = $tuple;
-          $result = array($from->format('U'), $to->format('U'), isset($fbtypemap$type) ? $fbtypemap$type : calendar::FREEBUSY_BUSY);
+        return $event;
+    }
+
+    /**
+     * Provide a list of revisions for the given event
+     *
+     * @param array $event Hash array with event properties
+     *
+     * @return array List of changes, each as a hash array
+     * @see calendar_driver::get_event_changelog()
+     */
+    public function get_event_changelog($event)
+    {
+        if (empty($this->bonnie_api)) {
+            return false;
         }
 
-        // we take 'dummy' free-busy lists as "unknown"
-        if (empty($result) && !empty($fb'comment') && stripos($fb'comment', 'dummy'))
-          return false;
+        list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
 
-        // set period from $start till the begin of the free-busy information as 'unknown'
-        if ($fb'start' && ($fbstart = $fb'start'->format('U')) && $start < $fbstart) {
-          array_unshift($result, array($start, $fbstart, calendar::FREEBUSY_UNKNOWN));
+        $result = $this->bonnie_api->changelog('event', $uid, $mailbox, $msguid);
+        if (is_array($result) && $result'uid' == $uid) {
+            return $result'changes';
         }
-        // pad period till $end with status 'unknown'
-        if ($fb'end' && ($fbend = $fb'end'->format('U')) && $fbend < $end) {
-          $result = array($fbend, $end, calendar::FREEBUSY_UNKNOWN);
-        }
-
-        return $result;
-      }
-    }
 
-    return false;
-  }
-
-  /**
-   * Handler to push folder triggers when sent from client.
-   * Used to push free-busy changes asynchronously after updating an event
-   */
-  public function push_freebusy()
-  {
-    // make shure triggering completes
-    set_time_limit(0);
-    ignore_user_abort(true);
-
-    $cal = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
-    if (!($cal = $this->get_calendar($cal)))
-      return false;
-
-    // trigger updates on folder
-    $trigger = $cal->storage->trigger();
-    if (is_object($trigger) && is_a($trigger, 'PEAR_Error')) {
-      rcube::raise_error(array(
-        'code' => 900, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Failed triggering folder. Error was " . $trigger->getMessage()),
-        true, false);
+        return false;
     }
 
-    exit;
-  }
-
+    /**
+     * Get a list of property changes beteen two revisions of an event
+     *
+     * @param array $event Hash array with event properties
+     * @param mixed $rev1  Old Revision
+     * @param mixed $rev2  New Revision
+     *
+     * @return array List of property changes, each as a hash array
+     * @see calendar_driver::get_event_diff()
+     */
+    public function get_event_diff($event, $rev1, $rev2)
+    {
+        if (empty($this->bonnie_api)) {
+            return false;
+        }
 
-  /**
-   * Convert from driver format to external caledar app data
-   */
-  public static function to_rcube_event(&$record)
-  {
-    if (!is_array($record))
-      return $record;
+        list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+
+        // get diff for the requested recurrence instance
+        $instance_id = $event'id' != $uid ? substr($event'id', strlen($uid) + 1) : null;
+
+        // call Bonnie API
+        $result = $this->bonnie_api->diff('event', $uid, $rev1, $rev2, $mailbox, $msguid, $instance_id);
+
+        if (is_array($result) && $result'uid' == $uid) {
+            $result'rev1' = $rev1;
+            $result'rev2' = $rev2;
+
+            $keymap = 
+                'dtstart'  => 'start',
+                'dtend'    => 'end',
+                'dstamp'   => 'changed',
+                'summary'  => 'title',
+                'alarm'    => 'alarms',
+                'attendee' => 'attendees',
+                'attach'   => 'attachments',
+                'rrule'    => 'recurrence',
+                'transparency' => 'free_busy',
+                'classification' => 'sensitivity',
+                'lastmodified-date' => 'changed',
+            ;
+
+            $prop_keymaps = 
+                'attachments' => 'fmttype' => 'mimetype', 'label' => 'name',
+                'attendees'   => 'partstat' => 'status',
+            ;
+
+            $special_changes = ;
+
+            // map kolab event properties to keys the client expects
+            array_walk($result'changes', function(&$change, $i) use ($keymap, $prop_keymaps, $special_changes) {
+                if (array_key_exists($change'property', $keymap)) {
+                    $change'property' = $keymap$change'property';
+                }
+                // translate free_busy values
+                if ($change'property' == 'free_busy') {
+                    $change'old' = !empty($old'old') ? 'free' : 'busy';
+                    $change'new' = !empty($old'new') ? 'free' : 'busy';
+                }
 
-    $record'id' = $record'uid';
+                // map alarms trigger value
+                if ($change'property' == 'alarms') {
+                    if (!empty($change'old''trigger')) {
+                        $change'old''trigger' = $change'old''trigger''value';
+                    }
+                    if (!empty($change'new''trigger')) {
+                        $change'new''trigger' = $change'new''trigger''value';
+                    }
+                }
 
-    if ($record'_instance') {
-      $record'id' .= '-' . $record'_instance';
+                // make all property keys uppercase
+                if ($change'property' == 'recurrence') {
+                    $special_changes'recurrence' = $i;
+                    foreach ('old', 'new' as $m) {
+                        if (!empty($change$m)) {
+                            $props = ;
+                            foreach ($change$m as $k => $v) {
+                                $propsstrtoupper($k) = $v;
+                            }
+                            $change$m = $props;
+                        }
+                    }
+                }
 
-      if (!$record'recurrence_id' && !empty($record'recurrence'))
-        $record'recurrence_id' = $record'uid';
-    }
+                // map property keys names
+                if (!empty($prop_keymaps$change'property')) {
+                    foreach ($prop_keymaps$change'property' as $k => $dest) {
+                        if (!empty($change'old') && array_key_exists($k, $change'old')) {
+                            $change'old'$dest = $change'old'$k;
+                            unset($change'old'$k);
+                        }
+                        if (!empty($change'new') && array_key_exists($k, $change'new')) {
+                            $change'new'$dest = $change'new'$k;
+                            unset($change'new'$k);
+                        }
+                    }
+                }
 
-    // all-day events go from 12:00 - 13:00
-    if (is_a($record'start', 'DateTime') && $record'end' <= $record'start' && $record'allday') {
-      $record'end' = clone $record'start';
-      $record'end'->add(new DateInterval('PT1H'));
-    }
+                if ($change'property' == 'exdate') {
+                    $special_changes'exdate' = $i;
+                }
+                else if ($change'property' == 'rdate') {
+                    $special_changes'rdate' = $i;
+                }
+            });
 
-    // translate internal '_attachments' to external 'attachments' list
-    if (!empty($record'_attachments')) {
-      foreach ($record'_attachments' as $key => $attachment) {
-        if ($attachment !== false) {
-          if (!$attachment'name')
-            $attachment'name' = $key;
+            // merge some recurrence changes
+            foreach ('exdate', 'rdate' as $prop) {
+                if (array_key_exists($prop, $special_changes)) {
+                    $exdate = $result'changes'$special_changes$prop;
+                    if (array_key_exists('recurrence', $special_changes)) {
+                        $recurrence = &$result'changes'$special_changes'recurrence';
+                    }
+                    else {
+                        $i = count($result'changes');
+                        $result'changes'$i = 'property' => 'recurrence', 'old' => , 'new' => ;
+                        $recurrence = &$result'changes'$i'recurrence';
+                    }
+                    $key = strtoupper($prop);
+                    $recurrence'old'$key = $exdate'old';
+                    $recurrence'new'$key = $exdate'new';
+                    unset($result'changes'$special_changes$prop);
+                }
+            }
 
-          unset($attachment'path', $attachment'content');
-          $attachments = $attachment;
+            return $result;
         }
-      }
 
-      $record'attachments' = $attachments;
+        return false;
     }
 
-    if (!empty($record'attendees')) {
-      foreach ((array)$record'attendees' as $i => $attendee) {
-        if (is_array($attendee'delegated-from')) {
-          $record'attendees'$i'delegated-from' = join(', ', $attendee'delegated-from');
-        }
-        if (is_array($attendee'delegated-to')) {
-          $record'attendees'$i'delegated-to' = join(', ', $attendee'delegated-to');
+    /**
+     * Return full data of a specific revision of an event
+     *
+     * @param array Hash array with event properties
+     * @param mixed $rev Revision number
+     *
+     * @return array Event object as hash array
+     * @see calendar_driver::get_event_revison()
+     */
+    public function get_event_revison($event, $rev, $internal = false)
+    {
+        if (empty($this->bonnie_api)) {
+            return false;
         }
-      }
-    }
 
-    // Roundcube only supports one category assignment
-    if (is_array($record'categories'))
-      $record'categories' = $record'categories'0;
+        $eventid = $event'id';
+        $calid   = $event'calendar';
 
-    // the cancelled flag transltes into status=CANCELLED
-    if ($record'cancelled')
-      $record'status' = 'CANCELLED';
+        list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
 
-    // The web client only supports DISPLAY type of alarms
-    if (!empty($record'alarms'))
-      $record'alarms' = preg_replace('/:A-Z+$/', ':DISPLAY', $record'alarms');
+        // call Bonnie API
+        $result = $this->bonnie_api->get('event', $uid, $rev, $mailbox, $msguid);
+        if (is_array($result) && $result'uid' == $uid && !empty($result'xml')) {
+            $format = kolab_format::factory('event');
+            $format->load($result'xml');
+            $event = $format->to_array();
+            $format->get_attachments($event, true);
 
-    // remove empty recurrence array
-    if (empty($record'recurrence'))
-      unset($record'recurrence');
+            // get the right instance from a recurring event
+            if ($eventid != $event'uid') {
+                $instance_id = substr($eventid, strlen($event'uid') + 1);
 
-    // clean up exception data
-    if (is_array($record'recurrence''EXCEPTIONS')) {
-      array_walk($record'recurrence''EXCEPTIONS', function(&$exception) {
-        unset($exception'_mailbox', $exception'_msguid', $exception'_formatobj', $exception'_attachments');
-      });
-    }
+                // check for recurrence exception first
+                if ($instance = $format->get_instance($instance_id)) {
+                    $event = $instance;
+                }
+                else {
+                    // not a exception, compute recurrence...
+                    $event'_formatobj' = $format;
+                    $recurrence_date = rcube_utils::anytodatetime($instance_id, $event'start'->getTimezone());
+                    foreach ($this->get_recurring_events($event, $event'start', $recurrence_date) as $instance) {
+                        if ($instance'id' == $eventid) {
+                            $event = $instance;
+                            break;
+                        }
+                    }
+                }
+            }
 
-    unset($record'_mailbox', $record'_msguid', $record'_type', $record'_size',
-      $record'_formatobj', $record'_attachments', $record'exceptions', $record'x-custom');
-
-    return $record;
-  }
-
-  /**
-   *
-   */
-  public static function from_rcube_event($event, $old = array())
-  {
-    kolab_format::merge_attachments($event, $old);
-
-    return $event;
-  }
-
-
-  /**
-   * Set CSS class according to the event's attendde partstat
-   */
-  public static function add_partstat_class($event, $partstats, $user = null)
-  {
-    // set classes according to PARTSTAT
-    if (is_array($event'attendees')) {
-      $user_emails = libcalendaring::get_instance()->get_user_emails($user);
-      $partstat = 'UNKNOWN';
-      foreach ($event'attendees' as $attendee) {
-        if (in_array($attendee'email', $user_emails)) {
-          $partstat = $attendee'status';
-          break;
-        }
-      }
-
-      if (in_array($partstat, $partstats)) {
-        $event'className' = trim($event'className' . ' fc-invitation-' . strtolower($partstat));
-      }
-    }
+            if ($format->is_valid()) {
+                $event'calendar' = $calid;
+                $event'rev'      = $result'rev';
 
-    return $event;
-  }
-
-  /**
-   * Provide a list of revisions for the given event
-   *
-   * @param array  $event Hash array with event properties
-   *
-   * @return array List of changes, each as a hash array
-   * @see calendar_driver::get_event_changelog()
-   */
-  public function get_event_changelog($event)
-  {
-    if (empty($this->bonnie_api)) {
-      return false;
+                return $internal ? $event : self::to_rcube_event($event);
+            }
+        }
+
+        return false;
     }
 
-    list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+    /**
+     * Command the backend to restore a certain revision of an event.
+     * This shall replace the current event with an older version.
+     *
+     * @param mixed $event UID string or hash array with event properties:
+     *              id: Event identifier
+     *        calendar: Calendar identifier
+     * @param mixed $rev   Revision number
+     *
+     * @return bool True on success, False on failure
+     */
+    public function restore_event_revision($event, $rev)
+    {
+        if (empty($this->bonnie_api)) {
+            return false;
+        }
 
-    $result = $this->bonnie_api->changelog('event', $uid, $mailbox, $msguid);
-    if (is_array($result) && $result'uid' == $uid) {
-      return $result'changes';
-    }
+        list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
 
-    return false;
-  }
-
-  /**
-   * Get a list of property changes beteen two revisions of an event
-   *
-   * @param array  $event Hash array with event properties
-   * @param mixed  $rev1  Old Revision
-   * @param mixed  $rev2  New Revision
-   *
-   * @return array List of property changes, each as a hash array
-   * @see calendar_driver::get_event_diff()
-   */
-  public function get_event_diff($event, $rev1, $rev2)
-  {
-    if (empty($this->bonnie_api)) {
-      return false;
-    }
+        $calendar = $this->get_calendar($event'calendar');
+        $success  = false;
 
-    list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
-
-    // get diff for the requested recurrence instance
-    $instance_id = $event'id' != $uid ? substr($event'id', strlen($uid) + 1) : null;
-
-    // call Bonnie API
-    $result = $this->bonnie_api->diff('event', $uid, $rev1, $rev2, $mailbox, $msguid, $instance_id);
-    if (is_array($result) && $result'uid' == $uid) {
-      $result'rev1' = $rev1;
-      $result'rev2' = $rev2;
-
-      $keymap = array(
-        'dtstart'  => 'start',
-        'dtend'    => 'end',
-        'dstamp'   => 'changed',
-        'summary'  => 'title',
-        'alarm'    => 'alarms',
-        'attendee' => 'attendees',
-        'attach'   => 'attachments',
-        'rrule'    => 'recurrence',
-        'transparency' => 'free_busy',
-        'classification' => 'sensitivity',
-        'lastmodified-date' => 'changed',
-      );
-      $prop_keymaps = array(
-        'attachments' => array('fmttype' => 'mimetype', 'label' => 'name'),
-        'attendees'   => array('partstat' => 'status'),
-      );
-      $special_changes = array();
-
-      // map kolab event properties to keys the client expects
-      array_walk($result'changes', function(&$change, $i) use ($keymap, $prop_keymaps, $special_changes) {
-        if (array_key_exists($change'property', $keymap)) {
-          $change'property' = $keymap$change'property';
-        }
-        // translate free_busy values
-        if ($change'property' == 'free_busy') {
-          $change'old' = $old'old' ? 'free' : 'busy';
-          $change'new' = $old'new' ? 'free' : 'busy';
-        }
-        // map alarms trigger value
-        if ($change'property' == 'alarms') {
-          if (is_array($change'old') && is_array($change'old''trigger'))
-            $change'old''trigger' = $change'old''trigger''value';
-          if (is_array($change'new') && is_array($change'new''trigger'))
-            $change'new''trigger' = $change'new''trigger''value';
-        }
-        // make all property keys uppercase
-        if ($change'property' == 'recurrence') {
-          $special_changes'recurrence' = $i;
-          foreach (array('old','new') as $m) {
-            if (is_array($change$m)) {
-              $props = array();
-              foreach ($change$m as $k => $v)
-                $propsstrtoupper($k) = $v;
-              $change$m = $props;
-            }
-          }
-        }
-        // map property keys names
-        if (is_array($prop_keymaps$change'property')) {
-          foreach ($prop_keymaps$change'property' as $k => $dest) {
-            if (is_array($change'old') && array_key_exists($k, $change'old')) {
-              $change'old'$dest = $change'old'$k;
-              unset($change'old'$k);
-            }
-            if (is_array($change'new') && array_key_exists($k, $change'new')) {
-              $change'new'$dest = $change'new'$k;
-              unset($change'new'$k);
-            }
-          }
-        }
-
-        if ($change'property' == 'exdate') {
-          $special_changes'exdate' = $i;
-        }
-        else if ($change'property' == 'rdate') {
-          $special_changes'rdate' = $i;
-        }
-      });
-
-      // merge some recurrence changes
-      foreach (array('exdate','rdate') as $prop) {
-        if (array_key_exists($prop, $special_changes)) {
-          $exdate = $result'changes'$special_changes$prop;
-          if (array_key_exists('recurrence', $special_changes)) {
-            $recurrence = &$result'changes'$special_changes'recurrence';
-          }
-          else {
-            $i = count($result'changes');
-            $result'changes'$i = array('property' => 'recurrence', 'old' => array(), 'new' => array());
-            $recurrence = &$result'changes'$i'recurrence';
-          }
-          $key = strtoupper($prop);
-          $recurrence'old'$key = $exdate'old';
-          $recurrence'new'$key = $exdate'new';
-          unset($result'changes'$special_changes$prop);
-        }
-      }
-
-      return $result;
-    }
+        if ($calendar && $calendar->storage && $calendar->editable) {
+            if ($raw_msg = $this->bonnie_api->rawdata('event', $uid, $rev, $mailbox)) {
+                $imap = $this->rc->get_storage();
+
+                // insert $raw_msg as new message
+                if ($imap->save_message($calendar->storage->name, $raw_msg, null, false)) {
+                    $success = true;
+
+                    // delete old revision from imap and cache
+                    $imap->delete_message($msguid, $calendar->storage->name);
+                    $calendar->storage->cache->set($msguid, false);
+                }
+            }
+        }
 
-    return false;
-  }
-
-  /**
-   * Return full data of a specific revision of an event
-   *
-   * @param array  Hash array with event properties
-   * @param mixed  $rev Revision number
-   *
-   * @return array Event object as hash array
-   * @see calendar_driver::get_event_revison()
-   */
-  public function get_event_revison($event, $rev, $internal = false)
-  {
-    if (empty($this->bonnie_api)) {
-      return false;
+        return $success;
     }
 
-    $eventid = $event'id';
-    $calid = $event'calendar';
-    list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+    /**
+     * Helper method to resolved the given event identifier into uid and folder
+     *
+     * @return array (uid,folder,msguid) tuple
+     */
+    private function _resolve_event_identity($event)
+    {
+        $mailbox = $msguid = null;
 
-    // call Bonnie API
-    $result = $this->bonnie_api->get('event', $uid, $rev, $mailbox, $msguid);
-    if (is_array($result) && $result'uid' == $uid && !empty($result'xml')) {
-      $format = kolab_format::factory('event');
-      $format->load($result'xml');
-      $event = $format->to_array();
-      $format->get_attachments($event, true);
+        if (is_array($event)) {
+            $uid = !empty($event'uid') ? $event'uid' : $event'id';
 
-      // get the right instance from a recurring event
-      if ($eventid != $event'uid') {
-        $instance_id = substr($eventid, strlen($event'uid') + 1);
+            if (($cal = $this->get_calendar($event'calendar')) && !($cal instanceof kolab_invitation_calendar)) {
+                $mailbox = $cal->get_mailbox_id();
 
-        // check for recurrence exception first
-        if ($instance = $format->get_instance($instance_id)) {
-          $event = $instance;
+                // get event object from storage in order to get the real object uid an msguid
+                if ($ev = $cal->get_event($event'id')) {
+                    $msguid = $ev'_msguid';
+                    $uid = $ev'uid';
+                }
+            }
         }
         else {
-          // not a exception, compute recurrence...
-          $event'_formatobj' = $format;
-          $recurrence_date = rcube_utils::anytodatetime($instance_id, $event'start'->getTimezone());
-          foreach ($this->get_recurring_events($event, $event'start', $recurrence_date) as $instance) {
-            if ($instance'id' == $eventid) {
-              $event = $instance;
-              break;
-            }
-          }
-        }
-      }
-
-      if ($format->is_valid()) {
-        $event'calendar' = $calid;
-        $event'rev' = $result'rev';
-        return $internal ? $event : self::to_rcube_event($event);
-      }
-    }
+            $uid = $event;
 
-    return false;
-  }
-
-  /**
-   * Command the backend to restore a certain revision of an event.
-   * This shall replace the current event with an older version.
-   *
-   * @param mixed  UID string or hash array with event properties:
-   *        id: Event identifier
-   *  calendar: Calendar identifier
-   * @param mixed  $rev Revision number
-   *
-   * @return boolean True on success, False on failure
-   */
-  public function restore_event_revision($event, $rev)
-  {
-    if (empty($this->bonnie_api)) {
-      return false;
-    }
-
-    list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
-    $calendar = $this->get_calendar($event'calendar');
-    $success = false;
+            // get event object from storage in order to get the real object uid an msguid
+            if ($ev = $this->get_event($event)) {
+                $mailbox = $ev'_mailbox';
+                $msguid  = $ev'_msguid';
+                $uid     = $ev'uid';
+            }
+        }
 
-    if ($calendar && $calendar->storage && $calendar->editable) {
-      if ($raw_msg = $this->bonnie_api->rawdata('event', $uid, $rev, $mailbox)) {
-        $imap = $this->rc->get_storage();
+        return array($uid, $mailbox, $msguid);
+    }
+
+    /**
+     * Callback function to produce driver-specific calendar create/edit form
+     *
+     * @param string Request action 'form-edit|form-new'
+     * @param array  Calendar properties (e.g. id, color)
+     * @param array  Edit form fields
+     *
+     * @return string HTML content of the form
+     */
+    public function calendar_form($action, $calendar, $formfields)
+    {
+        $special_calendars = 
+            self::BIRTHDAY_CALENDAR_ID,
+            self::INVITATIONS_CALENDAR_PENDING,
+            self::INVITATIONS_CALENDAR_DECLINED
+        ;
+
+        // show default dialog for birthday calendar
+        if (in_array($calendar'id', $special_calendars)) {
+            if ($calendar'id' != self::BIRTHDAY_CALENDAR_ID) {
+                unset($formfields'showalarms');
+            }
 
-        // insert $raw_msg as new message
-        if ($imap->save_message($calendar->storage->name, $raw_msg, null, false)) {
-          $success = true;
+            // General tab
+            $form'props' = 
+                'name'   => $this->rc->gettext('properties'),
+                'fields' => $formfields,
+            ;
 
-          // delete old revision from imap and cache
-          $imap->delete_message($msguid, $calendar->storage->name);
-          $calendar->storage->cache->set($msguid, false);
+            return kolab_utils::folder_form($form, '', 'calendar');
         }
-      }
-    }
 
-    return $success;
-  }
-
-  /**
-   * Helper method to resolved the given event identifier into uid and folder
-   *
-   * @return array (uid,folder,msguid) tuple
-   */
-  private function _resolve_event_identity($event)
-  {
-    $mailbox = $msguid = null;
-    if (is_array($event)) {
-      $uid = $event'uid' ?: $event'id';
-      if (($cal = $this->get_calendar($event'calendar')) && !($cal instanceof kolab_invitation_calendar)) {
-        $mailbox = $cal->get_mailbox_id();
-
-        // get event object from storage in order to get the real object uid an msguid
-        if ($ev = $cal->get_event($event'id')) {
-          $msguid = $ev'_msguid';
-          $uid = $ev'uid';
-        }
-      }
-    }
-    else {
-      $uid = $event;
-
-      // get event object from storage in order to get the real object uid an msguid
-      if ($ev = $this->get_event($event)) {
-        $mailbox = $ev'_mailbox';
-        $msguid = $ev'_msguid';
-        $uid = $ev'uid';
-      }
-    }
+        $this->_read_calendars();
 
-    return array($uid, $mailbox, $msguid);
-  }
-
-  /**
-   * Callback function to produce driver-specific calendar create/edit form
-   *
-   * @param string Request action 'form-edit|form-new'
-   * @param array  Calendar properties (e.g. id, color)
-   * @param array  Edit form fields
-   *
-   * @return string HTML content of the form
-   */
-  public function calendar_form($action, $calendar, $formfields)
-  {
-    // show default dialog for birthday calendar
-    if (in_array($calendar'id', array(self::BIRTHDAY_CALENDAR_ID, self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED))) {
-      if ($calendar'id' != self::BIRTHDAY_CALENDAR_ID)
-        unset($formfields'showalarms');
-
-      // General tab
-      $form'props' = array(
-        'name'   => $this->rc->gettext('properties'),
-        'fields' => $formfields,
-      );
-
-      return kolab_utils::folder_form($form, '', 'calendar');
-    }
+        if (!empty($calendar'id') && ($cal = $this->calendars$calendar'id')) {
+            $folder = $cal->get_realname(); // UTF7
+            $color  = $cal->get_color();
+        }
+        else {
+            $folder = '';
+            $color  = '';
+        }
 
-    $this->_read_calendars();
+        $hidden_fields = 'name' => 'oldname', 'value' => $folder;
 
-    if ($calendar'id' && ($cal = $this->calendars$calendar'id')) {
-      $folder = $cal->get_realname(); // UTF7
-      $color  = $cal->get_color();
-    }
-    else {
-      $folder = '';
-      $color  = '';
-    }
+        $storage = $this->rc->get_storage();
+        $delim   = $storage->get_hierarchy_delimiter();
+        $form    = ;
 
-    $hidden_fields = array('name' => 'oldname', 'value' => $folder);
+        if (strlen($folder)) {
+            $path_imap = explode($delim, $folder);
+            array_pop($path_imap);  // pop off name part
+            $path_imap = implode($delim, $path_imap);
 
-    $storage = $this->rc->get_storage();
-    $delim   = $storage->get_hierarchy_delimiter();
-    $form   = array();
+            $options = $storage->folder_info($folder);
+        }
+        else {
+            $path_imap = '';
+        }
 
-    if (strlen($folder)) {
-      $path_imap = explode($delim, $folder);
-      array_pop($path_imap);  // pop off name part
-      $path_imap = implode($delim, $path_imap);
+        // General tab
+        $form'props' = 
+            'name'   => $this->rc->gettext('properties'),
+            'fields' => ,
+        ;
+
+        $protected = !empty($options) && (!empty($options'norename') || !empty($options'protected'));
+        // Disable folder name input
+        if ($protected) {
+            $input_name = new html_hiddenfield('name' => 'name', 'id' => 'calendar-name');
+            $formfields'name''value' = kolab_storage::object_name($folder)
+                . $input_name->show($folder);
+        }
 
-      $options = $storage->folder_info($folder);
-    }
-    else {
-      $path_imap = '';
-    }
+        // calendar name (default field)
+        $form'props''fields''location' = $formfields'name';
 
-    // General tab
-    $form'props' = array(
-      'name'   => $this->rc->gettext('properties'),
-      'fields' => array(),
-    );
-
-    // Disable folder name input
-    if (!empty($options) && ($options'norename' || $options'protected')) {
-      $input_name = new html_hiddenfield(array('name' => 'name', 'id' => 'calendar-name'));
-      $formfields'name''value' = kolab_storage::object_name($folder)
-        . $input_name->show($folder);
-    }
+        if ($protected) {
+            // prevent user from moving folder
+            $hidden_fields = 'name' => 'parent', 'value' => $path_imap;
+        }
+        else {
+            $select = kolab_storage::folder_selector('event', 'name' => 'parent', 'id' => 'calendar-parent', $folder);
 
-    // calendar name (default field)
-    $form'props''fields''location' = $formfields'name';
+            $form'props''fields''path' = 
+                'id'    => 'calendar-parent',
+                'label' => $this->cal->gettext('parentcalendar'),
+                'value' => $select->show(strlen($folder) ? $path_imap : ''),
+            ;
+        }
 
-    if (!empty($options) && ($options'norename' || $options'protected')) {
-      // prevent user from moving folder
-      $hidden_fields = array('name' => 'parent', 'value' => $path_imap);
-    }
-    else {
-      $select = kolab_storage::folder_selector('event', array('name' => 'parent', 'id' => 'calendar-parent'), $folder);
-      $form'props''fields''path' = array(
-        'id' => 'calendar-parent',
-        'label' => $this->cal->gettext('parentcalendar'),
-        'value' => $select->show(strlen($folder) ? $path_imap : ''),
-      );
+        // calendar color (default field)
+        $form'props''fields''color'  = $formfields'color';
+        $form'props''fields''alarms' = $formfields'showalarms';
+
+        return kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
     }
 
-    // calendar color (default field)
-    $form'props''fields''color'  = $formfields'color';
-    $form'props''fields''alarms' = $formfields'showalarms';
-
-    return kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
-  }
-
-  /**
-   * Handler for user_delete plugin hook
-   */
-  public function user_delete($args)
-  {
-    $db = $this->rc->get_dbh();
-    foreach (array('kolab_alarms', 'itipinvitations') as $table) {
-      $db->query("DELETE FROM " . $this->rc->db->table_name($table, true)
-        . " WHERE `user_id` = ?", $args'user'->ID);
+    /**
+     * Handler for user_delete plugin hook
+     */
+    public function user_delete($args)
+    {
+        $db = $this->rc->get_dbh();
+        foreach ('kolab_alarms', 'itipinvitations' as $table) {
+            $db->query("DELETE FROM " . $this->rc->db->table_name($table, true)
+                . " WHERE `user_id` = ?", $args'user'->ID);
+        }
     }
-  }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

@@ -23,389 +23,402 @@
 
 class kolab_invitation_calendar
 {
-  public $id = '__invitation__';
-  public $ready = true;
-  public $alarms = false;
-  public $rights = 'lrsv';
-  public $editable = false;
-  public $attachments = false;
-  public $subscriptions = false;
-  public $partstats = array('unknown');
-  public $categories = array();
-  public $name = 'Invitations';
-
-
-  /**
-   * Default constructor
-   */
-  public function __construct($id, $calendar)
-  {
-    $this->cal = $calendar;
-    $this->id = $id;
-
-    switch ($this->id) {
-      case kolab_driver::INVITATIONS_CALENDAR_PENDING:
-        $this->partstats = array('NEEDS-ACTION');
-        $this->name = $this->cal->gettext('invitationspending');
-        if (!empty($_REQUEST'_quickview'))
-          $this->partstats = 'TENTATIVE';
-        break;
-
-      case kolab_driver::INVITATIONS_CALENDAR_DECLINED:
-        $this->partstats = array('DECLINED');
-        $this->name = $this->cal->gettext('invitationsdeclined');
-        break;
+    public $id            = '__invitation__';
+    public $ready         = true;
+    public $alarms        = false;
+    public $rights        = 'lrsv';
+    public $editable      = false;
+    public $attachments   = false;
+    public $subscriptions = false;
+    public $partstats     = 'unknown';
+    public $categories    = ;
+    public $name          = 'Invitations';
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct($id, $calendar)
+    {
+        $this->cal = $calendar;
+        $this->id  = $id;
+
+        switch ($this->id) {
+        case kolab_driver::INVITATIONS_CALENDAR_PENDING:
+            $this->partstats = 'NEEDS-ACTION';
+            $this->name      = $this->cal->gettext('invitationspending');
+
+            if (!empty($_REQUEST'_quickview')) {
+                $this->partstats = 'TENTATIVE';
+            }
+            break;
+
+        case kolab_driver::INVITATIONS_CALENDAR_DECLINED:
+            $this->partstats = 'DECLINED';
+            $this->name      = $this->cal->gettext('invitationsdeclined');
+            break;
+        }
+
+        // user-specific alarms settings win
+        $prefs = $this->cal->rc->config->get('kolab_calendars', );
+        if (isset($prefs$this->id'showalarms')) {
+            $this->alarms = $prefs$this->id'showalarms';
+        }
+    }
+
+    /**
+     * Getter for a nice and human readable name for this calendar
+     *
+     * @return string Name of this calendar
+     */
+    public function get_name()
+    {
+        return $this->name;
     }
 
-    // user-specific alarms settings win
-    $prefs = $this->cal->rc->config->get('kolab_calendars', array());
-    if (isset($prefs$this->id'showalarms'))
-      $this->alarms = $prefs$this->id'showalarms';
-  }
-
-  /**
-   * Getter for a nice and human readable name for this calendar
-   *
-   * @return string Name of this calendar
-   */
-  public function get_name()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Getter for the IMAP folder owner
-   *
-   * @return string Name of the folder owner
-   */
-  public function get_owner()
-  {
-    return $this->cal->rc->get_user_name();
-  }
-
-  /**
-   *
-   */
-  public function get_title()
-  {
-    return $this->get_name();
-  }
-
-  /**
-   * Getter for the name of the namespace to which the IMAP folder belongs
-   *
-   * @return string Name of the namespace (personal, other, shared)
-   */
-  public function get_namespace()
-  {
-    return 'x-special';
-  }
-
-  /**
-   * Getter for the top-end calendar folder name (not the entire path)
-   *
-   * @return string Name of this calendar
-   */
-  public function get_foldername()
-  {
-    return $this->get_name();
-  }
-
-  /**
-   * Getter for the Cyrus mailbox identifier corresponding to this folder
-   *
-   * @return string Mailbox ID
-   */
-  public function get_mailbox_id()
-  {
-    // this is a virtual collection and has no concrete mailbox ID
-    return null;
-  }
-
-  /**
-   * Return color to display this calendar
-   */
-  public function get_color()
-  {
-    // calendar color is stored in local user prefs
-    $prefs = $this->cal->rc->config->get('kolab_calendars', array());
-
-    if (!empty($prefs$this->id) && !empty($prefs$this->id'color'))
-      return $prefs$this->id'color';
-
-    return 'ffffff';
-  }
-
-  /**
-   * Compose an URL for CalDAV access to this calendar (if configured)
-   */
-  public function get_caldav_url()
-  {
-    return false;
-  }
-
-  /**
-   * Check activation status of this folder
-   *
-   * @return boolean True if enabled, false if not
-   */
-  public function is_active()
-  {
-    $prefs = $this->cal->rc->config->get('kolab_calendars', array());  // read local prefs
-    return (bool)$prefs$this->id'active';
-  }
-
-  /**
-   * Update properties of this calendar folder
-   *
-   * @see calendar_driver::edit_calendar()
-   */
-  public function update(&$prop)
-  {
-    // don't change anything.
-    // let kolab_driver save props in local prefs
-    return $prop'id';
-  }
-
-  /**
-   * Getter for a single event object
-   */
-  public function get_event($id)
-  {
-    // redirect call to kolab_driver::get_event()
-    $event = $this->cal->driver->get_event($id, calendar_driver::FILTER_WRITEABLE);
-
-    if (is_array($event)) {
-      $event = $this->_mod_event($event, $event'calendar');
+    /**
+     * Getter for the IMAP folder owner
+     *
+     * @return string Name of the folder owner
+     */
+    public function get_owner()
+    {
+        return $this->cal->rc->get_user_name();
     }
 
-    return $event;
-  }
-
-  /**
-   * Create instances of a recurring event
-   *
-   * @see kolab_calendar::get_recurring_events()
-   */
-  public function get_recurring_events($event, $start, $end = null, $event_id = null, $limit = null)
-  {
-    // forward call to the actual storage folder
-    if ($event'_folder_id') {
-      $cal = $this->cal->driver->get_calendar($event'_folder_id');
-      if ($cal && $cal->ready) {
-        return $cal->get_recurring_events($event, $start, $end, $event_id, $limit);
-      }
+    /**
+     *
+     */
+    public function get_title()
+    {
+        return $this->get_name();
     }
-  }
-
-  /**
-   * Get attachment body
-   *
-   * @see calendar_driver::get_attachment_body()
-   */
-  public function get_attachment_body($id, $event)
-  {
-    // find the actual folder this event resides in
-    if (!empty($event'_folder_id')) {
-      $cal = $this->cal->driver->get_calendar($event'_folder_id');
+
+    /**
+     * Getter for the name of the namespace to which the IMAP folder belongs
+     *
+     * @return string Name of the namespace (personal, other, shared)
+     */
+    public function get_namespace()
+    {
+        return 'x-special';
     }
-    else {
-      $cal = null;
-      foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
-        $cal = $this->_get_calendar($foldername);
-        if ($cal->ready && $cal->storage && $cal->get_event($event'id')) {
-          break;
+
+    /**
+     * Getter for the top-end calendar folder name (not the entire path)
+     *
+     * @return string Name of this calendar
+     */
+    public function get_foldername()
+    {
+        return $this->get_name();
+    }
+
+    /**
+     * Getter for the Cyrus mailbox identifier corresponding to this folder
+     *
+     * @return string Mailbox ID
+     */
+    public function get_mailbox_id()
+    {
+        // this is a virtual collection and has no concrete mailbox ID
+        return null;
+    }
+
+    /**
+     * Return color to display this calendar
+     */
+    public function get_color()
+    {
+        // calendar color is stored in local user prefs
+        $prefs = $this->cal->rc->config->get('kolab_calendars', );
+
+        if (!empty($prefs$this->id) && !empty($prefs$this->id'color')) {
+            return $prefs$this->id'color';
         }
-      }
+
+        return 'ffffff';
     }
 
-    if ($cal && $cal->storage) {
-      return $cal->get_attachment_body($id, $event);
+    /**
+     * Compose an URL for CalDAV access to this calendar (if configured)
+     */
+    public function get_caldav_url()
+    {
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * @param integer Event's new start (unix timestamp)
-   * @param integer Event's new end (unix timestamp)
-   * @param string  Search query (optional)
-   * @param boolean Include virtual events (optional)
-   * @param array   Additional parameters to query storage
-   *
-   * @return array A list of event records
-   */
-  public function list_events($start, $end, $search = null, $virtual = 1, $query = array())
-  {
-    // get email addresses of the current user
-    $user_emails = $this->cal->get_user_emails();
-    $subquery = array();
-    foreach ($user_emails as $email) {
-      foreach ($this->partstats as $partstat) {
-        $subquery = array('tags', '=', 'x-partstat:' . $email . ':' . strtolower($partstat));
-      }
+    /**
+     * Check activation status of this folder
+     *
+     * @return bool True if enabled, false if not
+     */
+    public function is_active()
+    {
+        $prefs = $this->cal->rc->config->get('kolab_calendars', );  // read local prefs
+        return !empty($prefs$this->id'active');
     }
 
-    // aggregate events from all calendar folders
-    $events = array();
-    foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
-      $cal = $this->_get_calendar($foldername);
-      if (!$cal || $cal->get_namespace() == 'other')
-        continue;
-
-      foreach ($cal->list_events($start, $end, $search, 1, $query, array(array($subquery, 'OR'))) as $event) {
-        $match = false;
-
-        // post-filter events to match out partstats
-        if (is_array($event'attendees')) {
-          foreach ($event'attendees' as $attendee) {
-            if (in_array($attendee'email', $user_emails) && in_array($attendee'status', $this->partstats)) {
-              $match = true;
-              break;
+    /**
+     * Update properties of this calendar folder
+     *
+     * @see calendar_driver::edit_calendar()
+     */
+    public function update(&$prop)
+    {
+        // don't change anything.
+        // let kolab_driver save props in local prefs
+        return $prop'id';
+    }
+
+    /**
+     * Getter for a single event object
+     */
+    public function get_event($id)
+    {
+        // redirect call to kolab_driver::get_event()
+        $event = $this->cal->driver->get_event($id, calendar_driver::FILTER_WRITEABLE);
+
+        if (is_array($event)) {
+            $event = $this->_mod_event($event, $event'calendar');
+        }
+
+        return $event;
+    }
+
+    /**
+     * Create instances of a recurring event
+     *
+     * @see kolab_calendar::get_recurring_events()
+     */
+    public function get_recurring_events($event, $start, $end = null, $event_id = null, $limit = null)
+    {
+        // forward call to the actual storage folder
+        if (!empty($event'_folder_id')) {
+            $cal = $this->cal->driver->get_calendar($event'_folder_id');
+            if ($cal && $cal->ready) {
+                return $cal->get_recurring_events($event, $start, $end, $event_id, $limit);
             }
-          }
         }
+    }
 
-        if ($match) {
-          $events$event'id' ?: $event'uid' = $this->_mod_event($event, $cal->id);
+    /**
+     * Get attachment body
+     *
+     * @see calendar_driver::get_attachment_body()
+     */
+    public function get_attachment_body($id, $event)
+    {
+        // find the actual folder this event resides in
+        if (!empty($event'_folder_id')) {
+            $cal = $this->cal->driver->get_calendar($event'_folder_id');
+        }
+        else {
+            $cal = null;
+            foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
+                $cal = $this->_get_calendar($foldername);
+                if ($cal->ready && $cal->storage && $cal->get_event($event'id')) {
+                    break;
+                }
+            }
         }
-      }
 
-      // merge list of event categories (really?)
-      $this->categories += $cal->categories;
+        if ($cal && $cal->storage) {
+            return $cal->get_attachment_body($id, $event);
+        }
+
+        return false;
     }
 
-    return $events;
-  }
-
-  /**
-   * Get number of events in the given calendar
-   *
-   * @param integer Date range start (unix timestamp)
-   * @param integer Date range end (unix timestamp)
-   * @param array   Additional query to filter events
-   *
-   * @return integer Count
-   */
-  public function count_events($start, $end = null, $filter = null)
-  {
-    // get email addresses of the current user
-    $user_emails = $this->cal->get_user_emails();
-    $subquery = array();
-    foreach ($user_emails as $email) {
-      foreach ($this->partstats as $partstat) {
-        $subquery = array('tags', '=', 'x-partstat:' . $email . ':' . strtolower($partstat));
-      }
+    /**
+     * @param int    Event's new start (unix timestamp)
+     * @param int    Event's new end (unix timestamp)
+     * @param string Search query (optional)
+     * @param bool   Include virtual events (optional)
+     * @param array  Additional parameters to query storage
+     *
+     * @return array A list of event records
+     */
+    public function list_events($start, $end, $search = null, $virtual = 1, $query = )
+    {
+        // get email addresses of the current user
+        $user_emails = $this->cal->get_user_emails();
+        $subquery    = ;
+
+        foreach ($user_emails as $email) {
+            foreach ($this->partstats as $partstat) {
+                $subquery = 'tags', '=', 'x-partstat:' . $email . ':' . strtolower($partstat);
+            }
+        }
+
+        $events = ;
+
+        // aggregate events from all calendar folders
+        foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
+            $cal = $this->_get_calendar($foldername);
+            if (!$cal || $cal->get_namespace() == 'other') {
+                continue;
+            }
+
+            foreach ($cal->list_events($start, $end, $search, 1, $query, $subquery, 'OR') as $event) {
+                $match = false;
+
+                // post-filter events to match out partstats
+                if (!empty($event'attendees')) {
+                    foreach ($event'attendees' as $attendee) {
+                        if (
+                            in_array($attendee'email', $user_emails)
+                            && in_array($attendee'status', $this->partstats)
+                        ) {
+                            $match = true;
+                            break;
+                        }
+                    }
+                }
+
+                if ($match) {
+                    $uid = !empty($event'id') ? $event'id' : $event'uid';
+                    $events$uid = $this->_mod_event($event, $cal->id);
+                }
+            }
+
+            // merge list of event categories (really?)
+            $this->categories += $cal->categories;
+        }
+
+        return $events;
     }
 
-    $filter = array(
-      array('tags','!=','x-status:cancelled'),
-      array($subquery, 'OR')
-    );
+    /**
+     * Get number of events in the given calendar
+     *
+     * @param int   Date range start (unix timestamp)
+     * @param int   Date range end (unix timestamp)
+     * @param array Additional query to filter events
+     *
+     * @return int Count
+     */
+    public function count_events($start, $end = null, $filter = null)
+    {
+        // get email addresses of the current user
+        $user_emails = $this->cal->get_user_emails();
+        $subquery    = ;
+
+        foreach ($user_emails as $email) {
+            foreach ($this->partstats as $partstat) {
+                $subquery = 'tags', '=', 'x-partstat:' . $email . ':' . strtolower($partstat);
+            }
+        }
 
-    // aggregate counts from all calendar folders
-    $count = 0;
-    foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
-      $cal = $this->_get_calendar($foldername);
-      if (!$cal || $cal->get_namespace() == 'other')
-        continue;
+        $filter = 
+            'tags', '!=', 'x-status:cancelled',
+            $subquery, 'OR'
+        ;
+
+        // aggregate counts from all calendar folders
+        $count = 0;
+        foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
+            $cal = $this->_get_calendar($foldername);
+            if (!$cal || $cal->get_namespace() == 'other') {
+                continue;
+            }
 
-      $count += $cal->count_events($start, $end, $filter);
+            $count += $cal->count_events($start, $end, $filter);
+        }
+
+        return $count;
     }
 
-    return $count;
-  }
-
-  /**
-   * Get calendar object instance (that maybe already initialized)
-   */
-  private function _get_calendar($folder_name)
-  {
-    $id = kolab_storage::folder_id($folder_name, true);
-    return $this->cal->driver->get_calendar($id);
-  }
-
-  /**
-   * Helper method to modify some event properties
-   */
-  private function _mod_event($event, $calendar_id = null)
-  {
-    // set classes according to PARTSTAT
-    $event = kolab_driver::add_partstat_class($event, $this->partstats);
-
-    if (strpos($event'className', 'fc-invitation-') !== false) {
-      $event'calendar' = $this->id;
+    /**
+     * Get calendar object instance (that maybe already initialized)
+     */
+    private function _get_calendar($folder_name)
+    {
+        $id = kolab_storage::folder_id($folder_name, true);
+        return $this->cal->driver->get_calendar($id);
     }
 
-    // add pointer to original calendar folder
-    if ($calendar_id) {
-      $event'_folder_id' = $calendar_id;
+    /**
+     * Helper method to modify some event properties
+     */
+    private function _mod_event($event, $calendar_id = null)
+    {
+        // set classes according to PARTSTAT
+        $event = kolab_driver::add_partstat_class($event, $this->partstats);
+
+        if (strpos($event'className', 'fc-invitation-') !== false) {
+            $event'calendar' = $this->id;
+        }
+
+        // add pointer to original calendar folder
+        if ($calendar_id) {
+            $event'_folder_id' = $calendar_id;
+        }
+
+        return $event;
     }
 
-    return $event;
-  }
-
-  /**
-   * Create a new event record
-   *
-   * @see kolab_calendar::insert_event()
-   */
-  public function insert_event($event)
-  {
-    return false;
-  }
-
-  /**
-   * Update a specific event record
-   *
-   * @see kolab_calendar::update_event()
-   */
-  public function update_event($event, $exception_id = null)
-  {
-    // forward call to the actual storage folder
-    if ($event'_folder_id') {
-      $cal = $this->cal->driver->get_calendar($event'_folder_id');
-      if ($cal && $cal->ready) {
-        return $cal->update_event($event, $exception_id);
-      }
+    /**
+     * Create a new event record
+     *
+     * @see kolab_calendar::insert_event()
+     */
+    public function insert_event($event)
+    {
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Delete an event record
-   *
-   * @see kolab_calendar::delete_event()
-   */
-  public function delete_event($event, $force = true)
-  {
-    // forward call to the actual storage folder
-    if ($event'_folder_id') {
-      $cal = $this->cal->driver->get_calendar($event'_folder_id');
-      if ($cal && $cal->ready) {
-        return $cal->delete_event($event, $force);
-      }
+    /**
+     * Update a specific event record
+     *
+     * @see kolab_calendar::update_event()
+     */
+    public function update_event($event, $exception_id = null)
+    {
+        // forward call to the actual storage folder
+        if (!empty($event'_folder_id')) {
+            $cal = $this->cal->driver->get_calendar($event'_folder_id');
+            if ($cal && $cal->ready) {
+                return $cal->update_event($event, $exception_id);
+            }
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Restore deleted event record
-   *
-   * @see kolab_calendar::restore_event()
-   */
-  public function restore_event($event)
-  {
-    // forward call to the actual storage folder
-    if ($event'_folder_id') {
-      $cal = $this->cal->driver->get_calendar($event'_folder_id');
-      if ($cal && $cal->ready) {
-        return $cal->restore_event($event);
-      }
+    /**
+     * Delete an event record
+     *
+     * @see kolab_calendar::delete_event()
+     */
+    public function delete_event($event, $force = true)
+    {
+        // forward call to the actual storage folder
+        if (!empty($event'_folder_id')) {
+            $cal = $this->cal->driver->get_calendar($event'_folder_id');
+            if ($cal && $cal->ready) {
+                return $cal->delete_event($event, $force);
+            }
+        }
+
+        return false;
     }
 
-    return false;
-  }
+    /**
+     * Restore deleted event record
+     *
+     * @see kolab_calendar::restore_event()
+     */
+    public function restore_event($event)
+    {
+        // forward call to the actual storage folder
+        if (!empty($event'_folder_id')) {
+            $cal = $this->cal->driver->get_calendar($event'_folder_id');
+            if ($cal && $cal->ready) {
+                return $cal->restore_event($event);
+            }
+        }
+
+        return false;
+    }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_user_calendar.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_user_calendar.php Changed

@@ -23,402 +23,423 @@
 
 class kolab_user_calendar extends kolab_calendar
 {
-  public $id = 'unknown';
-  public $ready = false;
-  public $editable = false;
-  public $attachments = false;
-  public $subscriptions = false;
-
-  protected $userdata = array();
-  protected $timeindex = array();
-
-
-  /**
-   * Default constructor
-   */
-  public function __construct($user_or_folder, $calendar)
-  {
-    $this->cal  = $calendar;
-    $this->imap = $calendar->rc->get_storage();
-
-    // full user record is provided
-    if (is_array($user_or_folder)) {
-      $this->userdata = $user_or_folder;
-      $this->storage = new kolab_storage_folder_user($this->userdata'kolabtargetfolder', '', $this->userdata);
+    public $id            = 'unknown';
+    public $ready         = false;
+    public $editable      = false;
+    public $attachments   = false;
+    public $subscriptions = false;
+
+    protected $userdata  = ;
+    protected $timeindex = ;
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct($user_or_folder, $calendar)
+    {
+        $this->cal  = $calendar;
+        $this->imap = $calendar->rc->get_storage();
+
+        // full user record is provided
+        if (is_array($user_or_folder)) {
+            $this->userdata = $user_or_folder;
+            $this->storage = new kolab_storage_folder_user($this->userdata'kolabtargetfolder', '', $this->userdata);
+        }
+        else if ($user_or_folder instanceof kolab_storage_folder_user) {
+            $this->storage  = $user_or_folder;
+            $this->userdata = $this->storage->ldaprec;
+        }
+        else {
+            // get user record from LDAP
+            $this->storage  = new kolab_storage_folder_user($user_or_folder);
+            $this->userdata = $this->storage->ldaprec;
+        }
+
+        $this->ready = !empty($this->userdata'kolabtargetfolder');
+        $this->storage->type = 'event';
+
+        if ($this->ready) {
+            // ID is derrived from the user's kolabtargetfolder attribute
+            $this->id          = kolab_storage::folder_id($this->userdata'kolabtargetfolder', true);
+            $this->imap_folder = $this->userdata'kolabtargetfolder';
+            $this->name        = $this->storage->name;
+            $this->parent      = '';  // user calendars are top level
+
+            // user-specific alarms settings win
+            $prefs = $this->cal->rc->config->get('kolab_calendars', );
+            if (isset($prefs$this->id'showalarms')) {
+                $this->alarms = $prefs$this->id'showalarms';
+            }
+        }
     }
-    else if ($user_or_folder instanceof kolab_storage_folder_user) {
-      $this->storage  = $user_or_folder;
-      $this->userdata = $this->storage->ldaprec;
+
+    /**
+     * Getter for a nice and human readable name for this calendar
+     *
+     * @return string Name of this calendar
+     */
+    public function get_name()
+    {
+        if (!empty($this->userdata'displayname')) {
+            return $this->userdata'displayname';
+        }
+
+        return !empty($this->userdata'name') ? $this->userdata'name' : $this->userdata'mail';
     }
-    else {  // get user record from LDAP
-      $this->storage  = new kolab_storage_folder_user($user_or_folder);
-      $this->userdata = $this->storage->ldaprec;
+
+    /**
+     * Getter for the IMAP folder owner
+     *
+     * @param bool Return a fully qualified owner name (unused)
+     *
+     * @return string Name of the folder owner
+     */
+    public function get_owner($fully_qualified = false)
+    {
+        return $this->userdata'mail';
     }
 
-    $this->ready = !empty($this->userdata'kolabtargetfolder');
-    $this->storage->type = 'event';
+    /**
+     *
+     */
+    public function get_title()
+    {
+        $title = ;
+
+        if (!empty($this->userdata'displayname')) {
+            $title = $this->userdata'displayname';
+        }
+
+        $title = $this->userdata'mail';
 
-    if ($this->ready) {
-      // ID is derrived from the user's kolabtargetfolder attribute
-      $this->id = kolab_storage::folder_id($this->userdata'kolabtargetfolder', true);
-      $this->imap_folder = $this->userdata'kolabtargetfolder';
-      $this->name = $this->storage->name;
-      $this->parent = '';  // user calendars are top level
+        return implode('; ', $title);
+    }
 
-      // user-specific alarms settings win
-      $prefs = $this->cal->rc->config->get('kolab_calendars', array());
-      if (isset($prefs$this->id'showalarms'))
-        $this->alarms = $prefs$this->id'showalarms';
+    /**
+     * Getter for the name of the namespace to which the IMAP folder belongs
+     *
+     * @return string Name of the namespace (personal, other, shared)
+     */
+    public function get_namespace()
+    {
+        return 'other user';
     }
-  }
-
-  /**
-   * Getter for a nice and human readable name for this calendar
-   *
-   * @return string Name of this calendar
-   */
-  public function get_name()
-  {
-    return $this->userdata'displayname' ?: ($this->userdata'name' ?: $this->userdata'mail');
-  }
-
-  /**
-   * Getter for the IMAP folder owner
-   *
-   * @param bool Return a fully qualified owner name (unused)
-   *
-   * @return string Name of the folder owner
-   */
-  public function get_owner($fully_qualified = false)
-  {
-    return $this->userdata'mail';
-  }
-
-  /**
-   *
-   */
-  public function get_title()
-  {
-    return trim($this->userdata'displayname' . '; ' . $this->userdata'mail', '; ');
-  }
-
-  /**
-   * Getter for the name of the namespace to which the IMAP folder belongs
-   *
-   * @return string Name of the namespace (personal, other, shared)
-   */
-  public function get_namespace()
-  {
-    return 'other user';
-  }
-
-  /**
-   * Getter for the top-end calendar folder name (not the entire path)
-   *
-   * @return string Name of this calendar
-   */
-  public function get_foldername()
-  {
-    return $this->get_name();
-  }
-
-  /**
-   * Return color to display this calendar
-   */
-  public function get_color($default = null)
-  {
-    // calendar color is stored in local user prefs
-    $prefs = $this->cal->rc->config->get('kolab_calendars', array());
-
-    if (!empty($prefs$this->id) && !empty($prefs$this->id'color'))
-      return $prefs$this->id'color';
-
-    return $default ?: 'cc0000';
-  }
-
-  /**
-   * Compose an URL for CalDAV access to this calendar (if configured)
-   */
-  public function get_caldav_url()
-  {
-    return false;
-  }
-
-  /**
-   * Check subscription status of this folder
-   *
-   * @return boolean True if subscribed, false if not
-   */
-  public function is_subscribed()
-  {
-    return $this->storage->is_subscribed();
-  }
-
-  /**
-   * Update properties of this calendar folder
-   *
-   * @see calendar_driver::edit_calendar()
-   */
-  public function update(&$prop)
-  {
-    // don't change anything.
-    // let kolab_driver save props in local prefs
-    return $prop'id';
-  }
-
-  /**
-   * Getter for a single event object
-   */
-  public function get_event($id)
-  {
-    // TODO: implement this
-    return $this->events$id;
-  }
-
-  /**
-   * Get attachment body
-   * @see calendar_driver::get_attachment_body()
-   */
-  public function get_attachment_body($id, $event)
-  {
-    if (!$event'calendar' && ($ev = $this->get_event($event'id'))) {
-      $event'calendar' = $ev'calendar';
+
+    /**
+     * Getter for the top-end calendar folder name (not the entire path)
+     *
+     * @return string Name of this calendar
+     */
+    public function get_foldername()
+    {
+        return $this->get_name();
     }
 
-    if ($event'calendar' && ($cal = $this->cal->get_calendar($event'calendar'))) {
-      return $cal->get_attachment_body($id, $event);
+    /**
+     * Return color to display this calendar
+     */
+    public function get_color($default = null)
+    {
+        // calendar color is stored in local user prefs
+        $prefs = $this->cal->rc->config->get('kolab_calendars', );
+
+        if (!empty($prefs$this->id) && !empty($prefs$this->id'color')) {
+            return $prefs$this->id'color';
+        }
+
+        return $default ?: 'cc0000';
     }
 
-    return false;
-  }
-
-  /**
-   * @param  integer Event's new start (unix timestamp)
-   * @param  integer Event's new end (unix timestamp)
-   * @param  string  Search query (optional)
-   * @param  boolean Include virtual events (optional)
-   * @param  array   Additional parameters to query storage
-   * @param  array   Additional query to filter events
-   *
-   * @return array A list of event records
-   */
-  public function list_events($start, $end, $search = null, $virtual = 1, $query = array(), $filter_query = null)
-  {
-    // convert to DateTime for comparisons
-    try {
-      $start_dt = new DateTime('@'.$start);
+    /**
+     * Compose an URL for CalDAV access to this calendar (if configured)
+     */
+    public function get_caldav_url()
+    {
+        return false;
     }
-    catch (Exception $e) {
-      $start_dt = new DateTime('@0');
+
+    /**
+     * Check subscription status of this folder
+     *
+     * @return boolean True if subscribed, false if not
+     */
+    public function is_subscribed()
+    {
+        return $this->storage->is_subscribed();
     }
-    try {
-      $end_dt = new DateTime('@'.$end);
+
+    /**
+     * Update properties of this calendar folder
+     *
+     * @see calendar_driver::edit_calendar()
+     */
+    public function update(&$prop)
+    {
+        // don't change anything.
+        // let kolab_driver save props in local prefs
+        return $prop'id';
     }
-    catch (Exception $e) {
-      $end_dt = new DateTime('today +10 years');
+
+    /**
+     * Getter for a single event object
+     */
+    public function get_event($id)
+    {
+        // TODO: implement this
+        return isset($this->events$id) ? $this->events$id : null;
     }
 
-    $limit_changed = null;
-    if (!empty($query)) {
-      foreach ($query as $q) {
-        if ($q0 == 'changed' && $q1 == '>=') {
-          try { $limit_changed = new DateTime('@'.$q2); }
-          catch (Exception $e) { /* ignore */ }
+    /**
+     * Get attachment body
+     * @see calendar_driver::get_attachment_body()
+     */
+    public function get_attachment_body($id, $event)
+    {
+        if (empty($event'calendar') && ($ev = $this->get_event($event'id'))) {
+            $event'calendar' = $ev'calendar';
+        }
+
+        if (!empty($event'calendar') && ($cal = $this->cal->get_calendar($event'calendar'))) {
+            return $cal->get_attachment_body($id, $event);
         }
-      }
+
+        return false;
     }
 
-    // aggregate all calendar folders the user shares (but are not activated)
-    foreach (kolab_storage::list_user_folders($this->userdata, 'event', 2) as $foldername) {
-      $cal = new kolab_calendar($foldername, $this->cal);
-      foreach ($cal->list_events($start, $end, $search, 1) as $event) {
-        $uid = $event'id' ?: $event'uid';
-        $this->events$uid = $event;
-        $this->timeindex$this->time_key($event) = $uid;
-      }
+    /**
+     * @param int    Event's new start (unix timestamp)
+     * @param int    Event's new end (unix timestamp)
+     * @param string Search query (optional)
+     * @param bool   Include virtual events (optional)
+     * @param array  Additional parameters to query storage
+     * @param array  Additional query to filter events
+     *
+     * @return array A list of event records
+     */
+    public function list_events($start, $end, $search = null, $virtual = 1, $query = , $filter_query = null)
+    {
+        // convert to DateTime for comparisons
+        try {
+            $start_dt = new DateTime('@'.$start);
+        }
+        catch (Exception $e) {
+            $start_dt = new DateTime('@0');
+        }
+        try {
+            $end_dt = new DateTime('@'.$end);
+        }
+        catch (Exception $e) {
+            $end_dt = new DateTime('today +10 years');
+        }
+
+        $limit_changed = null;
+
+        if (!empty($query)) {
+            foreach ($query as $q) {
+                if ($q0 == 'changed' && $q1 == '>=') {
+                    try { $limit_changed = new DateTime('@'.$q2); }
+                    catch (Exception $e) { /* ignore */ }
+                }
+            }
+        }
+
+        // aggregate all calendar folders the user shares (but are not activated)
+        foreach (kolab_storage::list_user_folders($this->userdata, 'event', 2) as $foldername) {
+            $cal = new kolab_calendar($foldername, $this->cal);
+            foreach ($cal->list_events($start, $end, $search, 1) as $event) {
+                $uid = !empty($event'id') ? $event'id' : $event'uid';
+                $this->events$uid = $event;
+                $this->timeindex$this->time_key($event) = $uid;
+            }
+        }
+
+        // get events from the user's free/busy feed (for quickview only)
+        $fbview = $this->cal->rc->config->get('calendar_include_freebusy_data', 1);
+        if ($fbview && ($fbview == 1 || !empty($_REQUEST'_quickview')) && empty($search)) {
+            $this->fetch_freebusy($limit_changed);
+        }
+
+        $events = ;
+        foreach ($this->events as $event) {
+            // list events in requested time window
+            if (
+                $event'start' <= $end_dt
+                && $event'end' >= $start_dt
+                && (!$limit_changed || empty($event'changed') || $event'changed' >= $limit_changed)
+            ) {
+                $events = $event;
+            }
+        }
+
+        // avoid session race conditions that will loose temporary subscriptions
+        $this->cal->rc->session->nowrite = true;
+
+        return $events;
     }
 
-    // get events from the user's free/busy feed (for quickview only)
-    $fbview = $this->cal->rc->config->get('calendar_include_freebusy_data', 1);
-    if ($fbview && ($fbview == 1 || !empty($_REQUEST'_quickview')) && empty($search)) {
-      $this->fetch_freebusy($limit_changed);
+    /**
+     * Get number of events in the given calendar
+     *
+     * @param int   Date range start (unix timestamp)
+     * @param int   Date range end (unix timestamp)
+     * @param array Additional query to filter events
+     *
+     * @return integer Count
+     */
+    public function count_events($start, $end = null, $filter_query = null)
+    {
+        // not implemented
+        return 0;
     }
 
-    $events = array();
-    foreach ($this->events as $event) {
-      // list events in requested time window
-      if ($event'start' <= $end_dt && $event'end' >= $start_dt &&
-           (!$limit_changed || !$event'changed' || $event'changed' >= $limit_changed)) {
-        $events = $event;
-      }
+    /**
+     * Helper method to fetch free/busy data for the user and turn it into calendar data
+     */
+    private function fetch_freebusy($limit_changed = null)
+    {
+        // ask kolab server first
+        try {
+            $request_config = 
+                'store_body'       => true,
+                'follow_redirects' => true,
+            ;
+            $request  = libkolab::http_request(kolab_storage::get_freebusy_url($this->userdata'mail'), 'GET', $request_config);
+            $response = $request->send();
+
+            // authentication required
+            if ($response->getStatus() == 401) {
+                $request->setAuth($this->cal->rc->user->get_username(), $this->cal->rc->decrypt($_SESSION'password'));
+                $response = $request->send();
+            }
+
+            if ($response->getStatus() == 200) {
+                $fbdata = $response->getBody();
+            }
+
+            unset($request, $response);
+        }
+        catch (Exception $e) {
+            rcube::raise_error(
+                    'code' => 900, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Error fetching free/busy information: " . $e->getMessage()
+                ,
+                true, false
+            );
+
+            return false;
+        }
+
+        $statusmap = 
+            'FREE'            => 'free',
+            'BUSY'            => 'busy',
+            'BUSY-TENTATIVE'  => 'tentative',
+            'X-OUT-OF-OFFICE' => 'outofoffice',
+            'OOF'             => 'outofoffice',
+        ;
+
+        $titlemap = 
+            'FREE'            => $this->cal->gettext('availfree'),
+            'BUSY'            => $this->cal->gettext('availbusy'),
+            'BUSY-TENTATIVE'  => $this->cal->gettext('availtentative'),
+            'X-OUT-OF-OFFICE' => $this->cal->gettext('availoutofoffice'),
+        ;
+
+        // rcube::console('_fetch_freebusy', kolab_storage::get_freebusy_url($this->userdata'mail'), $fbdata);
+
+        $count = 0;
+
+        // parse free-busy information
+        if (!empty($fbdata)) {
+            $ical = $this->cal->get_ical();
+            $ical->import($fbdata);
+            if ($fb = $ical->freebusy) {
+                // consider 'changed >= X' queries
+                if ($limit_changed && !empty($fb'created') && $fb'created' < $limit_changed) {
+                    return 0;
+                }
+
+                foreach ($fb'periods' as $tuple) {
+                    list($from, $to, $type) = $tuple;
+                    $event = 
+                        'uid'       => md5($this->id . $from->format('U') . '/' . $to->format('U')),
+                        'calendar'  => $this->id,
+                        'changed'   => !empty($fb'created') ? $fb'created' : new DateTime(),
+                        'title'     => $this->get_name() . ' ' . (!empty($titlemap$type) ? $titlemap$type : $type),
+                        'start'     => $from,
+                        'end'       => $to,
+                        'free_busy' => !empty($statusmap$type) ? $statusmap$type : 'busy',
+                        'className' => 'fc-type-freebusy',
+                        'organizer' => 
+                            'email' => $this->userdata'mail',
+                            'name'  => isset($this->userdata'displayname') ? $this->userdata'displayname' : null,
+                        ,
+                    ;
+
+                    // avoid duplicate entries
+                    $key = $this->time_key($event);
+                    if (empty($this->timeindex$key)) {
+                        $this->events$event'uid' = $event;
+                        $this->timeindex$key = $event'uid';
+                        $count++;
+                    }
+                }
+            }
+        }
+
+        return $count;
     }
 
-    // avoid session race conditions that will loose temporary subscriptions
-    $this->cal->rc->session->nowrite = true;
-
-    return $events;
-  }
-
-  /**
-   * Get number of events in the given calendar
-   *
-   * @param integer Date range start (unix timestamp)
-   * @param integer Date range end (unix timestamp)
-   * @param array   Additional query to filter events
-   *
-   * @return integer Count
-   */
-  public function count_events($start, $end = null, $filter_query = null)
-  {
-    // not implemented
-    return 0;
-  }
-
-  /**
-   * Helper method to fetch free/busy data for the user and turn it into calendar data
-   */
-  private function fetch_freebusy($limit_changed = null)
-  {
-    // ask kolab server first
-    try {
-      $request_config = array(
-        'store_body'       => true,
-        'follow_redirects' => true,
-      );
-      $request  = libkolab::http_request(kolab_storage::get_freebusy_url($this->userdata'mail'), 'GET', $request_config);
-      $response = $request->send();
-
-      // authentication required
-      if ($response->getStatus() == 401) {
-        $request->setAuth($this->cal->rc->user->get_username(), $this->cal->rc->decrypt($_SESSION'password'));
-        $response = $request->send();
-      }
-
-      if ($response->getStatus() == 200)
-        $fbdata = $response->getBody();
-
-      unset($request, $response);
+    /**
+     * Helper to build a key for the absolute time slot the given event convers
+     */
+    private function time_key($event)
+    {
+        return sprintf('%s/%s', $event'start'->format('U'), is_object($event'end') ? $event'end'->format('U') : '0');
     }
-    catch (Exception $e) {
-      rcube::raise_error(array(
-        'code' => 900,
-        'type' => 'php',
-        'file' => __FILE__,
-        'line' => __LINE__,
-        'message' => "Error fetching free/busy information: " . $e->getMessage()),
-        true, false);
-
-      return false;
+
+    /**
+     * Create a new event record
+     *
+     * @see calendar_driver::new_event()
+     *
+     * @return mixed The created record ID on success, False on error
+     */
+    public function insert_event($event)
+    {
+        return false;
     }
 
-    $statusmap = array(
-      'FREE' => 'free',
-      'BUSY' => 'busy',
-      'BUSY-TENTATIVE' => 'tentative',
-      'X-OUT-OF-OFFICE' => 'outofoffice',
-      'OOF' => 'outofoffice',
-    );
-    $titlemap = array(
-      'FREE' => $this->cal->gettext('availfree'),
-      'BUSY' => $this->cal->gettext('availbusy'),
-      'BUSY-TENTATIVE' => $this->cal->gettext('availtentative'),
-      'X-OUT-OF-OFFICE' => $this->cal->gettext('availoutofoffice'),
-    );
-
-    // rcube::console('_fetch_freebusy', kolab_storage::get_freebusy_url($this->userdata'mail'), $fbdata);
-
-    // parse free-busy information
-    $count = 0;
-    if ($fbdata) {
-      $ical = $this->cal->get_ical();
-      $ical->import($fbdata);
-      if ($fb = $ical->freebusy) {
-        // consider 'changed >= X' queries
-        if ($limit_changed && $fb'created' && $fb'created' < $limit_changed) {
-          return 0;
-        }
+    /**
+     * Update a specific event record
+     *
+     * @see calendar_driver::new_event()
+     * @return bool True on success, False on error
+     */
+    public function update_event($event, $exception_id = null)
+    {
+        return false;
+    }
 
-        foreach ($fb'periods' as $tuple) {
-          list($from, $to, $type) = $tuple;
-          $event = array(
-            'uid'       => md5($this->id . $from->format('U') . '/' . $to->format('U')),
-            'calendar'  => $this->id,
-            'changed'   => $fb'created' ?: new DateTime(),
-            'title'     => $this->get_name() . ' ' . ($titlemap$type ?: $type),
-            'start'     => $from,
-            'end'       => $to,
-            'free_busy' => $statusmap$type ?: 'busy',
-            'className' => 'fc-type-freebusy',
-            'organizer' => array(
-              'email' => $this->userdata'mail',
-              'name'  => $this->userdata'displayname',
-            ),
-          );
-
-          // avoid duplicate entries
-          $key = $this->time_key($event);
-          if (!$this->timeindex$key) {
-            $this->events$event'uid' = $event;
-            $this->timeindex$key = $event'uid';
-            $count++;
-          }
-        }
-      }
+    /**
+     * Delete an event record
+     *
+     * @see calendar_driver::remove_event()
+     * @return bool True on success, False on error
+     */
+    public function delete_event($event, $force = true)
+    {
+        return false;
     }
 
-    return $count;
-  }
-
-  /**
-   * Helper to build a key for the absolute time slot the given event convers
-   */
-  private function time_key($event)
-  {
-    return sprintf('%s/%s', $event'start'->format('U'), is_object($event'end') ? $event'end'->format('U') : '0');
-  }
-
-  /**
-   * Create a new event record
-   *
-   * @see calendar_driver::new_event()
-   * 
-   * @return mixed The created record ID on success, False on error
-   */
-  public function insert_event($event)
-  {
-    return false;
-  }
-
-  /**
-   * Update a specific event record
-   *
-   * @see calendar_driver::new_event()
-   * @return boolean True on success, False on error
-   */
-  public function update_event($event, $exception_id = null)
-  {
-    return false;
-  }
-
-  /**
-   * Delete an event record
-   *
-   * @see calendar_driver::remove_event()
-   * @return boolean True on success, False on error
-   */
-  public function delete_event($event, $force = true)
-  {
-    return false;
-  }
-
-  /**
-   * Restore deleted event record
-   *
-   * @see calendar_driver::undelete_event()
-   * @return boolean True on success, False on error
-   */
-  public function restore_event($event)
-  {
-    return false;
-  }
+    /**
+     * Restore deleted event record
+     *
+     * @see calendar_driver::undelete_event()
+     * @return bool True on success, False on error
+     */
+    public function restore_event($event)
+    {
+        return false;
+    }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/ldap/resources_driver_ldap.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/ldap/resources_driver_ldap.php Changed

@@ -41,72 +41,76 @@
     /**
      * Fetch resource objects to be displayed for booking
      *
-     * @param  string  Search query (optional)
-     * @return array  List of resource records available for booking
+     * @param string $query Search query (optional)
+     * @param int    $num   Max size of the result
+     *
+     * @return array List of resource records available for booking
      */
     public function load_resources($query = null, $num = 5000)
     {
-      if (!($ldap = $this->connect())) {
-        return array();
-      }
-
-      // TODO: apply paging
-      $ldap->set_pagesize($num);
-
-      if (isset($query)) {
-        $results = $ldap->search('*', $query, 0, true, true);
-      }
-      else {
-        $results = $ldap->list_records();
-      }
-
-      if ($results instanceof ArrayAccess) {
-        foreach ($results as $i => $rec) {
-          $results$i = $this->decode_resource($rec);
+        if (!($ldap = $this->connect())) {
+            return ;
+        }
+
+        // TODO: apply paging
+        $ldap->set_pagesize($num);
+
+        if (isset($query)) {
+            $results = $ldap->search('*', $query, 0, true, true);
+        }
+        else {
+            $results = $ldap->list_records();
         }
-      }
 
-      return $results;
+        if ($results instanceof ArrayAccess) {
+            foreach ($results as $i => $rec) {
+                $results$i = $this->decode_resource($rec);
+            }
+        }
+
+        return $results;
     }
 
     /**
      * Return properties of a single resource
      *
-     * @param string  Unique resource identifier
+     * @param string $id Unique resource identifier
+     *
      * @return array Resource object as hash array
      */
     public function get_resource($dn)
     {
-      $rec = null;
+        $rec = null;
 
-      if ($ldap = $this->connect()) {
-        $rec = $ldap->get_record(rcube_ldap::dn_encode($dn), true);
+        if ($ldap = $this->connect()) {
+            $rec = $ldap->get_record(rcube_ldap::dn_encode($dn), true);
 
-        if (!empty($rec)) {
-          $rec = $this->decode_resource($rec);
+            if (!empty($rec)) {
+                $rec = $this->decode_resource($rec);
+            }
         }
-      }
 
-      return $rec;
+        return $rec;
     }
 
     /**
      * Return properties of a resource owner
      *
-     * @param string  Owner identifier
-     * @return array  Resource object as hash array
+     * @param string $dn Owner identifier
+     *
+     * @return array Resource object as hash array
      */
     public function get_resource_owner($dn)
     {
-      $owner = null;
+        $owner = null;
 
-      if ($ldap = $this->connect()) {
-        $owner = $ldap->get_record(rcube_ldap::dn_encode($dn), true);
-        $owner'ID' = rcube_ldap::dn_decode($owner'ID');
-        unset($owner'_raw_attrib', $owner'_type');
-      }
+        if ($ldap = $this->connect()) {
+            $owner = $ldap->get_record(rcube_ldap::dn_encode($dn), true);
+            $owner'ID' = rcube_ldap::dn_decode($owner'ID');
+            unset($owner'_raw_attrib', $owner'_type');
+        }
 
-      return $owner;
+        return $owner;
     }
 
     /**
@@ -114,41 +118,40 @@
      */
     private function decode_resource($rec)
     {
-      $rec'ID' = rcube_ldap::dn_decode($rec'ID');
-
-      $attributes = array();
-
-      foreach ((array) $rec'attributes' as $sattr) {
-        $sattr = trim($sattr);
-        if ($sattr && $sattr0 === '{') {
-          $attr = @json_decode($sattr, true);
-          $attributes += $attr;
+        $rec'ID' = rcube_ldap::dn_decode($rec'ID');
+
+        $attributes = ;
+
+        foreach ((array) $rec'attributes' as $sattr) {
+            $sattr = trim($sattr);
+            if (!empty($sattr) && $sattr0 === '{') {
+                $attr = @json_decode($sattr, true);
+                $attributes += $attr;
+            }
+            else if (!empty($sattr) && empty($rec'description')) {
+                $rec'description' = $sattr;
+            }
         }
-        else if ($sattr && empty($rec'description')) {
-          $rec'description' = $sattr;
-        }
-      }
 
-      $rec'attributes' = $attributes;
+        $rec'attributes' = $attributes;
 
-      // force $rec'members' to be an array
-      if (!empty($rec'members') && !is_array($rec'members')) {
-        $rec'members' = array($rec'members');
-      }
+        // force $rec'members' to be an array
+        if (!empty($rec'members') && !is_array($rec'members')) {
+            $rec'members' = $rec'members';
+        }
 
-      // remove unused cruft
-      unset($rec'_raw_attrib');
+        // remove unused cruft
+        unset($rec'_raw_attrib');
 
-      return $rec;
+        return $rec;
     }
 
     private function connect()
     {
-      if (!isset($this->ldap)) {
-        $this->ldap = new rcube_ldap($this->rc->config->get('calendar_resources_directory'), true);
-      }
+        if (!isset($this->ldap)) {
+            $this->ldap = new rcube_ldap($this->rc->config->get('calendar_resources_directory'), true);
+        }
 
-      return $this->ldap->ready ? $this->ldap : null;
+        return $this->ldap->ready ? $this->ldap : null;
     }
-
-}
\ No newline at end of file
+}

iRony-0.4.5.tar.gz/lib/plugins/calendar/drivers/resources_driver.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/drivers/resources_driver.php Changed

@@ -26,87 +26,93 @@
  */
 abstract class resources_driver
 {
-  protected $cal;
+    protected $cal;
 
-  /**
-   * Default constructor
-   */
-  function __construct($cal)
-  {
-      $this->cal = $cal;
-  }
+    /**
+     * Default constructor
+     */
+    function __construct($cal)
+    {
+        $this->cal = $cal;
+    }
 
-  /**
-   * Fetch resource objects to be displayed for booking
-   *
-   * @param  string  Search query (optional)
-   * @return array  List of resource records available for booking
-   */
-  abstract public function load_resources($query = null);
+    /**
+     * Fetch resource objects to be displayed for booking
+     *
+     * @param string $query Search query (optional)
+     *
+     * @return array List of resource records available for booking
+     */
+    abstract public function load_resources($query = null);
 
-  /**
-   * Return properties of a single resource
-   *
-   * @param string  Unique resource identifier
-   * @return array  Resource object as hash array
-   */
-  abstract public function get_resource($id);
+    /**
+     * Return properties of a single resource
+     *
+     * @param string $id Unique resource identifier
+     *
+     * @return array Resource object as hash array
+     */
+    abstract public function get_resource($id);
 
-  /**
-   * Return properties of a resource owner
-   *
-   * @param string  Owner identifier
-   * @return array  Resource object as hash array
-   */
-  public function get_resource_owner($id)
-  {
-      return null;
-  }
+    /**
+     * Return properties of a resource owner
+     *
+     * @param string $id Owner identifier
+     *
+     * @return array Resource object as hash array
+     */
+    public function get_resource_owner($id)
+    {
+        return null;
+    }
 
-  /**
-   * Get event data to display a resource's calendar
-   *
-   * The default implementation extracts the resource's email address
-   * and fetches free-busy data using the calendar backend driver.
-   *
-   * @param  integer Event's new start (unix timestamp)
-   * @param  integer Event's new end (unix timestamp)
-   * @return array A list of event objects (see calendar_driver specification)
-   */
-  public function get_resource_calendar($id, $start, $end)
-  {
-      $events = array();
-      $rec = $this->get_resource($id);
-      if ($rec && !empty($rec'email') && $this->cal->driver) {
-          $fbtypemap = array(
-              calendar::FREEBUSY_BUSY => 'busy',
-              calendar::FREEBUSY_TENTATIVE => 'tentative',
-              calendar::FREEBUSY_OOF => 'outofoffice',
-          );
+    /**
+     * Get event data to display a resource's calendar
+     *
+     * The default implementation extracts the resource's email address
+     * and fetches free-busy data using the calendar backend driver.
+     *
+     * @param string $id    Calendar identifier
+     * @param int    $start Event's new start (unix timestamp)
+     * @param int    $end   Event's new end (unix timestamp)
+     *
+     * @return array A list of event objects (see calendar_driver specification)
+     */
+    public function get_resource_calendar($id, $start, $end)
+    {
+        $events = ;
+        $rec    = $this->get_resource($id);
 
-          // if the backend has free-busy information
-          $fblist = $this->cal->driver->get_freebusy_list($rec'email', $start, $end);
-          if (is_array($fblist)) {
-              foreach ($fblist as $slot) {
-                  list($from, $to, $type) = $slot;
-                  if ($type == calendar::FREEBUSY_FREE || $type == calendar::FREEBUSY_UNKNOWN) {
-                      continue;
-                  }
-                  if ($from < $end && $to > $start) {
-                      $event = array(
-                          'id'     => sha1($id . $from . $to),
-                          'title'  => $rec'name',
-                          'start'  => new DateTime('@' . $from),
-                          'end'    => new DateTime('@' . $to),
-                          'status' => $fbtypemap$type,
-                          'calendar' => '_resource',
-                      );
-                      $events = $event;
-                  }
-              }
-          }
-      }
+        if ($rec && !empty($rec'email') && !empty($this->cal->driver)) {
+            $fbtypemap = 
+                calendar::FREEBUSY_BUSY      => 'busy',
+                calendar::FREEBUSY_TENTATIVE => 'tentative',
+                calendar::FREEBUSY_OOF       => 'outofoffice',
+            ;
 
-      return $events;
-  }
+            // if the backend has free-busy information
+            $fblist = $this->cal->driver->get_freebusy_list($rec'email', $start, $end);
+            if (is_array($fblist)) {
+                foreach ($fblist as $slot) {
+                    list($from, $to, $type) = $slot;
+                    if ($type == calendar::FREEBUSY_FREE || $type == calendar::FREEBUSY_UNKNOWN) {
+                        continue;
+                    }
+
+                    if ($from < $end && $to > $start) {
+                        $events = 
+                            'id'     => sha1($id . $from . $to),
+                            'title'  => $rec'name',
+                            'start'  => new DateTime('@' . $from),
+                            'end'    => new DateTime('@' . $to),
+                            'status' => $fbtypemap$type,
+                            'calendar' => '_resource',
+                        ;
+                    }
+                }
+            }
+        }
+
+        return $events;
+    }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/lib/calendar_itip.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/lib/calendar_itip.php Changed

@@ -28,213 +28,231 @@
  */
 class calendar_itip extends libcalendaring_itip
 {
-  /**
-   * Constructor to set text domain to calendar
-   */
-  function __construct($plugin, $domain = 'calendar')
-  {
-    parent::__construct($plugin, $domain);
-
-    $this->db_itipinvitations = $this->rc->db->table_name('itipinvitations', true);
-  }
-
-  /**
-   * Handler for calendar/itip-status requests
-   */
-  public function get_itip_status($event, $existing = null)
-  {
-    $status = parent::get_itip_status($event, $existing);
-
-    // don't ask for deleting events when declining
-    if ($this->rc->config->get('kolab_invitation_calendars'))
-      $status'saved' = false;
-
-    return $status;
-  }
-
-  /**
-   * Find invitation record by token
-   *
-   * @param string Invitation token
-   * @return mixed Invitation record as hash array or False if not found
-   */
-  public function get_invitation($token)
-  {
-    if ($parts = $this->decode_token($token)) {
-      $result = $this->rc->db->query("SELECT * FROM $this->db_itipinvitations WHERE `token` = ?", $parts'base');
-      if ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
-        $rec'event' = unserialize($rec'event');
-        $rec'attendee' = $parts'attendee';
-        return $rec;
-      }
+    /**
+     * Constructor to set text domain to calendar
+     */
+    function __construct($plugin, $domain = 'calendar')
+    {
+        parent::__construct($plugin, $domain);
+
+        $this->db_itipinvitations = $this->rc->db->table_name('itipinvitations', true);
+    }
+
+    /**
+     * Handler for calendar/itip-status requests
+     */
+    public function get_itip_status($event, $existing = null)
+    {
+        $status = parent::get_itip_status($event, $existing);
+
+        // don't ask for deleting events when declining
+        if ($this->rc->config->get('kolab_invitation_calendars')) {
+            $status'saved' = false;
+        }
+
+        return $status;
     }
-    
-    return false;
-  }
-
-  /**
-   * Update the attendee status of the given invitation record
-   *
-   * @param array Invitation record as fetched with calendar_itip::get_invitation()
-   * @param string Attendee email address
-   * @param string New attendee status
-   */
-  public function update_invitation($invitation, $email, $newstatus)
-  {
-    if (is_string($invitation))
-      $invitation = $this->get_invitation($invitation);
-    
-    if ($invitation'token' && $invitation'event') {
-      // update attendee record in event data
-      foreach ($invitation'event''attendees' as $i => $attendee) {
-        if ($attendee'role' == 'ORGANIZER') {
-          $organizer = $attendee;
+
+    /**
+     * Find invitation record by token
+     *
+     * @param string $token Invitation token
+     *
+     * @return mixed Invitation record as hash array or False if not found
+     */
+    public function get_invitation($token)
+    {
+        if ($parts = $this->decode_token($token)) {
+            $result = $this->rc->db->query("SELECT * FROM $this->db_itipinvitations WHERE `token` = ?", $parts'base');
+            if ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
+                $rec'event'    = unserialize($rec'event');
+                $rec'attendee' = $parts'attendee';
+
+                return $rec;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Update the attendee status of the given invitation record
+     *
+     * @param array  $invitation Invitation record as fetched with calendar_itip::get_invitation()
+     * @param string $email      Attendee email address
+     * @param string $newstatus  New attendee status
+     */
+    public function update_invitation($invitation, $email, $newstatus)
+    {
+        if (is_string($invitation)) {
+            $invitation = $this->get_invitation($invitation);
+        }
+
+        if (!empty($invitation'token') && !empty($invitation'event')) {
+            // update attendee record in event data
+            foreach ($invitation'event''attendees' as $i => $attendee) {
+                if ($attendee'role' == 'ORGANIZER') {
+                    $organizer = $attendee;
+                }
+                else if ($attendee'email' == $email) {
+                    // nothing to be done here
+                    if ($attendee'status' == $newstatus) {
+                        return true;
+                    }
+
+                    $invitation'event''attendees'$i'status' = $newstatus;
+                    $this->sender = $attendee;
+                }
+            }
+
+            $invitation'event''changed' = new DateTime();
+
+            // send iTIP REPLY message to organizer
+            if (!empty($organizer)) {
+                $status = strtolower($newstatus);
+                if ($this->send_itip_message($invitation'event', 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status)) {
+                    $mailto = !empty($organizer'name') ? $organizer'name' : $organizer'email';
+                    $message = $this->plugin->gettext(
+                            'name' => 'sentresponseto',
+                            'vars' => 'mailto' => $mailto
+                    );
+                    $this->rc->output->command('display_message', $message, 'confirmation');
+                }
+                else {
+                    $this->rc->output->command('display_message', $this->plugin->gettext('itipresponseerror'), 'error');
+                }
+            }
+
+            // update record in DB
+            $query = $this->rc->db->query(
+                "UPDATE $this->db_itipinvitations SET `event` = ? WHERE `token` = ?",
+                self::serialize_event($invitation'event'),
+                $invitation'token'
+            );
+
+            if ($this->rc->db->affected_rows($query)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Create iTIP invitation token for later replies via URL
+     *
+     * @param array  $event    Hash array with event properties
+     * @param string $attendee Attendee email address
+     *
+     * @return string Invitation token
+     */
+    public function store_invitation($event, $attendee)
+    {
+        static $stored = ;
+
+        if (empty($event'uid') || !$attendee) {
+            return false;
+        }
+
+        // generate token for this invitation
+        $token = $this->generate_token($event, $attendee);
+        $base = substr($token, 0, 40);
+
+        // already stored this
+        if (!empty($stored$base)) {
+            return $token;
         }
-        else if ($attendee'email' == $email) {
-          // nothing to be done here
-          if ($attendee'status' == $newstatus)
-            return true;
-          
-          $invitation'event''attendees'$i'status' = $newstatus;
-          $this->sender = $attendee;
+
+        // delete old entry
+        $this->rc->db->query("DELETE FROM $this->db_itipinvitations WHERE `token` = ?", $base);
+
+        $event_uid = $event'uid' . (!empty($event'_instance') ? '-' . $event'_instance' : '');
+
+        $query = $this->rc->db->query(
+            "INSERT INTO $this->db_itipinvitations"
+            . " (`token`, `event_uid`, `user_id`, `event`, `expires`)"
+            . " VALUES(?, ?, ?, ?, ?)",
+            $base,
+            $event_uid,
+            $this->rc->user->ID,
+            self::serialize_event($event),
+            date('Y-m-d H:i:s', $event'end'->format('U') + 86400 * 2)
+        );
+
+        if ($this->rc->db->affected_rows($query)) {
+            $stored$base = 1;
+            return $token;
         }
-      }
-      $invitation'event''changed' = new DateTime();
-      
-      // send iTIP REPLY message to organizer
-      if ($organizer) {
-        $status = strtolower($newstatus);
-        if ($this->send_itip_message($invitation'event', 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
-          $this->rc->output->command('display_message', $this->plugin->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer'name' ? $organizer'name' : $organizer'email'))), 'confirmation');
-        else
-          $this->rc->output->command('display_message', $this->plugin->gettext('itipresponseerror'), 'error');
-      }
-      
-      // update record in DB
-      $query = $this->rc->db->query(
-        "UPDATE $this->db_itipinvitations
-         SET `event` = ?
-         WHERE `token` = ?",
-        self::serialize_event($invitation'event'),
-        $invitation'token'
-      );
-
-      if ($this->rc->db->affected_rows($query))
-        return true;
+
+        return false;
     }
-    
-    return false;
-  }
-
-
-  /**
-   * Create iTIP invitation token for later replies via URL
-   *
-   * @param array Hash array with event properties
-   * @param string Attendee email address
-   * @return string Invitation token
-   */
-  public function store_invitation($event, $attendee)
-  {
-    static $stored = array();
-    
-    if (!$event'uid' || !$attendee)
-      return false;
-      
-    // generate token for this invitation
-    $token = $this->generate_token($event, $attendee);
-    $base = substr($token, 0, 40);
-    
-    // already stored this
-    if ($stored$base)
-      return $token;
-
-    // delete old entry
-    $this->rc->db->query("DELETE FROM $this->db_itipinvitations WHERE `token` = ?", $base);
-
-    $event_uid = $event'uid' . ($event'_instance' ? '-' . $event'_instance' : '');
-
-    $query = $this->rc->db->query(
-      "INSERT INTO $this->db_itipinvitations
-       (`token`, `event_uid`, `user_id`, `event`, `expires`)
-       VALUES(?, ?, ?, ?, ?)",
-      $base,
-      $event_uid,
-      $this->rc->user->ID,
-      self::serialize_event($event),
-      date('Y-m-d H:i:s', $event'end'->format('U') + 86400 * 2)
-    );
-    
-    if ($this->rc->db->affected_rows($query)) {
-      $stored$base = 1;
-      return $token;
+
+    /**
+     * Mark invitations for the given event as cancelled
+     *
+     * @param array $event Hash array with event properties
+     */
+    public function cancel_itip_invitation($event)
+    {
+        $event_uid = $event'uid' . (!empty($event'_instance') ? '-' . $event'_instance' : '');
+
+        // flag invitation record as cancelled
+        $this->rc->db->query(
+            "UPDATE $this->db_itipinvitations SET `cancelled` = 1"
+            . " WHERE `event_uid` = ? AND `user_id` = ?",
+           $event_uid,
+           $this->rc->user->ID
+        );
     }
-    
-    return false;
-  }
-
-  /**
-   * Mark invitations for the given event as cancelled
-   *
-   * @param array Hash array with event properties
-   */
-  public function cancel_itip_invitation($event)
-  {
-    $event_uid = $event'uid' . ($event'_instance' ? '-' . $event'_instance' : '');
-
-    // flag invitation record as cancelled
-    $this->rc->db->query(
-      "UPDATE $this->db_itipinvitations
-       SET `cancelled` = 1
-       WHERE `event_uid` = ? AND `user_id` = ?",
-       $event_uid,
-       $this->rc->user->ID
-    );
-  }
-
-  /**
-   * Generate an invitation request token for the given event and attendee
-   *
-   * @param array Event hash array
-   * @param string Attendee email address
-   */
-  public function generate_token($event, $attendee)
-  {
-    $event_uid = $event'uid' . ($event'_instance' ? '-' . $event'_instance' : '');
-    $base = sha1($event_uid . ';' . $this->rc->user->ID);
-    $mail = base64_encode($attendee);
-    $hash = substr(md5($base . $mail . $this->rc->config->get('des_key')), 0, 6);
-    
-    return "$base.$mail.$hash";
-  }
-
-  /**
-   * Decode the given iTIP request token and return its parts
-   *
-   * @param string Request token to decode
-   * @return mixed Hash array with parts or False if invalid
-   */
-  public function decode_token($token)
-  {
-    list($base, $mail, $hash) = explode('.', $token);
-    
-    // validate and return parts
-    if ($mail && $hash && $hash == substr(md5($base . $mail . $this->rc->config->get('des_key')), 0, 6)) {
-      return array('base' => $base, 'attendee' => base64_decode($mail));
+
+    /**
+     * Generate an invitation request token for the given event and attendee
+     *
+     * @param array  $event    Event hash array
+     * @param string $attendee Attendee email address
+     */
+    public function generate_token($event, $attendee)
+    {
+        $event_uid = $event'uid' . (!empty($event'_instance') ? '-' . $event'_instance' : '');
+        $base = sha1($event_uid . ';' . $this->rc->user->ID);
+        $mail = base64_encode($attendee);
+        $hash = substr(md5($base . $mail . $this->rc->config->get('des_key')), 0, 6);
+
+        return "$base.$mail.$hash";
+    }
+
+    /**
+     * Decode the given iTIP request token and return its parts
+     *
+     * @param string $token Request token to decode
+     *
+     * @return mixed Hash array with parts or False if invalid
+     */
+    public function decode_token($token)
+    {
+        list($base, $mail, $hash) = explode('.', $token);
+
+        // validate and return parts
+        if ($mail && $hash && $hash == substr(md5($base . $mail . $this->rc->config->get('des_key')), 0, 6)) {
+            return 'base' => $base, 'attendee' => base64_decode($mail);
+        }
+
+        return false;
     }
-    
-    return false;
-  }
-
-  /**
-   * Helper method to serialize the given event for storing in invitations table
-   */
-  private static function serialize_event($event)
-  {
-    $ev = $event;
-    $ev'description' = abbreviate_string($ev'description', 100);
-    unset($ev'attachments');
-    return serialize($ev);
-  }
 
+    /**
+     * Helper method to serialize the given event for storing in invitations table
+     */
+    private static function serialize_event($event)
+    {
+        $ev = $event;
+
+        if (!empty($ev'description')) {
+            $ev'description' = abbreviate_string($ev'description', 100);
+        }
+
+        unset($ev'attachments');
+
+        return serialize($ev);
+    }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/lib/calendar_recurrence.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/lib/calendar_recurrence.php Changed

@@ -26,63 +26,64 @@
  */
 class calendar_recurrence extends libcalendaring_recurrence
 {
-  private $event;
-  private $duration;
+    private $event;
+    private $duration;
 
-  /**
-   * Default constructor
-   *
-   * @param object calendar The calendar plugin instance
-   * @param array The event object to operate on
-   */
-  function __construct($cal, $event)
-  {
-    parent::__construct($cal->lib);
+    /**
+     * Default constructor
+     *
+     * @param calendar $cal   The calendar plugin instance
+     * @param array    $event The event object to operate on
+     */
+    function __construct($cal, $event)
+    {
+        parent::__construct($cal->lib);
 
-    $this->event = $event;
+        $this->event = $event;
 
-    if (is_object($event'start') && is_object($event'end'))
-      $this->duration = $event'start'->diff($event'end');
+        if (is_object($event'start') && is_object($event'end')) {
+            $this->duration = $event'start'->diff($event'end');
+        }
 
-    $event'start'->_dateonly |= $event'allday';
-    $this->init($event'recurrence', $event'start');
-  }
+        $event'start'->_dateonly = !empty($event'allday');
 
-  /**
-   * Alias of libcalendaring_recurrence::next()
-   *
-   * @return mixed DateTime object or False if recurrence ended
-   */
-  public function next_start()
-  {
-    return $this->next();
-  }
+        $this->init($event'recurrence', $event'start');
+    }
 
-  /**
-   * Get the next recurring instance of this event
-   *
-   * @return mixed Array with event properties or False if recurrence ended
-   */
-  public function next_instance()
-  {
-    if ($next_start = $this->next()) {
-      $next = $this->event;
-      $next'start' = $next_start;
+    /**
+     * Alias of libcalendaring_recurrence::next()
+     *
+     * @return mixed DateTime object or False if recurrence ended
+     */
+    public function next_start()
+    {
+        return $this->next();
+    }
 
-      if ($this->duration) {
-        $next'end' = clone $next_start;
-        $next'end'->add($this->duration);
-      }
+    /**
+     * Get the next recurring instance of this event
+     *
+     * @return mixed Array with event properties or False if recurrence ended
+     */
+    public function next_instance()
+    {
+        if ($next_start = $this->next()) {
+            $next = $this->event;
+            $next'start' = $next_start;
 
-      $next'recurrence_date' = clone $next_start;
-      $next'_instance' = libcalendaring::recurrence_instance_identifier($next, $this->event'allday');
+            if ($this->duration) {
+                $next'end' = clone $next_start;
+                $next'end'->add($this->duration);
+            }
 
-      unset($next'_formatobj');
+            $next'recurrence_date' = clone $next_start;
+            $next'_instance' = libcalendaring::recurrence_instance_identifier($next, $this->event'allday');
 
-      return $next;
-    }
+            unset($next'_formatobj');
 
-    return false;
-  }
+            return $next;
+        }
 
+        return false;
+    }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/lib/calendar_ui.php -> iRony-0.4.6.tar.gz/lib/plugins/calendar/lib/calendar_ui.php Changed

@@ -25,819 +25,1001 @@
 
 class calendar_ui
 {
-  private $rc;
-  private $cal;
-  private $ready = false;
-  public $screen;
-
-  function __construct($cal)
-  {
-    $this->cal = $cal;
-    $this->rc = $cal->rc;
-    $this->screen = $this->rc->task == 'calendar' ? ($this->rc->action ? $this->rc->action: 'calendar') : 'other';
-  }
-
-  /**
-   * Calendar UI initialization and requests handlers
-   */
-  public function init()
-  {
-    if ($this->ready)  // already done
-      return;
-
-    // add taskbar button
-    $this->cal->add_button(array(
-      'command'    => 'calendar',
-      'class'      => 'button-calendar',
-      'classsel'   => 'button-calendar button-selected',
-      'innerclass' => 'button-inner',
-      'label'      => 'calendar.calendar',
-      'type'       => 'link'
-      ), 'taskbar');
-    
-    // load basic client script
-    if ($this->rc->action != 'print') {
-      $this->cal->include_script('calendar_base.js');
-    }
-
-    $this->addCSS();
-
-    $this->ready = true;
-  }
-
-  /**
-   * Register handler methods for the template engine
-   */
-  public function init_templates()
-  {
-    $this->cal->register_handler('plugin.calendar_css', array($this, 'calendar_css'));
-    $this->cal->register_handler('plugin.calendar_list', array($this, 'calendar_list'));
-    $this->cal->register_handler('plugin.calendar_select', array($this, 'calendar_select'));
-    $this->cal->register_handler('plugin.identity_select', array($this, 'identity_select'));
-    $this->cal->register_handler('plugin.category_select', array($this, 'category_select'));
-    $this->cal->register_handler('plugin.status_select', array($this, 'status_select'));
-    $this->cal->register_handler('plugin.freebusy_select', array($this, 'freebusy_select'));
-    $this->cal->register_handler('plugin.priority_select', array($this, 'priority_select'));
-    $this->cal->register_handler('plugin.sensitivity_select', array($this, 'sensitivity_select'));
-    $this->cal->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
-    $this->cal->register_handler('plugin.recurrence_form', array($this->cal->lib, 'recurrence_form'));
-    $this->cal->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
-    $this->cal->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
-    $this->cal->register_handler('plugin.resources_form', array($this, 'resources_form'));
-    $this->cal->register_handler('plugin.resources_list', array($this, 'resources_list'));
-    $this->cal->register_handler('plugin.resources_searchform', array($this, 'resources_search_form'));
-    $this->cal->register_handler('plugin.resource_info', array($this, 'resource_info'));
-    $this->cal->register_handler('plugin.resource_calendar', array($this, 'resource_calendar'));
-    $this->cal->register_handler('plugin.attendees_freebusy_table', array($this, 'attendees_freebusy_table'));
-    $this->cal->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
-    $this->cal->register_handler('plugin.edit_recurrence_sync', array($this, 'edit_recurrence_sync'));
-    $this->cal->register_handler('plugin.edit_recurring_warning', array($this, 'recurring_event_warning'));
-    $this->cal->register_handler('plugin.event_rsvp_buttons', array($this, 'event_rsvp_buttons'));
-    $this->cal->register_handler('plugin.agenda_options', array($this, 'agenda_options'));
-    $this->cal->register_handler('plugin.events_import_form', array($this, 'events_import_form'));
-    $this->cal->register_handler('plugin.events_export_form', array($this, 'events_export_form'));
-    $this->cal->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
-    $this->cal->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));  // use generic method from rcube_template
-
-    kolab_attachments_handler::ui();
-  }
-
-  /**
-   * Adds CSS stylesheets to the page header
-   */
-  public function addCSS()
-  {
-    $skin_path = $this->cal->local_skin_path();
+    private $rc;
+    private $cal;
+    private $ready = false;
+
+    public $screen;
+
+    function __construct($cal)
+    {
+        $this->cal    = $cal;
+        $this->rc     = $cal->rc;
+        $this->screen = $this->rc->task == 'calendar' ? ($this->rc->action ?: 'calendar') : 'other';
+    }
+
+    /**
+     * Calendar UI initialization and requests handlers
+     */
+    public function init()
+    {
+        if ($this->ready) {
+            // already done
+            return;
+        }
+
+        // add taskbar button
+        $this->cal->add_button(
+                'command'    => 'calendar',
+                'class'      => 'button-calendar',
+                'classsel'   => 'button-calendar button-selected',
+                'innerclass' => 'button-inner',
+                'label'      => 'calendar.calendar',
+                'type'       => 'link'
+            ,
+            'taskbar'
+        );
+
+        // load basic client script
+        if ($this->rc->action != 'print') {
+            $this->cal->include_script('calendar_base.js');
+        }
+
+        $this->addCSS();
+
+        $this->ready = true;
+    }
+
+    /**
+     * Register handler methods for the template engine
+     */
+    public function init_templates()
+    {
+        $this->cal->register_handler('plugin.calendar_css', $this, 'calendar_css');
+        $this->cal->register_handler('plugin.calendar_list', $this, 'calendar_list');
+        $this->cal->register_handler('plugin.calendar_select', $this, 'calendar_select');
+        $this->cal->register_handler('plugin.identity_select', $this, 'identity_select');
+        $this->cal->register_handler('plugin.category_select', $this, 'category_select');
+        $this->cal->register_handler('plugin.status_select', $this, 'status_select');
+        $this->cal->register_handler('plugin.freebusy_select', $this, 'freebusy_select');
+        $this->cal->register_handler('plugin.priority_select', $this, 'priority_select');
+        $this->cal->register_handler('plugin.sensitivity_select', $this, 'sensitivity_select');
+        $this->cal->register_handler('plugin.alarm_select', $this, 'alarm_select');
+        $this->cal->register_handler('plugin.recurrence_form', $this->cal->lib, 'recurrence_form');
+        $this->cal->register_handler('plugin.attendees_list', $this, 'attendees_list');
+        $this->cal->register_handler('plugin.attendees_form', $this, 'attendees_form');
+        $this->cal->register_handler('plugin.resources_form', $this, 'resources_form');
+        $this->cal->register_handler('plugin.resources_list', $this, 'resources_list');
+        $this->cal->register_handler('plugin.resources_searchform', $this, 'resources_search_form');
+        $this->cal->register_handler('plugin.resource_info', $this, 'resource_info');
+        $this->cal->register_handler('plugin.resource_calendar', $this, 'resource_calendar');
+        $this->cal->register_handler('plugin.attendees_freebusy_table', $this, 'attendees_freebusy_table');
+        $this->cal->register_handler('plugin.edit_attendees_notify', $this, 'edit_attendees_notify');
+        $this->cal->register_handler('plugin.edit_recurrence_sync', $this, 'edit_recurrence_sync');
+        $this->cal->register_handler('plugin.edit_recurring_warning', $this, 'recurring_event_warning');
+        $this->cal->register_handler('plugin.event_rsvp_buttons', $this, 'event_rsvp_buttons');
+        $this->cal->register_handler('plugin.agenda_options', $this, 'agenda_options');
+        $this->cal->register_handler('plugin.events_import_form', $this, 'events_import_form');
+        $this->cal->register_handler('plugin.events_export_form', $this, 'events_export_form');
+        $this->cal->register_handler('plugin.object_changelog_table', 'libkolab', 'object_changelog_table');
+        $this->cal->register_handler('plugin.searchform', $this->rc->output, 'search_form');
+
+        kolab_attachments_handler::ui();
+    }
+
+    /**
+     * Adds CSS stylesheets to the page header
+     */
+    public function addCSS()
+    {
+        $skin_path = $this->cal->local_skin_path();
  
-    if ($this->rc->task == 'calendar' && (!$this->rc->action || in_array($this->rc->action, array('index', 'print')))) {
-      // Include fullCalendar style before skin file for simpler style overriding
-      $this->cal->include_stylesheet($skin_path . '/fullcalendar.css');
-    }
-
-    $this->cal->include_stylesheet($skin_path . '/calendar.css');
-
-    if ($this->rc->task == 'calendar' && $this->rc->action == 'print') {
-      $this->cal->include_stylesheet($skin_path . '/print.css');
+        if (
+            $this->rc->task == 'calendar'
+            && (!$this->rc->action || in_array($this->rc->action, 'index', 'print'))
+        ) {
+            // Include fullCalendar style before skin file for simpler style overriding
+            $this->cal->include_stylesheet($skin_path . '/fullcalendar.css');
+        }
+
+        $this->cal->include_stylesheet($skin_path . '/calendar.css');
+
+        if ($this->rc->task == 'calendar' && $this->rc->action == 'print') {
+            $this->cal->include_stylesheet($skin_path . '/print.css');
+        }
+    }
+
+    /**
+     * Adds JS files to the page header
+     */
+    public function addJS()
+    {
+        $this->cal->include_script('lib/js/moment.js');
+        $this->cal->include_script('lib/js/fullcalendar.js');
+
+        if ($this->rc->task == 'calendar' && $this->rc->action == 'print') {
+            $this->cal->include_script('print.js');
+        }
+        else {
+            $this->rc->output->include_script('treelist.js');
+            $this->cal->api->include_script('libkolab/libkolab.js');
+            $this->cal->include_script('calendar_ui.js');
+            jqueryui::miniColors();
+        }
+    }
+
+    /**
+     * Add custom style for the calendar UI
+     */
+    function calendar_css($attrib = )
+    {
+        $categories    = $this->cal->driver->list_categories();
+        $calendars     = $this->cal->driver->list_calendars();
+        $js_categories = ;
+
+        $mode = $this->rc->config->get('calendar_event_coloring', $this->cal->defaults'calendar_event_coloring');
+        $css  = "\n";
+
+        foreach ((array) $categories as $class => $color) {
+            if (!empty($color)) {
+                $js_categories$class = $color;
+
+                $color = ltrim($color, '#');
+                $class = 'cat-' . asciiwords(strtolower($class), true);
+                $css  .= ".$class { color: #$color; }\n";
+            }
+        }
+
+        $this->rc->output->set_env('calendar_categories', $js_categories);
+
+        foreach ((array) $calendars as $id => $prop) {
+            if (!empty($prop'color')) {
+                $css .= $this->calendar_css_classes($id, $prop, $mode, $attrib);
+            }
+        }
+
+        return html::tag('style', 'type' => 'text/css', $css);
+    }
+
+    /**
+     * Calendar folder specific CSS classes
+     */
+    public function calendar_css_classes($id, $prop, $mode, $attrib = )
+    {
+        $color = $folder_color = $prop'color';
+
+        // replace white with skin-defined color
+        if (!empty($attrib'folder-fallback-color') && preg_match('/^f+$/i', $folder_color)) {
+            $folder_color = ltrim($attrib'folder-fallback-color', '#');
+        }
+
+        $class = 'cal-' . asciiwords($id, true);
+        $css   = "li .$class";
+        if (!empty($attrib'folder-class')) {
+            $css = str_replace('$class', $class, $attrib'folder-class');
+        }
+        $css  .= " { color: #$folder_color; }\n";
+
+        return $css . ".$class .handle { background-color: #$color; }\n";
+    }
+
+    /**
+     * Generate HTML content of the calendars list (or metadata only)
+     */
+    function calendar_list($attrib = , $js_only = false)
+    {
+        $html      = '';
+        $jsenv     = ;
+        $tree      = true;
+        $calendars = $this->cal->driver->list_calendars(0, $tree);
+
+        // walk folder tree
+        if (is_object($tree)) {
+            $html = $this->list_tree_html($tree, $calendars, $jsenv, $attrib);
+
+            // append birthdays calendar which isn't part of $tree
+            if (!empty($calendarscalendar_driver::BIRTHDAY_CALENDAR_ID)) {
+                $bdaycal = $calendarscalendar_driver::BIRTHDAY_CALENDAR_ID;
+                $calendars = calendar_driver::BIRTHDAY_CALENDAR_ID => $bdaycal;
+            }
+            else {
+                $calendars = ;  // clear array for flat listing
+            }
+        }
+        else if (isset($attrib'class')) {
+            // fall-back to flat folder listing
+            $attrib'class' .= ' flat';
+        }
+
+        foreach ((array) $calendars as $id => $prop) {
+            if (!empty($attrib'activeonly') && empty($prop'active')) {
+                continue;
+            }
+
+            $li_content = $this->calendar_list_item($id, $prop, $jsenv, !empty($attrib'activeonly'));
+            $li_attr = 
+                'id'    => 'rcmlical' . $id,
+                'class' => isset($prop'group') ? $prop'group' : null,
+            ;
+
+            $html .= html::tag('li', $li_attr, $li_content);
+        }
+
+        $this->rc->output->set_env('calendars', $jsenv);
+
+        if ($js_only) {
+            return;
+        }
+
+        $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
+        $this->rc->output->add_gui_object('calendarslist', !empty($attrib'id') ? $attrib'id' : 'rccalendarlist');
+
+        return html::tag('ul', $attrib, $html, html::$common_attrib);
+    }
+
+    /**
+     * Return html for a structured list <ul> for the folder tree
+     */
+    public function list_tree_html($node, $data, &$jsenv, $attrib)
+    {
+        $out = '';
+        foreach ($node->children as $folder) {
+            $id   = $folder->id;
+            $prop = $data$id;
+            $is_collapsed = false; // TODO: determine this somehow?
+
+            $content = $this->calendar_list_item($id, $prop, $jsenv, !empty($attrib'activeonly'));
+
+            if (!empty($folder->children)) {
+                $content .= html::tag('ul', 'style' => $is_collapsed ? "display:none;" : null,
+                    $this->list_tree_html($folder, $data, $jsenv, $attrib)
+                );
+            }
+
+            if (strlen($content)) {
+                $li_attr = 
+                    'id'    => 'rcmlical' . rcube_utils::html_identifier($id),
+                    'class' => $prop'group' . (!empty($prop'virtual') ? ' virtual' : ''),
+                ;
+                $out .= html::tag('li', $li_attr, $content);
+            }
+        }
+
+        return $out;
+    }
+
+    /**
+     * Helper method to build a calendar list item (HTML content and js data)
+     */
+    public function calendar_list_item($id, $prop, &$jsenv, $activeonly = false)
+    {
+        // enrich calendar properties with settings from the driver
+        if (empty($prop'virtual')) {
+            unset($prop'user_id');
+
+            $prop'alarms'      = $this->cal->driver->alarms;
+            $prop'attendees'   = $this->cal->driver->attendees;
+            $prop'freebusy'    = $this->cal->driver->freebusy;
+            $prop'attachments' = $this->cal->driver->attachments;
+            $prop'undelete'    = $this->cal->driver->undelete;
+            $prop'feedurl'     = $this->cal->get_url(
+                    '_cal'   => $this->cal->ical_feed_hash($id) . '.ics',
+                    'action' => 'feed'
+                
+            );
+
+            $jsenv$id = $prop;
+        }
+
+        if (!empty($prop'title')) {
+            $title = $prop'title';
+        }
+        else if ($prop'name' != $prop'listname' || strlen($prop'name') > 25) {
+            $title = html_entity_decode($prop'name', ENT_COMPAT, RCUBE_CHARSET);
+        }
+        else {
+            $title = '';
+        }
+
+        $classes = 'calendar', 'cal-'  . asciiwords($id, true);
+
+        if (!empty($prop'virtual')) {
+            $classes = 'virtual';
+        }
+        else if (empty($prop'editable')) {
+            $classes = 'readonly';
+        }
+        if (!empty($prop'subscribed')) {
+            $classes = 'subscribed';
+
+            if ($prop'subscribed' === 2) {
+                $classes = 'partial';
+            }
+        }
+        if (!empty($prop'class')) {
+            $classes = $prop'class';
+        }
+
+        $content = '';
+
+        if (!$activeonly || !empty($prop'active')) {
+            $label_id = 'cl:' . $id;
+            $content = html::a(
+                'class' => 'calname', 'id' => $label_id, 'title' => $title, 'href' => '#',
+                rcube::Q(!empty($prop'editname') ? $prop'editname' : $prop'listname')
+            );
+
+            if (empty($prop'virtual')) {
+                $color   = !empty($prop'color') ? $prop'color' : 'f00';
+                $actions = '';
+
+                if (!EMPTY($prop'removable')) {
+                    $actions .= html::a(
+                            'href'  => '#',
+                            'class' => 'remove',
+                            'title' => $this->cal->gettext('removelist')
+                        , ' '
+                    );
+                }
+
+                $actions .= html::a(
+                        'href'  => '#',
+                        'class' => 'quickview',
+                        'title' => $this->cal->gettext('quickview'),
+                        'role'  => 'checkbox',
+                        'aria-checked' => 'false'
+                    , ''
+                );
+
+                if (!empty($prop'subscribed')) {
+                    $actions .= html::a(
+                            'href'  => '#',
+                            'class' => 'subscribed',
+                            'title' => $this->cal->gettext('calendarsubscribe'),
+                            'role'  => 'checkbox',
+                            'aria-checked' => !empty($prop'subscribed') ? 'true' : 'false'
+                        , ' '
+                    );
+                }
+
+                $content .= html::tag('input', 
+                        'type'    => 'checkbox',
+                        'name'    => '_cal',
+                        'value'   => $id,
+                        'checked' => !empty($prop'active'),
+                        'aria-labelledby' => $label_id
+                    )
+                    . html::span('actions', $actions)
+                    . html::span('class' => 'handle', 'style' => "background-color: #$color", '&nbsp;');
+            }
+
+            $content = html::div(join(' ', $classes), $content);
+        }
+
+        return $content;
+    }
+
+    /**
+     * Render a HTML for agenda options form
+     */
+    function agenda_options($attrib = )
+    {
+        $attrib += 'id' => 'agendaoptions';
+        $attrib'style' = 'display:none';
+
+        $select_range = new html_select('name' => 'listrange', 'id' => 'agenda-listrange', 'class' => 'form-control custom-select');
+        $select_range->add(1 . ' ' . preg_replace('/$.+$/', '', $this->cal->lib->gettext('days')), '');
+
+        foreach (2,5,7,14,30,60,90,180,365 as $days) {
+            $select_range->add($days . ' ' . preg_replace('/$|$/', '', $this->cal->lib->gettext('days')), $days);
+        }
+
+        $html = html::span('input-group',
+            html::label('for' => 'agenda-listrange', 'class' => 'input-group-prepend',
+                html::span('input-group-text', $this->cal->gettext('listrange'))
+            )
+            . $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults'calendar_agenda_range'))
+        );
+
+        return html::div($attrib, $html);
     }
-  }
-
-  /**
-   * Adds JS files to the page header
-   */
-  public function addJS()
-  {
-    $this->cal->include_script('lib/js/moment.js');
-    $this->cal->include_script('lib/js/fullcalendar.js');
 
-    if ($this->rc->task == 'calendar' && $this->rc->action == 'print') {
-      $this->cal->include_script('print.js');
+    /**
+     * Render a HTML select box for calendar selection
+     */
+    function calendar_select($attrib = )
+    {
+        $attrib'name'       = 'calendar';
+        $attrib'is_escaped' = true;
+
+        $select = new html_select($attrib);
+
+        foreach ((array) $this->cal->driver->list_calendars() as $id => $prop) {
+            if (
+                !empty($prop'editable')
+                || (!empty($prop'rights') && strpos($prop'rights', 'i') !== false)
+            ) {
+                $select->add($prop'name', $id);
+            }
+        }
+
+        return $select->show(null);
     }
-    else {
-      $this->rc->output->include_script('treelist.js');
-      $this->cal->api->include_script('libkolab/libkolab.js');
-      $this->cal->include_script('calendar_ui.js');
-      jqueryui::miniColors();
+
+    /**
+     * Render a HTML select box for user identity selection
+     */
+    function identity_select($attrib = )
+    {
+        $attrib'name' = 'identity';
+
+        $select     = new html_select($attrib);
+        $identities = $this->rc->user->list_emails();
+
+        foreach ($identities as $ident) {
+            $select->add(format_email_recipient($ident'email', $ident'name'), $ident'identity_id');
+        }
+
+        return $select->show(null);
     }
-  }
 
-  /**
-   *
-   */
-  function calendar_css($attrib = array())
-  {
-    $categories    = $this->cal->driver->list_categories();
-    $js_categories = array();
-    $mode = $this->rc->config->get('calendar_event_coloring', $this->cal->defaults'calendar_event_coloring');
-    $css  = "\n";
+    /**
+     * Render a HTML select box to select an event category
+     */
+    function category_select($attrib = )
+    {
+        $attrib'name' = 'categories';
 
-    foreach ((array)$categories as $class => $color) {
-      if (!empty($color)) {
-        $js_categories$class = $color;
+        $select = new html_select($attrib);
+        $select->add('---', '');
+        foreach (array_keys((array) $this->cal->driver->list_categories()) as $cat) {
+              $select->add($cat, $cat);
+        }
 
-        $color = ltrim($color, '#');
-        $class = 'cat-' . asciiwords(strtolower($class), true);
-        $css  .= ".$class { color: #$color; }\n";
-      }
+        return $select->show(null);
     }
 
-    $this->rc->output->set_env('calendar_categories', $js_categories);
+    /**
+     * Render a HTML select box for status property
+     */
+    function status_select($attrib = )
+    {
+        $attrib'name' = 'status';
+
+        $select = new html_select($attrib);
+        $select->add('---', '');
+        $select->add($this->cal->gettext('status-confirmed'), 'CONFIRMED');
+        $select->add($this->cal->gettext('status-cancelled'), 'CANCELLED');
+        $select->add($this->cal->gettext('status-tentative'), 'TENTATIVE');
 
-    $calendars = $this->cal->driver->list_calendars();
-    foreach ((array)$calendars as $id => $prop) {
-      if ($prop'color') {
-        $css .= $this->calendar_css_classes($id, $prop, $mode, $attrib);
-      }
+        return $select->show(null);
     }
 
-    return html::tag('style', array('type' => 'text/css'), $css);
-  }
+    /**
+     * Render a HTML select box for free/busy/out-of-office property
+     */
+    function freebusy_select($attrib = )
+    {
+        $attrib'name' = 'freebusy';
+
+        $select = new html_select($attrib);
+        $select->add($this->cal->gettext('free'), 'free');
+        $select->add($this->cal->gettext('busy'), 'busy');
+        // out-of-office is not supported by libkolabxml (#3220)
+        // $select->add($this->cal->gettext('outofoffice'), 'outofoffice');
+        $select->add($this->cal->gettext('tentative'), 'tentative');
+
+        return $select->show(null);
+    }
 
-  /**
-   *
-   */
-  public function calendar_css_classes($id, $prop, $mode, $attrib = array())
-  {
-    $color = $folder_color = $prop'color';
-
-    // replace white with skin-defined color
-    if (!empty($attrib'folder-fallback-color') && preg_match('/^f+$/i', $folder_color)) {
-        $folder_color = ltrim($attrib'folder-fallback-color', '#');
-    }
-
-    $class = 'cal-' . asciiwords($id, true);
-    $css   = str_replace('$class', $class, $attrib'folder-class') ?: "li .$class";
-    $css  .= " { color: #$folder_color; }\n";
+    /**
+     * Render a HTML select for event priorities
+     */
+    function priority_select($attrib = )
+    {
+        $attrib'name' = 'priority';
+
+        $select = new html_select($attrib);
+        $select->add('---', '0');
+        $select->add('1 ' . $this->cal->gettext('highest'), '1');
+        $select->add('2 ' . $this->cal->gettext('high'), '2');
+        $select->add('3 ', '3');
+        $select->add('4 ', '4');
+        $select->add('5 ' . $this->cal->gettext('normal'), '5');
+        $select->add('6 ', '6');
+        $select->add('7 ', '7');
+        $select->add('8 ' . $this->cal->gettext('low'), '8');
+        $select->add('9 ' . $this->cal->gettext('lowest'),  '9');
+
+        return $select->show(null);
+    }
 
-    return $css . ".$class .handle { background-color: #$color; }\n";
-  }
+    /**
+     * Render HTML input for sensitivity selection
+     */
+    function sensitivity_select($attrib = )
+    {
+        $attrib'name' = 'sensitivity';
+
+        $select = new html_select($attrib);
+        $select->add($this->cal->gettext('public'), 'public');
+        $select->add($this->cal->gettext('private'), 'private');
+        $select->add($this->cal->gettext('confidential'), 'confidential');
+
+        return $select->show(null);
+    }
+
+    /**
+     * Render HTML form for alarm configuration
+     */
+    function alarm_select($attrib = )
+    {
+        return $this->cal->lib->alarm_select($attrib, $this->cal->driver->alarm_types, $this->cal->driver->alarm_absolute);
+    }
+
+    /**
+     * Render HTML for attendee notification warning
+     */
+    function edit_attendees_notify($attrib = )
+    {
+        $checkbox = new html_checkbox('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox');
+        return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('sendnotifications')));
+    }
+
+    /**
+     * Render HTML for recurrence option to align start date with the recurrence rule
+     */
+    function edit_recurrence_sync($attrib = )
+    {
+        $checkbox = new html_checkbox('name' => '_start_sync', 'value' => 1, 'class' => 'pretty-checkbox');
+        return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('eventstartsync')));
+    }
 
-  /**
-   *
-   */
-  function calendar_list($attrib = array(), $js_only = false)
-  {
-    $html      = '';
-    $jsenv     = array();
-    $tree      = true;
-    $calendars = $this->cal->driver->list_calendars(0, $tree);
-
-    // walk folder tree
-    if (is_object($tree)) {
-      $html = $this->list_tree_html($tree, $calendars, $jsenv, $attrib);
-
-      // append birthdays calendar which isn't part of $tree
-      if ($bdaycal = $calendarscalendar_driver::BIRTHDAY_CALENDAR_ID) {
-        $calendars = array(calendar_driver::BIRTHDAY_CALENDAR_ID => $bdaycal);
-      }
-      else {
-        $calendars = array();  // clear array for flat listing
-      }
-    }
-    else {
-      // fall-back to flat folder listing
-      $attrib'class' .= ' flat';
-    }
-
-    foreach ((array)$calendars as $id => $prop) {
-      if ($attrib'activeonly' && !$prop'active')
-        continue;
-
-      $html .= html::tag('li', array('id' => 'rcmlical' . $id, 'class' => $prop'group'),
-        $content = $this->calendar_list_item($id, $prop, $jsenv, $attrib'activeonly')
-      );
-    }
-
-    $this->rc->output->set_env('calendars', $jsenv);
-
-    if ($js_only) {
-      return;
-    }
-
-    $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
-    $this->rc->output->add_gui_object('calendarslist', $attrib'id' ?: 'unknown');
-
-    return html::tag('ul', $attrib, $html, html::$common_attrib);
-  }
-
-  /**
-   * Return html for a structured list <ul> for the folder tree
-   */
-  public function list_tree_html($node, $data, &$jsenv, $attrib)
-  {
-    $out = '';
-    foreach ($node->children as $folder) {
-      $id = $folder->id;
-      $prop = $data$id;
-      $is_collapsed = false; // TODO: determine this somehow?
-
-      $content = $this->calendar_list_item($id, $prop, $jsenv, $attrib'activeonly');
-
-      if (!empty($folder->children)) {
-        $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
-          $this->list_tree_html($folder, $data, $jsenv, $attrib));
-      }
-
-      if (strlen($content)) {
-        $out .= html::tag('li', array(
-            'id' => 'rcmlical' . rcube_utils::html_identifier($id),
-            'class' => $prop'group' . ($prop'virtual' ? ' virtual' : ''),
-          ),
-          $content);
-      }
-    }
-
-    return $out;
-  }
-
-  /**
-   * Helper method to build a calendar list item (HTML content and js data)
-   */
-  public function calendar_list_item($id, $prop, &$jsenv, $activeonly = false)
-  {
-    // enrich calendar properties with settings from the driver
-    if (!$prop'virtual') {
-      unset($prop'user_id');
-      $prop'alarms'      = $this->cal->driver->alarms;
-      $prop'attendees'   = $this->cal->driver->attendees;
-      $prop'freebusy'    = $this->cal->driver->freebusy;
-      $prop'attachments' = $this->cal->driver->attachments;
-      $prop'undelete'    = $this->cal->driver->undelete;
-      $prop'feedurl'     = $this->cal->get_url(array('_cal' => $this->cal->ical_feed_hash($id) . '.ics', 'action' => 'feed'));
-
-      $jsenv$id = $prop;
-    }
-
-    $classes = array('calendar', 'cal-'  . asciiwords($id, true));
-    $title = $prop'title' ?: ($prop'name' != $prop'listname' || strlen($prop'name') > 25 ?
-      html_entity_decode($prop'name', ENT_COMPAT, RCUBE_CHARSET) : '');
-
-    if ($prop'virtual')
-      $classes = 'virtual';
-    else if (!$prop'editable')
-      $classes = 'readonly';
-    if ($prop'subscribed')
-      $classes = 'subscribed';
-    if ($prop'subscribed' === 2)
-      $classes = 'partial';
-    if ($prop'class')
-      $classes = $prop'class';
-
-    $content = '';
-    if (!$activeonly || $prop'active') {
-      $label_id = 'cl:' . $id;
-      $content = html::div(join(' ', $classes),
-        html::a(array('class' => 'calname', 'id' => $label_id, 'title' => $title, 'href' => '#'), rcube::Q($prop'editname' ?: $prop'listname'))
-        . ($prop'virtual' ? '' :
-          html::tag('input', array('type' => 'checkbox', 'name' => '_cal', 'value' => $id, 'checked' => $prop'active', 'aria-labelledby' => $label_id)) .
-          html::span('actions', 
-            ($prop'removable' ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->cal->gettext('removelist')), ' ') : '') .
-            html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->cal->gettext('quickview'), 'role' => 'checkbox', 'aria-checked' => 'false'), '') .
-            (isset($prop'subscribed') ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->cal->gettext('calendarsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop'subscribed' ? 'true' : 'false'), ' ') : '')
-          ) .
-          html::span(array('class' => 'handle', 'style' => "background-color: #" . ($prop'color' ?: 'f00')), '&nbsp;')
-        )
-      );
-    }
-
-    return $content;
-  }
-
-  /**
-   * Render a HTML for agenda options form
-   */
-  function agenda_options($attrib = array())
-  {
-    $attrib += array('id' => 'agendaoptions');
-    $attrib'style' .= 'display:none';
-
-    $select_range = new html_select(array('name' => 'listrange', 'id' => 'agenda-listrange', 'class' => 'form-control custom-select'));
-    $select_range->add(1 . ' ' . preg_replace('/$.+$/', '', $this->cal->lib->gettext('days')), $days);
-    foreach (array(2,5,7,14,30,60,90,180,365) as $days)
-      $select_range->add($days . ' ' . preg_replace('/$|$/', '', $this->cal->lib->gettext('days')), $days);
-
-    $html = html::span('input-group',
-        html::label(array('for' => 'agenda-listrange', 'class' => 'input-group-prepend'),
-            html::span('input-group-text', $this->cal->gettext('listrange')))
-        . $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults'calendar_agenda_range'))
-    );
-
-    return html::div($attrib, $html);
-  }
-
-  /**
-   * Render a HTML select box for calendar selection
-   */
-  function calendar_select($attrib = array())
-  {
-    $attrib'name'       = 'calendar';
-    $attrib'is_escaped' = true;
-    $select = new html_select($attrib);
-
-    foreach ((array)$this->cal->driver->list_calendars() as $id => $prop) {
-      if ($prop'editable' || strpos($prop'rights', 'i') !== false)
-        $select->add($prop'name', $id);
-    }
-
-    return $select->show(null);
-  }
-
-  /**
-   * Render a HTML select box for user identity selection
-   */
-  function identity_select($attrib = array())
-  {
-    $attrib'name' = 'identity';
-    $select         = new html_select($attrib);
-    $identities     = $this->rc->user->list_emails();
-
-    foreach ($identities as $ident) {
-        $select->add(format_email_recipient($ident'email', $ident'name'), $ident'identity_id');
-    }
-
-    return $select->show(null);
-  }
-
-  /**
-   * Render a HTML select box to select an event category
-   */
-  function category_select($attrib = array())
-  {
-    $attrib'name' = 'categories';
-    $select = new html_select($attrib);
-    $select->add('---', '');
-    foreach (array_keys((array)$this->cal->driver->list_categories()) as $cat) {
-      $select->add($cat, $cat);
-    }
-
-    return $select->show(null);
-  }
-
-  /**
-   * Render a HTML select box for status property
-   */
-  function status_select($attrib = array())
-  {
-    $attrib'name' = 'status';
-    $select = new html_select($attrib);
-    $select->add('---', '');
-    $select->add($this->cal->gettext('status-confirmed'), 'CONFIRMED');
-    $select->add($this->cal->gettext('status-cancelled'), 'CANCELLED');
-    $select->add($this->cal->gettext('status-tentative'), 'TENTATIVE');
-    return $select->show(null);
-  }
-
-  /**
-   * Render a HTML select box for free/busy/out-of-office property
-   */
-  function freebusy_select($attrib = array())
-  {
-    $attrib'name' = 'freebusy';
-    $select = new html_select($attrib);
-    $select->add($this->cal->gettext('free'), 'free');
-    $select->add($this->cal->gettext('busy'), 'busy');
-    // out-of-office is not supported by libkolabxml (#3220)
-    // $select->add($this->cal->gettext('outofoffice'), 'outofoffice');
-    $select->add($this->cal->gettext('tentative'), 'tentative');
-    return $select->show(null);
-  }
-
-  /**
-   * Render a HTML select for event priorities
-   */
-  function priority_select($attrib = array())
-  {
-    $attrib'name' = 'priority';
-    $select = new html_select($attrib);
-    $select->add('---', '0');
-    $select->add('1 '.$this->cal->gettext('highest'), '1');
-    $select->add('2 '.$this->cal->gettext('high'),    '2');
-    $select->add('3 ',                                '3');
-    $select->add('4 ',                                '4');
-    $select->add('5 '.$this->cal->gettext('normal'),  '5');
-    $select->add('6 ',                                '6');
-    $select->add('7 ',                                '7');
-    $select->add('8 '.$this->cal->gettext('low'),     '8');
-    $select->add('9 '.$this->cal->gettext('lowest'),  '9');
-    return $select->show(null);
-  }
-  
-  /**
-   * Render HTML input for sensitivity selection
-   */
-  function sensitivity_select($attrib = array())
-  {
-    $attrib'name' = 'sensitivity';
-    $select = new html_select($attrib);
-    $select->add($this->cal->gettext('public'), 'public');
-    $select->add($this->cal->gettext('private'), 'private');
-    $select->add($this->cal->gettext('confidential'), 'confidential');
-    return $select->show(null);
-  }
-  
-  /**
-   * Render HTML form for alarm configuration
-   */
-  function alarm_select($attrib = array())
-  {
-    return $this->cal->lib->alarm_select($attrib, $this->cal->driver->alarm_types, $this->cal->driver->alarm_absolute);
-  }
-
-  /**
-   * Render HTML for attendee notification warning
-   */
-  function edit_attendees_notify($attrib = array())
-  {
-    $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox'));
-    return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('sendnotifications')));
-  }
-
-  /**
-   * Render HTML for recurrence option to align start date with the recurrence rule
-   */
-  function edit_recurrence_sync($attrib = array())
-  {
-    $checkbox = new html_checkbox(array('name' => '_start_sync', 'value' => 1, 'class' => 'pretty-checkbox'));
-    return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('eventstartsync')));
-  }
-
-  /**
-   * Generate the form for recurrence settings
-   */
-  function recurring_event_warning($attrib = array())
-  {
-    $attrib'id' = 'edit-recurring-warning';
-
-    $radio = new html_radiobutton(array('name' => '_savemode', 'class' => 'edit-recurring-savemode'));
-    $form = html::label(null, $radio->show('', array('value' => 'current')) . $this->cal->gettext('currentevent')) . ' ' .
-       html::label(null, $radio->show('', array('value' => 'future')) . $this->cal->gettext('futurevents')) . ' ' .
-       html::label(null, $radio->show('all', array('value' => 'all')) . $this->cal->gettext('allevents')) . ' ' .
-       html::label(null, $radio->show('', array('value' => 'new')) . $this->cal->gettext('saveasnew'));
-
-    return html::div($attrib, html::div('message', $this->cal->gettext('changerecurringeventwarning')) . html::div('savemode', $form));
-  }
-
-  /**
-   * Form for uploading and importing events
-   */
-  function events_import_form($attrib = array())
-  {
-    if (!$attrib'id')
-      $attrib'id' = 'rcmImportForm';
-
-    // Get max filesize, enable upload progress bar
-    $max_filesize = $this->rc->upload_init();
-
-    $accept = '.ics, text/calendar, text/x-vcalendar, application/ics';
-    if (class_exists('ZipArchive', false)) {
-      $accept .= ', .zip, application/zip';
-    }
-
-    $input = new html_inputfield(array(
-        'id'     => 'importfile',
-        'type'   => 'file',
-        'name'   => '_data',
-        'size'   => $attrib'uploadfieldsize',
-        'accept' => $accept
-    ));
-
-    $select = new html_select(array('name' => '_range', 'id' => 'event-import-range'));
-    $select->add(array(
-        $this->cal->gettext('onemonthback'),
-        $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>2))),
-        $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>3))),
-        $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>6))),
-        $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>12))),
-        $this->cal->gettext('all'),
-      ),
-      array('1','2','3','6','12',0));
-
-    $html = html::div('form-section form-group row',
-      html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile')))
-      . html::div('col-sm-8', $input->show()
-        . html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))))
-    );
-
-    $html .= html::div('form-section form-group row',
-      html::label(array('for' => 'event-import-calendar', 'class' => 'col-form-label col-sm-4'), $this->cal->gettext('calendar'))
-      . html::div('col-sm-8', $this->calendar_select(array('name' => 'calendar', 'id' => 'event-import-calendar')))
-    );
-
-    $html .= html::div('form-section form-group row',
-      html::label(array('for' => 'event-import-range', 'class' => 'col-form-label col-sm-4'), $this->cal->gettext('importrange'))
-      . html::div('col-sm-8', $select->show(1))
-    );
-
-    $this->rc->output->add_gui_object('importform', $attrib'id');
-    $this->rc->output->add_label('import');
-
-    return html::tag('p', null, $this->cal->gettext('importtext'))
-      . html::tag('form', array(
-          'action'  => $this->rc->url(array('task' => 'calendar', 'action' => 'import_events')),
-          'method'  => 'post',
-          'enctype' => 'multipart/form-data',
-          'id'      => $attrib'id'
-        ), $html);
-  }
-
-  /**
-   * Form to select options for exporting events
-   */
-  function events_export_form($attrib = array())
-  {
-    if (!$attrib'id')
-      $attrib'id' = 'rcmExportForm';
-
-    $html = html::div('form-section form-group row',
-      html::label(array('for' => 'event-export-calendar', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('calendar'))
-        . html::div('col-sm-8', $this->calendar_select(array('name' => 'calendar', 'id' => 'event-export-calendar', 'class' => 'form-control custom-select'))));
-
-    $select = new html_select(array('name' => 'range', 'id' => 'event-export-range', 'class' => 'form-control custom-select rounded-right'));
-    $select->add(array(
-        $this->cal->gettext('all'),
-        $this->cal->gettext('onemonthback'),
-        $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>2))),
-        $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>3))),
-        $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>6))),
-        $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>12))),
-        $this->cal->gettext('customdate'),
-      ),
-      array(0,'1','2','3','6','12','custom'));
-
-    $startdate = new html_inputfield(array('name' => 'start', 'size' => 11, 'id' => 'event-export-startdate', 'style' => 'display:none'));
-
-    $html .= html::div('form-section form-group row',
-      html::label(array('for' => 'event-export-range', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('exportrange'))
-        . html::div('col-sm-8 input-group', $select->show(0) . $startdate->show()));
-
-    $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'event-export-attachments', 'value' => 1, 'class' => 'form-check-input pretty-checkbox'));
-    $html .= html::div('form-section form-check row',
-      html::label(array('for' => 'event-export-attachments', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('exportattachments'))
-        . html::div('col-sm-8', $checkbox->show(1)));
-
-    $this->rc->output->add_gui_object('exportform', $attrib'id');
-
-    return html::tag('form', $attrib + array(
-        'action' => $this->rc->url(array('task' => 'calendar', 'action' => 'export_events')),
-        'method' => "post",
-        'id' => $attrib'id'
-      ),
-      $html
-    );
-  }
-
-  /**
-   * Handler for calendar form template.
-   * The form content could be overriden by the driver
-   */
-  function calendar_editform($action, $calendar = array())
-  {
-    $this->action   = $action;
-    $this->calendar = $calendar;
-
-    // load miniColors js/css files
-    jqueryui::miniColors();
-
-    $this->rc->output->set_env('pagetitle', $this->cal->gettext('calendarprops'));
-    $this->rc->output->add_handler('folderform', array($this, 'calendarform'));
-    $this->rc->output->send('libkolab.folderform');
-  }
-
-  /**
-   * Handler for calendar form template.
-   * The form content could be overriden by the driver
-   */
-  function calendarform($attrib)
-  {
-    // compose default calendar form fields
-    $input_name  = new html_inputfield(array('name' => 'name', 'id' => 'calendar-name', 'size' => 20));
-    $input_color = new html_inputfield(array('name' => 'color', 'id' => 'calendar-color', 'size' => 7, 'class' => 'colors'));
-
-    $formfields = array(
-      'name' => array(
-        'label' => $this->cal->gettext('name'),
-        'value' => $input_name->show($calendar'name'),
-        'id'    => 'calendar-name',
-      ),
-      'color' => array(
-        'label' => $this->cal->gettext('color'),
-        'value' => $input_color->show($calendar'color'),
-        'id'    => 'calendar-color',
-      ),
-    );
-
-    if ($this->cal->driver->alarms) {
-      $checkbox = new html_checkbox(array('name' => 'showalarms', 'id' => 'calendar-showalarms', 'value' => 1));
-      $formfields'showalarms' = array(
-        'label' => $this->cal->gettext('showalarms'),
-        'value' => $checkbox->show($this->calendar'showalarms' ? 1 :0),
-        'id'    => 'calendar-showalarms',
-      );
-    }
-
-    // allow driver to extend or replace the form content
-    return html::tag('form', $attrib + array('action' => "#", 'method' => "get", 'id' => 'calendarpropform'),
-      $this->cal->driver->calendar_form($this->action, $this->calendar, $formfields)
-    );
-  }
-
-  /**
-   *
-   */
-  function attendees_list($attrib = array())
-  {
-    // add "noreply" checkbox to attendees table only
-    $invitations = strpos($attrib'id', 'attend') !== false;
-
-    $invite = new html_checkbox(array('value' => 1, 'id' => 'edit-attendees-invite'));
-    $table  = new html_table(array('cols' => 5 + intval($invitations), 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable'));
-
-    $table->add_header('role', $this->cal->gettext('role'));
-    $table->add_header('name', $this->cal->gettext($attrib'coltitle' ?: 'attendee'));
-    $table->add_header('availability', $this->cal->gettext('availability'));
-    $table->add_header('confirmstate', $this->cal->gettext('confirmstate'));
-    if ($invitations) {
-      $table->add_header(array('class' => 'invite', 'title' => $this->cal->gettext('sendinvitations')),
-        $invite->show(1) . html::label('edit-attendees-invite', html::span('inner', $this->cal->gettext('sendinvitations'))));
-    }
-    $table->add_header('options', '');
-
-    // hide invite column if disabled by config
-    $itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', $this->cal->defaults'calendar_itip_send_option');
-    if ($invitations && !($itip_notify & 2)) {
-        $css = sprintf('#%s td.invite, #%s th.invite { display:none !important }', $attrib'id', $attrib'id');
-        $this->rc->output->add_footer(html::tag('style', array('type' => 'text/css'), $css));
-    }
-
-    return $table->show($attrib);
-  }
-
-  /**
-   *
-   */
-  function attendees_form($attrib = array())
-  {
-    $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'class' => 'form-control'));
-    $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment', 'class' => 'form-control',
-        'rows' => 4, 'cols' => 55, 'title' => $this->cal->gettext('itipcommenttitle')));
-
-    return html::div($attrib,
-      html::div('form-searchbar', $input->show() . " " .
-        html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->cal->gettext('addattendee'))) . " " .
-        html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->cal->gettext('scheduletime').'...'))) .
-      html::p('attendees-commentbox', html::label('edit-attendees-comment', $this->cal->gettext('itipcomment')) . $textarea->show())
-    );
-  }
-
-  /**
-   *
-   */
-  function resources_form($attrib = array())
-  {
-    $input = new html_inputfield(array('name' => 'resource', 'id' => 'edit-resource-name', 'class' => 'form-control'));
-
-    return html::div($attrib,
-      html::div('form-searchbar', $input->show() . " " .
-        html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-add', 'value' => $this->cal->gettext('addresource'))) . " " .
-        html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-find', 'value' => $this->cal->gettext('findresources').'...')))
-      );
-  }
-
-  /**
-   *
-   */
-  function resources_list($attrib = array())
-  {
-    $attrib += array('id' => 'calendar-resources-list');
-
-    $this->rc->output->add_gui_object('resourceslist', $attrib'id');
-
-    return html::tag('ul', $attrib, '', html::$common_attrib);
-  }
-
-  /**
-   *
-   */
-  public function resource_info($attrib = array())
-  {
-    $attrib += array('id' => 'calendar-resources-info');
-
-    $this->rc->output->add_gui_object('resourceinfo', $attrib'id');
-    $this->rc->output->add_gui_object('resourceownerinfo', $attrib'id' . '-owner');
-
-    // copy address book labels for owner details to client
-    $this->rc->output->add_label('name','firstname','surname','department','jobtitle','email','phone','address');
-
-    $table_attrib = array('id','class','style','width','summary','cellpadding','cellspacing','border');
-
-    return html::tag('table', $attrib,
-        html::tag('tbody', null, ''), $table_attrib) .
-
-      html::tag('table', array('id' => $attrib'id' . '-owner', 'style' => 'display:none') + $attrib,
-        html::tag('thead', null,
-          html::tag('tr', null,
-            html::tag('td', array('colspan' => 2), rcube::Q($this->cal->gettext('resourceowner')))
-          )
-        ) .
-        html::tag('tbody', null, ''),
-        $table_attrib);
-  }
-
-  /**
-   *
-   */
-  public function resource_calendar($attrib = array())
-  {
-    $attrib += array('id' => 'calendar-resources-calendar');
-
-    $this->rc->output->add_gui_object('resourceinfocalendar', $attrib'id');
-
-    return html::div($attrib, '');
-  }
-
-  /**
-   * GUI object 'searchform' for the resource finder dialog
-   *
-   * @param array Named parameters
-   * @return string HTML code for the gui object
-   */
-  function resources_search_form($attrib)
-  {
-    $attrib += array(
-        'command'       => 'search-resource',
-        'reset-command' => 'reset-resource-search',
-        'id'            => 'rcmcalresqsearchbox',
-        'autocomplete'  => 'off',
-        'form-name'     => 'rcmcalresoursqsearchform',
-        'gui-object'    => 'resourcesearchform',
-    );
-
-    // add form tag around text field
-    return $this->rc->output->search_form($attrib);
-  }
-
-  /**
-   *
-   */
-  function attendees_freebusy_table($attrib = array())
-  {
-    $table = new html_table(array('cols' => 2, 'border' => 0, 'cellspacing' => 0));
-    $table->add('attendees',
-      html::tag('h3', 'boxtitle', $this->cal->gettext('tabattendees')) .
-      html::div('timesheader', '&nbsp;') .
-      html::div(array('id' => 'schedule-attendees-list', 'class' => 'attendees-list'), '')
-    );
-    $table->add('times',
-      html::div('scroll',
-        html::tag('table', array('id' => 'schedule-freebusy-times', 'border' => 0, 'cellspacing' => 0), html::tag('thead') . html::tag('tbody')) .
-        html::div(array('id' => 'schedule-event-time', 'style' => 'display:none'), '&nbsp;')
-      )
-    );
-    
-    return $table->show($attrib);
-  }
-
-  /**
-   *
-   */
-  function event_invitebox($attrib = array())
-  {
-    if ($this->cal->event) {
-      return html::div($attrib,
-        $this->cal->itip->itip_object_details_table($this->cal->event, $this->cal->itip->gettext('itipinvitation')) .
-        $this->cal->invitestatus
-      );
-    }
-    
-    return '';
-  }
-
-  function event_rsvp_buttons($attrib = array())
-  {
-    $actions = array('accepted','tentative','declined');
-    if ($attrib'delegate' !== 'false')
-      $actions = 'delegated';
-
-    return $this->cal->itip->itip_rsvp_buttons($attrib, $actions);
-  }
+    /**
+     * Generate the form for recurrence settings
+     */
+    function recurring_event_warning($attrib = )
+    {
+        $attrib'id' = 'edit-recurring-warning';
 
+        $radio = new html_radiobutton('name' => '_savemode', 'class' => 'edit-recurring-savemode');
+
+        $form = html::label(null, $radio->show('', 'value' => 'current') . $this->cal->gettext('currentevent')) . ' '
+            . html::label(null, $radio->show('', 'value' => 'future') . $this->cal->gettext('futurevents')) . ' '
+            . html::label(null, $radio->show('all', 'value' => 'all') . $this->cal->gettext('allevents')) . ' '
+            . html::label(null, $radio->show('', 'value' => 'new') . $this->cal->gettext('saveasnew'));
+
+        return html::div($attrib,
+            html::div('message', $this->cal->gettext('changerecurringeventwarning'))
+            . html::div('savemode', $form)
+        );
+    }
+
+    /**
+     * Form for uploading and importing events
+     */
+    function events_import_form($attrib = )
+    {
+        if (empty($attrib'id')) {
+            $attrib'id' = 'rcmImportForm';
+        }
+
+        // Get max filesize, enable upload progress bar
+        $max_filesize = $this->rc->upload_init();
+
+        $accept = '.ics, text/calendar, text/x-vcalendar, application/ics';
+        if (class_exists('ZipArchive', false)) {
+            $accept .= ', .zip, application/zip';
+        }
+
+        $input = new html_inputfield(
+                'id'     => 'importfile',
+                'type'   => 'file',
+                'name'   => '_data',
+                'size'   => !empty($attrib'uploadfieldsize') ? $attrib'uploadfieldsize' : null,
+                'accept' => $accept
+        );
+
+        $select = new html_select('name' => '_range', 'id' => 'event-import-range');
+        $select->add(
+                $this->cal->gettext('onemonthback'),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr'=>2),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr'=>3),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr'=>6),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr'=>12),
+                $this->cal->gettext('all'),
+            ,
+            '1','2','3','6','12',0
+        );
+
+        $html = html::div('form-section form-group row',
+            html::label('class' => 'col-sm-4 col-form-label', 'for' => 'importfile',
+                rcube::Q($this->rc->gettext('importfromfile'))
+            )
+            . html::div('col-sm-8', $input->show()
+                . html::div('hint', $this->rc->gettext('name' => 'maxuploadsize', 'vars' => 'size' => $max_filesize))
+            )
+        );
+
+        $html .= html::div('form-section form-group row',
+            html::label('for' => 'event-import-calendar', 'class' => 'col-form-label col-sm-4',
+                $this->cal->gettext('calendar')
+            )
+            . html::div('col-sm-8', $this->calendar_select('name' => 'calendar', 'id' => 'event-import-calendar'))
+        );
+
+        $html .= html::div('form-section form-group row',
+            html::label('for' => 'event-import-range', 'class' => 'col-form-label col-sm-4',
+                $this->cal->gettext('importrange')
+            )
+            . html::div('col-sm-8', $select->show(1))
+        );
+
+        $this->rc->output->add_gui_object('importform', $attrib'id');
+        $this->rc->output->add_label('import');
+
+        return html::tag('p', null, $this->cal->gettext('importtext'))
+            . html::tag('form', 
+                    'action'  => $this->rc->url('task' => 'calendar', 'action' => 'import_events'),
+                    'method'  => 'post',
+                    'enctype' => 'multipart/form-data',
+                    'id'      => $attrib'id'
+                , $html
+            );
+    }
+
+    /**
+     * Form to select options for exporting events
+     */
+    function events_export_form($attrib = )
+    {
+        if (empty($attrib'id')) {
+            $attrib'id' = 'rcmExportForm';
+        }
+
+        $html = html::div('form-section form-group row',
+            html::label('for' => 'event-export-calendar', 'class' => 'col-sm-4 col-form-label',
+                $this->cal->gettext('calendar')
+            )
+            . html::div('col-sm-8', $this->calendar_select('name' => 'calendar', 'id' => 'event-export-calendar', 'class' => 'form-control custom-select'))
+        );
+
+        $select = new html_select(
+                'name'  => 'range',
+                'id'    => 'event-export-range',
+                'class' => 'form-control custom-select rounded-right'
+        );
+
+        $select->add(
+                $this->cal->gettext('all'),
+                $this->cal->gettext('onemonthback'),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 2),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 3),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 6),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 12),
+                $this->cal->gettext('customdate'),
+            ,
+            0,'1','2','3','6','12','custom'
+        );
+
+        $startdate = new html_inputfield(
+                'name'  => 'start',
+                'size'  => 11,
+                'id'    => 'event-export-startdate',
+                'style' => 'display:none'
+        );
+
+        $html .= html::div('form-section form-group row',
+            html::label('for' => 'event-export-range', 'class' => 'col-sm-4 col-form-label',
+                $this->cal->gettext('exportrange')
+            )
+            . html::div('col-sm-8 input-group', $select->show(0) . $startdate->show())
+        );
+
+        $checkbox = new html_checkbox(
+                'name'  => 'attachments',
+                'id'    => 'event-export-attachments',
+                'value' => 1,
+                'class' => 'form-check-input pretty-checkbox'
+        );
+
+        $html .= html::div('form-section form-check row',
+            html::label('for' => 'event-export-attachments', 'class' => 'col-sm-4 col-form-label',
+                $this->cal->gettext('exportattachments')
+            )
+            . html::div('col-sm-8', $checkbox->show(1))
+        );
+
+        $this->rc->output->add_gui_object('exportform', $attrib'id');
+
+        return html::tag('form', $attrib + 
+                'action' => $this->rc->url('task' => 'calendar', 'action' => 'export_events'),
+                'method' => 'post',
+                'id'     => $attrib'id'
+            ,
+            $html
+        );
+    }
+
+    /**
+     * Handler for calendar form template.
+     * The form content could be overriden by the driver
+     */
+    function calendar_editform($action, $calendar = )
+    {
+        $this->action   = $action;
+        $this->calendar = $calendar;
+
+        // load miniColors js/css files
+        jqueryui::miniColors();
+
+        $this->rc->output->set_env('pagetitle', $this->cal->gettext('calendarprops'));
+        $this->rc->output->add_handler('folderform', $this, 'calendarform');
+        $this->rc->output->send('libkolab.folderform');
+    }
+
+    /**
+     * Handler for calendar form template.
+     * The form content could be overriden by the driver
+     */
+    function calendarform($attrib)
+    {
+        // compose default calendar form fields
+        $input_name  = new html_inputfield('name' => 'name', 'id' => 'calendar-name', 'size' => 20);
+        $input_color = new html_inputfield('name' => 'color', 'id' => 'calendar-color', 'size' => 7, 'class' => 'colors');
+
+        $formfields = 
+            'name' => 
+                'label' => $this->cal->gettext('name'),
+                'value' => $input_name->show(isset($this->calendar'name') ? $this->calendar'name' : ''),
+                'id'    => 'calendar-name',
+            ,
+            'color' => 
+                'label' => $this->cal->gettext('color'),
+                'value' => $input_color->show(isset($this->calendar'color') ? $this->calendar'color' : ''),
+                'id'    => 'calendar-color',
+            ,
+        ;
+
+        if (!empty($this->cal->driver->alarms)) {
+            $checkbox = new html_checkbox('name' => 'showalarms', 'id' => 'calendar-showalarms', 'value' => 1);
+
+            $formfields'showalarms' = 
+                'label' => $this->cal->gettext('showalarms'),
+                'value' => $checkbox->show(!empty($this->calendar'showalarms') ? 1 : 0),
+                'id'    => 'calendar-showalarms',
+            ;
+        }
+
+        // allow driver to extend or replace the form content
+        return html::tag('form', $attrib + 'action' => '#', 'method' => 'get', 'id' => 'calendarpropform',
+            $this->cal->driver->calendar_form($this->action, $this->calendar, $formfields)
+        );
+    }
+
+    /**
+     * Render HTML for attendees table
+     */
+    function attendees_list($attrib = )
+    {
+        // add "noreply" checkbox to attendees table only
+        $invitations = strpos($attrib'id', 'attend') !== false;
+
+        $invite = new html_checkbox('value' => 1, 'id' => 'edit-attendees-invite');
+        $table  = new html_table('cols' => 5 + intval($invitations), 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable');
+
+        $table->add_header('role', $this->cal->gettext('role'));
+        $table->add_header('name', $this->cal->gettext(!empty($attrib'coltitle') ? $attrib'coltitle' : 'attendee'));
+        $table->add_header('availability', $this->cal->gettext('availability'));
+        $table->add_header('confirmstate', $this->cal->gettext('confirmstate'));
+
+        if ($invitations) {
+            $table->add_header('class' => 'invite', 'title' => $this->cal->gettext('sendinvitations'),
+                $invite->show(1)
+                . html::label('edit-attendees-invite', html::span('inner', $this->cal->gettext('sendinvitations')))
+            );
+        }
+
+        $table->add_header('options', '');
+
+        // hide invite column if disabled by config
+        $itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', $this->cal->defaults'calendar_itip_send_option');
+        if ($invitations && !($itip_notify & 2)) {
+            $css = sprintf('#%s td.invite, #%s th.invite { display:none !important }', $attrib'id', $attrib'id');
+            $this->rc->output->add_footer(html::tag('style', 'type' => 'text/css', $css));
+        }
+
+        return $table->show($attrib);
+    }
+
+    /**
+     * Render HTML for attendees adding form
+     */
+    function attendees_form($attrib = )
+    {
+        $input = new html_inputfield(
+                'name'  => 'participant',
+                'id'    => 'edit-attendee-name',
+                'class' => 'form-control'
+        );
+        $textarea = new html_textarea(
+                'name'  => 'comment',
+                'id'    => 'edit-attendees-comment',
+                'class' => 'form-control',
+                'rows'  => 4,
+                'cols'  => 55,
+                'title' => $this->cal->gettext('itipcommenttitle')
+        );
+
+        return html::div($attrib,
+            html::div('form-searchbar',
+                $input->show()
+                . ' ' .
+                html::tag('input', 
+                        'type'  => 'button',
+                        'class' => 'button',
+                        'id'    => 'edit-attendee-add',
+                        'value' => $this->cal->gettext('addattendee')
+                )
+                . ' ' .
+                html::tag('input', 
+                        'type'  => 'button',
+                        'class' => 'button',
+                        'id'    => 'edit-attendee-schedule',
+                        'value' => $this->cal->gettext('scheduletime') . '...'
+                )
+            )
+            . html::p('attendees-commentbox', html::label('edit-attendees-comment', $this->cal->gettext('itipcomment')) . $textarea->show())
+        );
+    }
+
+    /**
+     * Render HTML for resources adding form
+     */
+    function resources_form($attrib = )
+    {
+        $input = new html_inputfield('name' => 'resource', 'id' => 'edit-resource-name', 'class' => 'form-control');
+
+        return html::div($attrib,
+            html::div('form-searchbar',
+                $input->show()
+                . ' ' .
+                html::tag('input', 
+                        'type'  => 'button',
+                        'class' => 'button',
+                        'id'    => 'edit-resource-add',
+                        'value' => $this->cal->gettext('addresource')
+                )
+                . ' ' .
+                html::tag('input', 
+                        'type'  => 'button',
+                        'class' => 'button',
+                        'id'    => 'edit-resource-find',
+                        'value' => $this->cal->gettext('findresources') . '...'
+                )
+            )
+        );
+    }
+
+    /**
+     * Render HTML for resources list
+     */
+    function resources_list($attrib = )
+    {
+        $attrib += 'id' => 'calendar-resources-list';
+
+        $this->rc->output->add_gui_object('resourceslist', $attrib'id');
+
+        return html::tag('ul', $attrib, '', html::$common_attrib);
+    }
+
+    /**
+     *
+     */
+    public function resource_info($attrib = )
+    {
+        $attrib += 'id' => 'calendar-resources-info';
+
+        $this->rc->output->add_gui_object('resourceinfo', $attrib'id');
+        $this->rc->output->add_gui_object('resourceownerinfo', $attrib'id' . '-owner');
+
+        // copy address book labels for owner details to client
+        $this->rc->output->add_label('name','firstname','surname','department','jobtitle','email','phone','address');
+
+        $table_attrib = 'id','class','style','width','summary','cellpadding','cellspacing','border';
+
+        return html::tag('table', $attrib, html::tag('tbody', null, ''), $table_attrib)
+            . html::tag('table', 'id' => $attrib'id' . '-owner', 'style' => 'display:none' + $attrib,
+                html::tag('thead', null,
+                    html::tag('tr', null,
+                        html::tag('td', 'colspan' => 2, rcube::Q($this->cal->gettext('resourceowner')))
+                    )
+                )
+                . html::tag('tbody', null, ''),
+                $table_attrib
+            );
+    }
+
+    /**
+     *
+     */
+    public function resource_calendar($attrib = )
+    {
+        $attrib += 'id' => 'calendar-resources-calendar';
+
+        $this->rc->output->add_gui_object('resourceinfocalendar', $attrib'id');
+
+        return html::div($attrib, '');
+    }
+
+    /**
+     * GUI object 'searchform' for the resource finder dialog
+     *
+     * @param array $attrib Named parameters
+     *
+     * @return string HTML code for the gui object
+     */
+    function resources_search_form($attrib)
+    {
+        $attrib += 
+            'command'       => 'search-resource',
+            'reset-command' => 'reset-resource-search',
+            'id'            => 'rcmcalresqsearchbox',
+            'autocomplete'  => 'off',
+            'form-name'     => 'rcmcalresoursqsearchform',
+            'gui-object'    => 'resourcesearchform',
+        ;
+
+        // add form tag around text field
+        return $this->rc->output->search_form($attrib);
+    }
+
+    /**
+     *
+     */
+    function attendees_freebusy_table($attrib = )
+    {
+        $table = new html_table('cols' => 2, 'border' => 0, 'cellspacing' => 0);
+        $table->add('attendees',
+            html::tag('h3', 'boxtitle', $this->cal->gettext('tabattendees'))
+            . html::div('timesheader', '&nbsp;')
+            . html::div('id' => 'schedule-attendees-list', 'class' => 'attendees-list', '')
+        );
+        $table->add('times',
+            html::div('scroll',
+                html::tag('table', 'id' => 'schedule-freebusy-times', 'border' => 0, 'cellspacing' => 0,
+                    html::tag('thead') . html::tag('tbody')
+                )
+                . html::div('id' => 'schedule-event-time', 'style' => 'display:none', '&nbsp;')
+            )
+        );
+
+        return $table->show($attrib);
+    }
+
+    /**
+     *
+     */
+    function event_invitebox($attrib = )
+    {
+        if (!empty($this->cal->event)) {
+            return html::div($attrib,
+                $this->cal->itip->itip_object_details_table($this->cal->event, $this->cal->itip->gettext('itipinvitation'))
+                . $this->cal->invitestatus
+            );
+        }
+
+        return '';
+    }
+
+    function event_rsvp_buttons($attrib = )
+    {
+        $actions = 'accepted', 'tentative', 'declined';
+
+        if (empty($attrib'delegate') || $attrib'delegate' !== 'false') {
+            $actions = 'delegated';
+        }
+
+        return $this->cal->itip->itip_rsvp_buttons($attrib, $actions);
+    }
 }

iRony-0.4.5.tar.gz/lib/plugins/calendar/localization/de.inc -> iRony-0.4.6.tar.gz/lib/plugins/calendar/localization/de.inc Changed

@@ -27,12 +27,18 @@
 $labels'aftermoveto' = 'Verschiebe nach...';
 $labels'itipoptions' = 'Veranstaltungseinladungen';
 $labels'afteraction' = 'Nachdem eine Einladungs- oder Aktualisierungsnachricht verarbeitet wurde';
+$labels'showweekno' = 'Wochennummern anzeigen';
 $labels'weeknonone' = 'nie';
+$labels'weeknodatepicker' = 'nur in der Datumsauswahl';
+$labels'weeknoall' = 'in der Datumsauswahl und Kalenderansicht';
 $labels'calendar' = 'Kalender';
 $labels'calendars' = 'Kalender';
 $labels'category' = 'Kategorie';
 $labels'categories' = 'Kategorien';
+$labels'addcalendar' = 'Kalender hinzufügen';
 $labels'createcalendar' = 'Neuen Kalender erstellen';
+$labels'editcalendar' = 'Kalender bearbeiten/freigeben';
+$labels'deletecalendar' = 'Kalender löschen';
 $labels'name' = 'Name';
 $labels'color' = 'Farbe';
 $labels'day' = 'Tag';
@@ -95,6 +101,7 @@
 $labels'parentcalendar' = 'Erstellen in';
 $labels'searchearlierdates' = '« Frühere Termine suchen';
 $labels'searchlaterdates' = 'Spätere Termine suchen »';
+$labels'earlierevents' = 'Früher';
 $labels'laterevents' = 'Später';
 $labels'andnmore' = '$nr weitere …';
 $labels'togglerole' = 'Zum Ändern der Rolle klicken';
@@ -106,8 +113,11 @@
 $labels'showurl' = 'URL anzeigen';
 $labels'showurldescription' = 'Über die folgende Adresse können Sie mit einem beliebigen Kalenderprogramm Ihren Kalender abrufen (nur lesend), sofern dieses das iCal-Format unterstützt.';
 $labels'caldavurldescription' = 'Diese Adresse in einen <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-Klienten (z.B. Evolution oder Mozilla Thunderbird) kopieren, um den Kalender in Gänze mit einem mobilen Gerät zu synchronisieren.';
+$labels'showfburl' = 'Free-Busy-URL anzeigen';
+$labels'fburldescription' = 'Verwenden Sie die folgende Adresse, um auf Free-Busy-Informationen aus anderen Anwendungen zuzugreifen. Sie können dies kopieren und in jede Kalendersoftware einfügen, die Free-Busy-Informationen im iCal-Format unterstützt. Für diese URL ist keine Authentifizierung erforderlich.';
 $labels'findcalendars' = 'Kalender finden …';
 $labels'searchterms' = 'Suchbegriffe';
+$labels'findevents' = 'Ereignis finden';
 $labels'calsearchresults' = 'Verfügbare Kalender';
 $labels'calendarsubscribe' = 'Permanent anzeigen';
 $labels'nocalendarsfound' = 'Keine Kalender gefunden';
@@ -117,6 +127,7 @@
 $labels'invitationsdeclined' = 'Abgelehnte Einladungen';
 $labels'changepartstat' = 'Teilnehmerstatus ändern';
 $labels'rsvpcomment' = 'Einladungstext';
+$labels'eventstartsync' = 'Das Startdatum des Ereignisses auf das erste Vorkommen verschieben.';
 $labels'listrange' = 'Angezeigter Bereich:';
 $labels'listsections' = 'Unterteilung:';
 $labels'smartsections' = 'Intelligent';
@@ -190,11 +201,13 @@
 $labels'openpreview' = 'Kalender überprüfen';
 $labels'noearlierevents' = 'Keine früheren Ereignisse';
 $labels'nolaterevents' = 'Keine späteren Ereignisse';
+$labels'legend' = 'Legende';
 $labels'resource' = 'Ressource';
 $labels'addresource' = 'Ressource buchen';
 $labels'findresources' = 'Ressourcen finden';
 $labels'resourcedetails' = 'Details';
 $labels'resourceavailability' = 'Verfügbarkeit';
+$labels'resourceprops' = 'Ressourceneigenschaften';
 $labels'resourceowner' = 'Eigentümer';
 $labels'resourceadded' = 'Diese Ressource wurde Ihrem Termin hinzugefügt';
 $labels'tabsummary' = 'Übersicht';
@@ -211,6 +224,7 @@
 $labels'errorsaving' = 'Fehler beim Speichern.';
 $labels'operationfailed' = 'Die Aktion ist fehlgeschlagen.';
 $labels'invalideventdates' = 'Ungültige Daten eingegeben! Bitte überprüfen Sie die Eingaben.';
+$labels'emptyeventtitle' = 'Die Ereigniszusammenfassung darf nicht leer sein.';
 $labels'invalidcalendarproperties' = 'Ungültige Kalenderinformationen! Bitte geben Sie einen Namen ein.';
 $labels'searchnoresults' = 'Keine Termine in den gewählten Kalendern gefunden.';
 $labels'successremoval' = 'Der Termin wurde erfolgreich gelöscht.';
@@ -223,6 +237,7 @@
 $labels'importedsuccessfully' = 'Der Termin wurde erfolgreich in »$calendar« gespeichert';
 $labels'updatedsuccessfully' = 'Der Termin wurde erfolgreich in »$calendar« geändert';
 $labels'attendeupdateesuccess' = 'Teilnehmerstatus erfolgreich aktualisiert';
+$labels'errorunknownattendee' = 'Die Teilnehmerinformationen konnten nicht gefunden werden.';
 $labels'itipsendsuccess' = 'Einladung an Teilnehmer versendet.';
 $labels'itipresponseerror' = 'Die Antwort auf diese Einladung konnte nicht versendet werden';
 $labels'itipinvalidrequest' = 'Diese Einladung ist nicht mehr gültig.';
@@ -241,6 +256,7 @@
 $labels'futurevents' = 'Zukünftige';
 $labels'allevents' = 'Alle';
 $labels'saveasnew' = 'Als neu speichern';
+$labels'recurrenceerror' = 'Wiederholungsregel für angegebenes Startdatum kann nicht aufgelöst werden.';
 $labels'birthdays' = 'Geburtstage';
 $labels'birthdayscalendar' = 'Geburtstagskalender';
 $labels'displaybirthdayscalendar' = 'Geburtstagskalender anzeigen';
@@ -261,8 +277,10 @@
 $labels'arialabelquicksearchbox' = 'Sucheingabe für Termine';
 $labels'arialabelcalsearchform' = 'Suchformular für Kalender';
 $labels'calendaractions' = 'Kalenderaktionen';
+$labels'calendarprops' = 'Kalender Einstellungen';
 $labels'arialabeleventattendees' = 'Teilehmerliste';
 $labels'arialabeleventresources' = 'Liste der Terminressourcen';
 $labels'arialabelresourcesearchform' = 'Suchformular für Ressourcen';
 $labels'arialabelresourceselection' = 'Verfügbare Ressourcen';
+$labels'arialabeleventform' = 'Ereignisbearbeitungsformular';
 ?>

iRony-0.4.5.tar.gz/lib/plugins/calendar/localization/es_ES.inc -> iRony-0.4.6.tar.gz/lib/plugins/calendar/localization/es_ES.inc Changed

@@ -27,12 +27,18 @@
 $labels'aftermoveto' = 'Mover a...';
 $labels'itipoptions' = 'Invitaciones para el evento';
 $labels'afteraction' = 'Se procesa después de un mensaje de invitación o actualización';
-$labels'weeknonone' = 'never';
+$labels'showweekno' = 'Mostrar números de semana';
+$labels'weeknonone' = 'nunca';
+$labels'weeknodatepicker' = 'solo en selector de fechas';
+$labels'weeknoall' = 'en selector de fechas y vista de calendario';
 $labels'calendar' = 'Calendario';
 $labels'calendars' = 'Calendarios';
 $labels'category' = 'Categoría';
 $labels'categories' = 'Categorías';
+$labels'addcalendar' = 'Añadir calendario';
 $labels'createcalendar' = 'Crear nuevo calendario';
+$labels'editcalendar' = 'Editar/Compartir calendario';
+$labels'deletecalendar' = 'Eliminar calendario';
 $labels'name' = 'Nombre';
 $labels'color' = 'Color';
 $labels'day' = 'Día';
@@ -95,6 +101,7 @@
 $labels'parentcalendar' = 'Inserte en el interior';
 $labels'searchearlierdates' = '« Búsqueda de eventos anteriores';
 $labels'searchlaterdates' = 'Búsqueda de eventos posteriores  »';
+$labels'earlierevents' = 'Anterior';
 $labels'laterevents' = 'Luego';
 $labels'andnmore' = '$nr más...';
 $labels'togglerole' = 'Haga clic para cambiar el rol';
@@ -106,8 +113,11 @@
 $labels'showurl' = 'Mostrar URL del calendario';
 $labels'showurldescription' = 'Usar la siguiente dirección para acceder (sólo lectura) en su calendario desde otras aplicaciones. Puede copiar y pegar esto en cualquier software de calendario que admita el formato iCal.';
 $labels'caldavurldescription' = 'Copie esta dirección en un <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> cliente (Evolution o Mozilla Thunderbird) para sincronizar esta tarea con su ordenador o celular.';
+$labels'showfburl' = 'Mostrar URL libre-ocupado';
+$labels'fburldescription' = 'Usar la siguiente dirección para acceder Libre-Ocupado en su calendario desde otras aplicaciones. Puede copiar y pegar esto en cualquier software de calendario que admita el formato iCal. No es necesaria la autentificación para esta URL.';
 $labels'findcalendars' = 'Buscar calendarios ...';
 $labels'searchterms' = 'Buscar términos';
+$labels'findevents' = 'Buscar eventos';
 $labels'calsearchresults' = 'Calendarios disponibles';
 $labels'calendarsubscribe' = 'Lista Permanente';
 $labels'nocalendarsfound' = 'No se han encontrado calendarios';
@@ -117,6 +127,8 @@
 $labels'invitationsdeclined' = 'Invitaciones rechazada';
 $labels'changepartstat' = 'Cambiar el estado del participante';
 $labels'rsvpcomment' = 'Texto de la invitación';
+$labels'eventstartsync' = 'Mueve la fecha de inicio del evento a la primera aparición';
+$labels'weekshort' = 'Sem.';
 $labels'listrange' = 'Rango de visualización:';
 $labels'listsections' = 'Dividir en:';
 $labels'smartsections' = 'Secciones inteligentes';
@@ -164,6 +176,7 @@
 $labels'suggestedslot' = 'Ranura sugerida';
 $labels'noslotfound' = 'Incapaz de encontrar un intervalo de tiempo libre';
 $labels'invitationsubject' = 'Usted  sido invitado a "$title"';
+$labels'invitationmailbody' = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nSe adjunta un archivo iCalendar con los detalles del evento actualizados que se puede importar a la aplicación de calendario.";
 $labels'invitationattendlinks' = "En caso de que su cliente de correo electrónico no admite solicitudes iTIP que puede utilizar el siguiente enlace para aceptar o rechazar esta invitación:\n\$url";
 $labels'eventupdatesubject' = '"$title" Ha sido actualizado';
 $labels'eventupdatesubjectempty' = 'Un evento que le concierne ha sido actualizado';
@@ -189,11 +202,13 @@
 $labels'openpreview' = 'Revisar en calendario';
 $labels'noearlierevents' = 'No hay eventos anteriores';
 $labels'nolaterevents' = 'No hay eventos posteriores';
+$labels'legend' = 'Leyenda';
 $labels'resource' = 'Recurso';
 $labels'addresource' = 'Reservar recursos';
 $labels'findresources' = 'Encontrar recursos';
 $labels'resourcedetails' = 'Detalles';
 $labels'resourceavailability' = 'Disponibilidad';
+$labels'resourceprops' = 'Propiedades del archivo';
 $labels'resourceowner' = 'Propietario';
 $labels'resourceadded' = 'Se ha añadido un recurso a su evento';
 $labels'tabsummary' = 'Sumario';
@@ -210,6 +225,7 @@
 $labels'errorsaving' = 'Error al guardar cambios';
 $labels'operationfailed' = 'Error en la operación solicitada';
 $labels'invalideventdates' = 'Se han introducido fechas erróneas; por favor, revise su entrada';
+$labels'emptyeventtitle' = 'El nombre del evento no puede estar vacío.';
 $labels'invalidcalendarproperties' = 'Propiedades de portátiles erróneas; establezca un nombre válido.';
 $labels'searchnoresults' = 'No se han encontrado eventos en los calendarios seleccionados.';
 $labels'successremoval' = 'El evento se ha eliminado correctamente.';
@@ -222,6 +238,7 @@
 $labels'importedsuccessfully' = 'El evento se agregó correctamente a \'$calendar\'';
 $labels'updatedsuccessfully' = 'El evento se actualizó correctamente en \'$calendar\'';
 $labels'attendeupdateesuccess' = 'Se ha actualizado correctamente el estado del participante';
+$labels'errorunknownattendee' = 'Error al buscar información de a los participantes del evento.';
 $labels'itipsendsuccess' = 'Invitación enviada a los participantes.';
 $labels'itipresponseerror' = 'Error al enviar la respuesta a esta invitación de evento';
 $labels'itipinvalidrequest' = 'Esta invitación ya no es válida';
@@ -231,6 +248,7 @@
 $labels'importnone' = 'No se han encontrado eventos para importar';
 $labels'importerror' = 'Se ha producido un error durante la importación';
 $labels'aclnorights' = 'No tiene derechos de administrador en este calendario.';
+$labels'importtext' = 'Puede subir eventos en formato (.ics) <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a>.';
 $labels'changeeventconfirm' = 'Cambiar evento';
 $labels'removeeventconfirm' = 'Eliminar evento';
 $labels'changerecurringeventwarning' = 'Este es un evento recurrente. ¿Desea editar solo el evento actual, este y todos los futuros casos, todos los casos o guardarlo como un nuevo evento?';
@@ -240,6 +258,7 @@
 $labels'futurevents' = 'Futuro';
 $labels'allevents' = 'Todo';
 $labels'saveasnew' = 'Guardar como nuevo';
+$labels'recurrenceerror' = 'No se puede resolver la regla de recurrencia para la fecha de inicio especificada.';
 $labels'birthdays' = 'Cumpleaños';
 $labels'birthdayscalendar' = 'Calendario de cumpleaños';
 $labels'displaybirthdayscalendar' = 'Mostrar calendarios de cumpleaños';
@@ -260,8 +279,10 @@
 $labels'arialabelquicksearchbox' = 'Entrada en búsqueda de eventos';
 $labels'arialabelcalsearchform' = 'Formulario de búsqueda de calendarios';
 $labels'calendaractions' = 'acciones del calendario';
+$labels'calendarprops' = 'Propiedades del calendario';
 $labels'arialabeleventattendees' = 'Lista de participantes del evento';
 $labels'arialabeleventresources' = 'Lista de recursos del evento';
 $labels'arialabelresourcesearchform' = 'Formulario de búsqueda de recursos';
 $labels'arialabelresourceselection' = 'Recursos disponibles';
+$labels'arialabeleventform' = 'Formulario de edición de eventos';
 ?>

iRony-0.4.5.tar.gz/lib/plugins/calendar/localization/ko_KR.inc -> iRony-0.4.6.tar.gz/lib/plugins/calendar/localization/ko_KR.inc Changed

@@ -24,11 +24,15 @@
 $labels'afterflagdeleted' = '삭제로 표시';
 $labels'aftermoveto' = '이동';
 $labels'itipoptions' = '일정에 초대';
+$labels'showweekno' = '몇 번째 주인지 표시';
 $labels'calendar' = '캘린더';
 $labels'calendars' = '캘린더';
 $labels'category' = '카테고리';
 $labels'categories' = '카테고리';
+$labels'addcalendar' = '캘린더 추가';
 $labels'createcalendar' = '새 캘린더 추가';
+$labels'editcalendar' = '캘린더 수정/공유';
+$labels'deletecalendar' = '캘린더 삭제';
 $labels'name' = '이름';
 $labels'color' = '색상';
 $labels'day' = '일';
@@ -86,6 +90,8 @@
 $labels'printdescriptions' = '내용 출력';
 $labels'searchearlierdates' = '이전 일정 검색';
 $labels'searchlaterdates' = '이후 일정 검색';
+$labels'earlierevents' = '더 일찍';
+$labels'laterevents' = '이후에';
 $labels'andnmore' = '$nr 더...';
 $labels'createfrommail' = '일정으로 저장';
 $labels'importevents' = '일정 가져오기';
@@ -93,6 +99,7 @@
 $labels'nmonthsback' = '$nr개월 전';
 $labels'showurl' = '캘린더 URL 보이기';
 $labels'findcalendars' = '캘린더 검색';
+$labels'findevents' = '일정 검색';
 $labels'calsearchresults' = '가능한 캘린더';
 $labels'nocalendarsfound' = '캘린더 없음';
 $labels'nrcalendarsfound' = '$nr개의 캘린더 검색됨';
@@ -101,6 +108,7 @@
 $labels'invitationsdeclined' = '거절된 초대장';
 $labels'changepartstat' = '참가상태 변경';
 $labels'rsvpcomment' = '초대 문구';
+$labels'weekshort' = '주';
 $labels'listrange' = '표시 범위';
 $labels'listsections' = '분류 :';
 $labels'smartsections' = '스마트 선택';
@@ -119,6 +127,7 @@
 $labels'defaultalarmtype' = '기본 알림 설정';
 $labels'defaultalarmoffset' = '기본 알림 시간';
 $labels'attendee' = '참가자';
+$labels'role' = '역할';
 $labels'availability' = '가능';
 $labels'confirmstate' = '상태';
 $labels'addattendee' = '참가자 추가';
@@ -130,6 +139,7 @@
 $labels'cutypeindividual' = '개인';
 $labels'cutypegroup' = '그룹';
 $labels'cutyperesource' = '자원';
+$labels'cutyperoom' = '공간';
 $labels'availfree' = '한가함';
 $labels'availbusy' = '바쁨';
 $labels'availunknown' = '알 수 없는';
@@ -145,6 +155,8 @@
 $labels'noslotfound' = '여유 시간 슬롯을 찾을 수 없습니다.';
 $labels'invitationsubject' = '"$title"에 초대되었습니다';
 $labels'invitationattendlinks' = "당신과 관련된 이벤트가 업데이트되었습니다";
+$labels'eventupdatesubject' = '"$title" 이 변경되었습니다';
+$labels'eventcancelsubject' = '"$title" 이 취소되었습니다';
 $labels'itipobjectnotfound' = '이 메시지와 관련된 일정을 캘린더에서 찾을 수 없습니다.';
 $labels'itipdeclineevent' = '이 일정에 초대를 거절할까요?';
 $labels'declinedeleteconfirm' = '당신이 당신의 달력에서 이벤트를 사퇴 삭제 하시겠습니까?';
@@ -156,9 +168,13 @@
 $labels'noearlierevents' = '이전 일정이 없습니다';
 $labels'nolaterevents' = '이후 일정이 없습니다';
 $labels'resource' = '자원';
+$labels'resourcedetails' = '상세정보';
+$labels'resourceowner' = '소유자';
 $labels'tabsummary' = '요약';
 $labels'tabrecurrence' = '반복';
 $labels'tabattendees' = '참가자';
+$labels'tabattachments' = '첨부';
+$labels'tabsharing' = '공유';
 $labels'deleteobjectconfirm' = '이 일정을 정말 삭제 하시겠습니까?';
 $labels'deleteventconfirm' = '이 일정을 정말 삭제 하시겠습니까?';
 $labels'deletecalendarconfirm' = '이 캘린더와 포함된 모든 일정을 정말 삭제하겠습니까?';
@@ -176,7 +192,10 @@
 $labels'importwarningexists' = '캘린더에 이미 동일한 일정이 존재합니다.';
 $labels'newerversionexists' = '최근에 수정한 내용이 이미 저장되어 있습니다. 작업이 취소되었습니다.';
 $labels'nowritecalendarfound' = '일정을 저장할 캘린더가 없습니다';
+$labels'itipsendsuccess' = '참석자에게 초대장을 발송했습니다.';
+$labels'itipresponseerror' = '초대장에 응답을 보내는데 실패하였습니다';
 $labels'itipinvalidrequest' = '이 초대장은 더이상 유효하지 않습니다';
+$labels'sentresponseto' = '$mailto 의 초대장에 응답을 보내는데 성공하였습니다';
 $labels'importnone' = '가져올 일정이 없습니다';
 $labels'importerror' = '가져오는 도중 오류가 발생했습니다';
 $labels'aclnorights' = '이 캘린더에 대한 관리권한이 없습니다.';
@@ -192,7 +211,9 @@
 $labels'birthdayscalendarsources' = '주소록에서';
 $labels'birthdayeventtitle' = '$name의 생일';
 $labels'birthdayage' = '$age세';
+$labels'objectchangelog' = '이력 변경';
 $labels'objectnotfound' = '일정 데이터를 읽지 못하였습니다';
+$labels'objectchangelognotavailable' = '이 일정에 대한 이력을 변경할 수 없습니다';
 $labels'objectrestoreerror' = '이전 버전으로 복구하지 못하였습니다';
 $labels'arialabelcalendarview' = '캘린더 보기';
 $labels'arialabelsearchform' = '일정 검색 폼';

iRony-0.4.5.tar.gz/lib/plugins/kolab_2fa/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/kolab_2fa/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_2fa/kolab_2fa.php -> iRony-0.4.6.tar.gz/lib/plugins/kolab_2fa/kolab_2fa.php Changed

@@ -88,24 +88,34 @@
         // parse $host URL
         $a_host = parse_url($args'host');
         $hostname = $_SESSION'hostname' = $a_host'host' ?: $args'host';
+        $username = !empty($_SESSION'kolab_auth_admin') ? $_SESSION'kolab_auth_admin' : $args'user';
 
-        // 1. find user record (and its prefs) before IMAP login
-        if ($user = rcube_user::query($args'user', $hostname)) {
-            $rcmail->config->set_user_prefs($user->get_prefs());
+        // Convert username to lowercase. Copied from rcmail::login()
+        $login_lc = $rcmail->config->get('login_lc', 2);
+        if ($login_lc) {
+            if ($login_lc == 2 || $login_lc === true) {
+                $username = mb_strtolower($username);
+            }
+            else if (strpos($username, '@')) {
+                // lowercase domain name
+                list($local, $domain) = explode('@', $username);
+                $username = $local . '@' . mb_strtolower($domain);
+            }
         }
 
         // 2a. let plugins provide the list of active authentication factors
         $lookup = $rcmail->plugins->exec_hook('kolab_2fa_lookup', array(
-            'user'    => $args'user',
+            'user'    => $username,
             'host'    => $hostname,
-            'factors' => $rcmail->config->get('kolab_2fa_factors'),
+            'factors' => null,
             'check'   => $rcmail->config->get('kolab_2fa_check', true),
         ));
+
         if (isset($lookup'factors')) {
             $factors = (array)$lookup'factors';
         }
         // 2b. check storage if this user has 2FA enabled
-        else if ($lookup'check' !== false && ($storage = $this->get_storage($args'user'))) {
+        else if ($lookup'check' !== false && ($storage = $this->get_storage($username))) {
             $factors = (array)$storage->enumerate();
         }
 
@@ -149,14 +159,15 @@
      */
     public function login_verify($args)
     {
-        $rcmail = rcmail::get_instance();
+        $this->login_verified = false;
 
-        $time  = $_SESSION'kolab_2fa_time';
-        $nonce = $_SESSION'kolab_2fa_nonce';
-        $factors = (array)$_SESSION'kolab_2fa_factors';
+        $rcmail = rcmail::get_instance();
 
-        $this->login_verified = false;
-        $expired = $time < time() - $rcmail->config->get('kolab_2fa_timeout', 120);
+        $time     = $_SESSION'kolab_2fa_time';
+        $nonce    = $_SESSION'kolab_2fa_nonce';
+        $factors  = (array)$_SESSION'kolab_2fa_factors';
+        $expired  = $time < time() - $rcmail->config->get('kolab_2fa_timeout', 120);
+        $username = !empty($_SESSION'kolab_auth_admin') ? $_SESSION'kolab_auth_admin' : $_SESSION'username';
 
         if (!empty($factors) && !empty($nonce) && !$expired) {
             // TODO: check signature
@@ -167,7 +178,7 @@
 
                 // verify the submitted code
                 $code = rcube_utils::get_input_value("_${nonce}_${method}", rcube_utils::INPUT_POST);
-                $this->login_verified = $this->verify_factor_auth($factor, $code);
+                $this->login_verified = $this->verify_factor_auth($factor, $code, $username);
 
                 // accept first successful method
                 if ($this->login_verified) {
@@ -181,6 +192,11 @@
             $_POST'_user' = $_SESSION'username';
             $_POST'_host' = $_SESSION'host';
             $_POST'_pass' = $rcmail->decrypt($_SESSION'password');
+
+            if ($_SESSION'kolab_auth_admin') {
+                $_POST'_user'    = $_SESSION'kolab_auth_admin';
+                $_POST'_loginas' = $_SESSION'username';
+            }
         }
 
         // proceed with regular login ...
@@ -195,15 +211,15 @@
 
         return $args;
     }
-    
+
     /**
      * Helper method to verify the given method/code tuple
      */
-    protected function verify_factor_auth($method, $code)
+    protected function verify_factor_auth($method, $code, $username)
     {
         if (strlen($code) && ($driver = $this->get_driver($method))) {
             // set properties from login
-            $driver->username  = $_SESSION'username';
+            $driver->username = $username;
 
             try {
                 // verify the submitted code

iRony-0.4.5.tar.gz/lib/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php -> iRony-0.4.6.tar.gz/lib/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_activesync/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/kolab_activesync/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_activesync/config.inc.php.dist -> iRony-0.4.6.tar.gz/lib/plugins/kolab_activesync/config.inc.php.dist Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_activesync/kolab_activesync.js -> iRony-0.4.6.tar.gz/lib/plugins/kolab_activesync/kolab_activesync.js Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_activesync/kolab_activesync_ui.php -> iRony-0.4.6.tar.gz/lib/plugins/kolab_activesync/kolab_activesync_ui.php Changed

@@ -27,6 +27,7 @@
 {
     private $rc;
     private $plugin;
+    private $force_subscriptions = array();
     public  $device = array();
 
     const SETUP_URL = 'https://kb.kolabenterprise.com/documentation/setting-up-an-activesync-client';
@@ -39,6 +40,9 @@
         $skin_path       = $this->plugin->local_skin_path() . '/';
         $this->skin_path = 'plugins/kolab_activesync/' . $skin_path;
 
+        $this->plugin->load_config();
+        $this->force_subscriptions = $this->rc->config->get('activesync_force_subscriptions', array());
+
         $this->plugin->include_stylesheet($skin_path . 'config.css');
     }
 
@@ -94,6 +98,15 @@
     }
 
 
+    private function is_protected($folder, $devicetype)
+    {
+        $devicetype = strtolower($devicetype);
+        if (array_key_exists($devicetype, $this->force_subscriptions)) {
+            return array_key_exists($folder, $this->force_subscriptions$devicetype);
+        }
+        return false;
+    }
+
     public function folder_subscriptions($attrib = array())
     {
         if (!$attrib'id') {
@@ -111,6 +124,9 @@
             $folder_meta = $this->plugin->folder_meta();
         }
 
+        $devicetype = strtolower($this->device'TYPE');
+        $device_force_subscriptions = $this->force_subscriptions$devicetype;
+
         foreach ($this->plugin->list_folders() as $folder) {
             if ($folder_types$folder) {
                 list($type, ) = explode('.', $folder_types$folder);
@@ -122,7 +138,9 @@
             if (is_array($folder_groups$type)) {
                 $folder_groups$type = $folder;
 
-                if (!empty($folder_meta) && ($meta = $folder_meta$folder)
+                if ($device_force_subscriptions && array_key_exists($folder, $device_force_subscriptions)) {
+                    $subscribed$folder = intval($device_force_subscriptions$folder);
+                } else if (!empty($folder_meta) && ($meta = $folder_meta$folder)
                     && $meta'FOLDER' && $meta'FOLDER'$imei'S'
                 ) {
                     $subscribed$folder = intval($meta'FOLDER'$imei'S');
@@ -185,7 +203,7 @@
 
         $names = array();
         foreach ($a_folders as $folder) {
-            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_prettyname($folder));
+            $foldername = $origname = kolab_storage::object_prettyname($folder);
 
             // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
             for ($i = count($names)-1; $i >= 0; $i--) {
@@ -210,14 +228,17 @@
             }
 
             $table->add_row();
+
+            $disabled = $this->is_protected($folder, $this->device'TYPE');
+
             $table->add('subscription checkbox-cell', $checkbox_sync->show(
                 !empty($subscribed$folder) ? $folder : null,
-                array('value' => $folder, 'id' => $folder_id)));
+                array('value' => $folder, 'id' => $folder_id, 'disabled' => $disabled)));
 
             if ($alarms) {
                 $table->add('alarm checkbox-cell', $checkbox_alarm->show(
                     intval($subscribed$folder) > 1 ? $folder : null,
-                    array('value' => $folder, 'id' => $folder_id.'_alarm')));
+                    array('value' => $folder, 'id' => $folder_id.'_alarm', 'disabled' => $disabled)));
             }
 
             $table->add(join(' ', $classes), html::label($folder_id, $foldername));
@@ -258,15 +279,17 @@
                 }
             }
 
+            $disabled = $this->is_protected($folder_name, $device'TYPE');
+
             $table->add_row();
             $table->add(array('class' => 'device', 'title' => $title), $name);
-            $table->add('subscription checkbox-cell', $checkbox->show(!empty($folder_data$id'S') ? 1 : 0));
+            $table->add('subscription checkbox-cell', $checkbox->show(!empty($folder_data$id'S') ? 1 : 0, array('disabled' => $disabled)));
 
             if ($alarms) {
                 $checkbox_alarm = new html_checkbox(array('name' => "_alarms$id", 'value' => 1,
                     'onchange' => 'return activesync_object.update_sync_data(this)'));
 
-                $table->add('alarm checkbox-cell', $checkbox_alarm->show($folder_data$id'S' > 1 ? 1 : 0));
+                $table->add('alarm checkbox-cell', $checkbox_alarm->show($folder_data$id'S' > 1 ? 1 : 0, array('disabled' => $disabled)));
             }
         }

iRony-0.4.5.tar.gz/lib/plugins/kolab_addressbook/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/kolab_addressbook/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_addressbook/kolab_addressbook.php -> iRony-0.4.6.tar.gz/lib/plugins/kolab_addressbook/kolab_addressbook.php Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php -> iRony-0.4.6.tar.gz/lib/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php Changed

@@ -34,52 +34,78 @@
     public $undelete = true;
     public $groups = true;
     public $coltypes = array(
-      'name'         => array('limit' => 1),
-      'firstname'    => array('limit' => 1),
-      'surname'      => array('limit' => 1),
-      'middlename'   => array('limit' => 1),
-      'prefix'       => array('limit' => 1),
-      'suffix'       => array('limit' => 1),
-      'nickname'     => array('limit' => 1),
-      'jobtitle'     => array('limit' => 1),
-      'organization' => array('limit' => 1),
-      'department'   => array('limit' => 1),
-      'email'        => array('subtypes' => array('home','work','other')),
-      'phone'        => array(),
-      'address'      => array('subtypes' => array('home','work','office')),
-      'website'      => array('subtypes' => array('homepage','blog')),
-      'im'           => array('subtypes' => null),
-      'gender'       => array('limit' => 1),
-      'birthday'     => array('limit' => 1),
-      'anniversary'  => array('limit' => 1),
-      'profession'   => array('type' => 'text', 'size' => 40, 'maxlength' => 80, 'limit' => 1,
-                                'label' => 'kolab_addressbook.profession', 'category' => 'personal'),
-      'manager'      => array('limit' => null),
-      'assistant'    => array('limit' => null),
-      'spouse'       => array('limit' => 1),
-      'children'     => array('type' => 'text', 'size' => 40, 'maxlength' => 80, 'limit' => null,
-                                'label' => 'kolab_addressbook.children', 'category' => 'personal'),
-      'freebusyurl'  => array('type' => 'text', 'size' => 40, 'limit' => 1,
-                                'label' => 'kolab_addressbook.freebusyurl'),
-      'pgppublickey' => array('type' => 'textarea', 'size' => 70, 'rows' => 10, 'limit' => 1,
-                                'label' => 'kolab_addressbook.pgppublickey'),
-      'pkcs7publickey' => array('type' => 'textarea', 'size' => 70, 'rows' => 10, 'limit' => 1,
-                                'label' => 'kolab_addressbook.pkcs7publickey'),
-      'notes'        => array('limit' => 1),
-      'photo'        => array('limit' => 1),
-      // TODO: define more Kolab-specific fields such as: language, latitude, longitude, crypto settings
+        'name'         => array('limit' => 1),
+        'firstname'    => array('limit' => 1),
+        'surname'      => array('limit' => 1),
+        'middlename'   => array('limit' => 1),
+        'prefix'       => array('limit' => 1),
+        'suffix'       => array('limit' => 1),
+        'nickname'     => array('limit' => 1),
+        'jobtitle'     => array('limit' => 1),
+        'organization' => array('limit' => 1),
+        'department'   => array('limit' => 1),
+        'email'        => array('subtypes' => array('home','work','other')),
+        'phone'        => array(),
+        'address'      => array('subtypes' => array('home','work','office')),
+        'website'      => array('subtypes' => array('homepage','blog')),
+        'im'           => array('subtypes' => null),
+        'gender'       => array('limit' => 1),
+        'birthday'     => array('limit' => 1),
+        'anniversary'  => array('limit' => 1),
+        'profession'   => array(
+            'type'      => 'text',
+            'size'      => 40,
+            'maxlength' => 80,
+            'limit'     => 1,
+            'label'     => 'kolab_addressbook.profession',
+            'category'  => 'personal'
+        ),
+        'manager'      => array('limit' => null),
+        'assistant'    => array('limit' => null),
+        'spouse'       => array('limit' => 1),
+        'children'     => array(
+            'type'      => 'text',
+            'size'      => 40,
+            'maxlength' => 80,
+            'limit'     => null,
+            'label'     => 'kolab_addressbook.children',
+            'category'  => 'personal'
+        ),
+        'freebusyurl'  => array(
+            'type'  => 'text',
+            'size'  => 40,
+            'limit' => 1,
+            'label' => 'kolab_addressbook.freebusyurl'
+        ),
+        'pgppublickey' => array(
+            'type' => 'textarea',
+            'size' => 70,
+            'rows' => 10,
+            'limit' => 1,
+            'label' => 'kolab_addressbook.pgppublickey'
+        ),
+        'pkcs7publickey' => array(
+            'type' => 'textarea',
+            'size' => 70,
+            'rows' => 10,
+            'limit' => 1,
+            'label' => 'kolab_addressbook.pkcs7publickey'
+        ),
+        'notes'        => array('limit' => 1),
+        'photo'        => array('limit' => 1),
+        // TODO: define more Kolab-specific fields such as: language, latitude, longitude, crypto settings
     );
 
     /**
      * vCard additional fields mapping
      */
     public $vcard_map = array(
-      'profession'     => 'X-PROFESSION',
-      'officelocation' => 'X-OFFICE-LOCATION',
-      'initials'       => 'X-INITIALS',
-      'children'       => 'X-CHILDREN',
-      'freebusyurl'    => 'X-FREEBUSY-URL',
-      'pgppublickey'   => 'KEY',
+        'profession'     => 'X-PROFESSION',
+        'officelocation' => 'X-OFFICE-LOCATION',
+        'initials'       => 'X-INITIALS',
+        'children'       => 'X-CHILDREN',
+        'freebusyurl'    => 'X-FREEBUSY-URL',
+        'pgppublickey'   => 'KEY',
     );
 
     /**
@@ -102,25 +128,25 @@
 
     // list of fields used for searching in "All fields" mode
     private $search_fields = array(
-      'name',
-      'firstname',
-      'surname',
-      'middlename',
-      'prefix',
-      'suffix',
-      'nickname',
-      'jobtitle',
-      'organization',
-      'department',
-      'email',
-      'phone',
-      'address',
-      'profession',
-      'manager',
-      'assistant',
-      'spouse',
-      'children',
-      'notes',
+        'name',
+        'firstname',
+        'surname',
+        'middlename',
+        'prefix',
+        'suffix',
+        'nickname',
+        'jobtitle',
+        'organization',
+        'department',
+        'email',
+        'phone',
+        'address',
+        'profession',
+        'manager',
+        'assistant',
+        'spouse',
+        'children',
+        'notes',
     );
 
 
@@ -132,15 +158,17 @@
 
         // extend coltypes configuration 
         $format = kolab_format::factory('contact');
-        $this->coltypes'phone''subtypes' = array_keys($format->phonetypes);
+
+        $this->coltypes'phone''subtypes'   = array_keys($format->phonetypes);
         $this->coltypes'address''subtypes' = array_keys($format->addresstypes);
 
         $rcube = rcube::get_instance();
 
         // set localized labels for proprietary cols
         foreach ($this->coltypes as $col => $prop) {
-            if (is_string($prop'label'))
+            if (is_string($prop'label')) {
                 $this->coltypes$col'label' = $rcube->gettext($prop'label');
+            }
         }
 
         // fetch objects from the given IMAP folder
@@ -157,8 +185,9 @@
                 $rights = $this->storagefolder->get_myrights();
                 if ($rights && !PEAR::isError($rights)) {
                     $this->rights = $rights;
-                    if (strpos($rights, 'i') !== false && strpos($rights, 't') !== false)
+                    if (strpos($rights, 'i') !== false && strpos($rights, 't') !== false) {
                         $this->readonly = false;
+                    }
                 }
             }
         }
@@ -233,17 +262,17 @@
      */
     public function get_carddav_url()
     {
-      $rcmail = rcmail::get_instance();
-      if ($template = $rcmail->config->get('kolab_addressbook_carddav_url', null)) {
-        return strtr($template, array(
-          '%h' => $_SERVER'HTTP_HOST',
-          '%u' => urlencode($rcmail->get_user_name()),
-          '%i' => urlencode($this->storagefolder->get_uid()),
-          '%n' => urlencode($this->imap_folder),
-        ));
-      }
-
-      return false;
+        $rcmail = rcmail::get_instance();
+        if ($template = $rcmail->config->get('kolab_addressbook_carddav_url', null)) {
+            return strtr($template, array(
+                    '%h' => $_SERVER'HTTP_HOST',
+                    '%u' => urlencode($rcmail->get_user_name()),
+                    '%i' => urlencode($this->storagefolder->get_uid()),
+                    '%n' => urlencode($this->imap_folder),
+            ));
+        }
+
+        return false;
     }
 
     /**
@@ -254,7 +283,6 @@
         $this->gid = $gid;
     }
 
-
     /**
      * Save a search string for future listings
      *
@@ -265,7 +293,6 @@
         $this->filter = $filter;
     }
 
-
     /**
      * Getter for saved search properties
      *
@@ -276,7 +303,6 @@
         return $this->filter;
     }
 
-
     /**
      * Reset saved results and search parameters
      */
@@ -286,14 +312,13 @@
         $this->filter = null;
     }
 
-
     /**
      * List all active contact groups of this source
      *
      * @param string Optional search string to match group name
      * @param int    Search mode. Sum of self::SEARCH_*
      *
-     * @return array  Indexed list of contact groups, each a hash array
+     * @return array Indexed list of contact groups, each a hash array
      */
     function list_groups($search = null, $mode = 0)
     {
@@ -312,15 +337,14 @@
         return array_values($groups);
     }
 
-
     /**
      * List the current set of contact records
      *
      * @param array List of cols to show
-     * @param  int  Only return this number of records, use negative values for tail
-     * @param  boolean True to skip the count query (select only)
+     * @param int   Only return this number of records, use negative values for tail
+     * @param bool  True to skip the count query (select only)
      *
-     * @return array  Indexed list of contact records, each a hash array
+     * @return array Indexed list of contact records, each a hash array
      */
     public function list_records($cols = null, $subset = 0, $nocount = false)
     {
@@ -409,22 +433,21 @@
         return $this->result;
     }
 
-
     /**
      * Search records
      *
-     * @param mixed   $fields   The field name of array of field names to search in
-     * @param mixed   $value    Search value (or array of values when $fields is array)
-     * @param int     $mode     Matching mode:
-     *                          0 - partial (*abc*),
-     *                          1 - strict (=),
-     *                          2 - prefix (abc*)
-     *                          4 - include groups (if supported)
-     * @param boolean $select   True if results are requested, False if count only
-     * @param boolean $nocount  True to skip the count query (select only)
-     * @param array   $required List of fields that cannot be empty
+     * @param mixed $fields   The field name of array of field names to search in
+     * @param mixed $value    Search value (or array of values when $fields is array)
+     * @param int   $mode     Matching mode:
+     *                        0 - partial (*abc*),
+     *                        1 - strict (=),
+     *                        2 - prefix (abc*)
+     *                        4 - include groups (if supported)
+     * @param bool  $select   True if results are requested, False if count only
+     * @param bool  $nocount  True to skip the count query (select only)
+     * @param array $required List of fields that cannot be empty
      *
-     * @return object rcube_result_set List of contact records and 'count' value
+     * @return rcube_result_set List of contact records and 'count' value
      */
     public function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array())
     {
@@ -445,18 +468,21 @@
             $fields = $this->search_fields;
         }
 
-        if (!is_array($fields))
+        if (!is_array($fields)) {
             $fields = array($fields);
-        if (!is_array($required) && !empty($required))
+        }
+        if (!is_array($required) && !empty($required)) {
             $required = array($required);
+        }
 
         // advanced search
         if (is_array($value)) {
             $advanced = true;
             $value = array_map('mb_strtolower', $value);
         }
-        else
+        else {
             $value = mb_strtolower($value);
+        }
 
         $scount = count($fields);
         // build key name regexp
@@ -526,19 +552,18 @@
         return $this->list_records();
     }
 
-
     /**
      * Refresh saved search results after data has changed
      */
     public function refresh_search()
     {
-        if ($this->filter)
+        if ($this->filter) {
             $this->search($this->filter'fields', $this->filter'value', $this->filter'mode');
+        }
 
         return $this->get_search_set();
     }
 
-
     /**
      * Count number of available contacts in database
      *
@@ -560,7 +585,6 @@
         return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
     }
 
-
     /**
      * Return the last result set
      *
@@ -571,15 +595,15 @@
         return $this->result;
     }
 
-
     /**
      * Get a specific contact record
      *
-     * @param mixed record identifier(s)
-     * @param boolean True to return record as associative array, otherwise a result set is returned
+     * @param mixed Record identifier(s)
+     * @param bool  True to return record as associative array, otherwise a result set is returned
+     *
      * @return mixed Result object with all record fields or False if not found
      */
-    public function get_record($id, $assoc=false)
+    public function get_record($id, $assoc = false)
     {
         $rec = null;
         $uid = $this->id2uid($id);
@@ -612,11 +636,11 @@
         return false;
     }
 
-
     /**
      * Get group assignments of a specific contact record
      *
      * @param mixed Record identifier
+     *
      * @return array List of assigned groups as ID=>Name pairs
      */
     public function get_record_groups($id)
@@ -624,28 +648,33 @@
         $out = array();
         $this->_fetch_groups();
 
-        foreach ((array)$this->groupmembers$id as $gid) {
-            if ($group = $this->distlists$gid)
-                $out$gid = $group'name';
+        if (!empty($this->groupmembers$id)) {
+            foreach ((array) $this->groupmembers$id as $gid) {
+                if (!empty($this->distlists$gid)) {
+                    $group = $this->distlists$gid;
+                    $out$gid = $group'name';
+                }
+            }
         }
 
         return $out;
     }
 
-
     /**
      * Create a new contact record
      *
-     * @param array Assoziative array with save data
+     * @param array Associative array with save data
      *  Keys:   Field name with optional section in the form FIELD:SECTION
      *  Values: Field value. Can be either a string or an array of strings for multiple values
-     * @param boolean True to check for duplicates first
+     * @param bool  True to check for duplicates first
+     *
      * @return mixed The created record ID on success, False on error
      */
     public function insert($save_data, $check=false)
     {
-        if (!is_array($save_data))
+        if (!is_array($save_data)) {
             return false;
+        }
 
         $insert_id = $existing = false;
 
@@ -682,15 +711,15 @@
         return $insert_id;
     }
 
-
     /**
      * Update a specific contact record
      *
      * @param mixed Record identifier
-     * @param array Assoziative array with save data
+     * @param array Associative array with save data
      *  Keys:   Field name with optional section in the form FIELD:SECTION
      *  Values: Field value. Can be either a string or an array of strings for multiple values
-     * @return boolean True on success, False on error
+     *
+     * @return bool True on success, False on error
      */
     public function update($id, $save_data)
     {
@@ -700,10 +729,11 @@
 
             if (!$this->storagefolder->save($object, 'contact', $old'uid')) {
                 rcube::raise_error(array(
-                  'code' => 600, 'type' => 'php',
-                  'file' => __FILE__, 'line' => __LINE__,
-                  'message' => "Error saving contact object to Kolab server"),
-                true, false);
+                        'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                        'message' => "Error saving contact object to Kolab server"
+                    ),
+                    true, false
+                );
             }
             else {
                 $updated = true;
@@ -715,12 +745,11 @@
         return $updated;
     }
 
-
     /**
      * Mark one or more contact records as deleted
      *
-     * @param array   Record identifiers
-     * @param boolean Remove record(s) irreversible (mark as deleted otherwise)
+     * @param array Record identifiers
+     * @param bool  Remove record(s) irreversible (mark as deleted otherwise)
      *
      * @return int Number of records deleted
      */
@@ -728,8 +757,9 @@
     {
         $this->_fetch_groups();
 
-        if (!is_array($ids))
+        if (!is_array($ids)) {
             $ids = explode(',', $ids);
+        }
 
         $count = 0;
         foreach ($ids as $id) {
@@ -739,16 +769,18 @@
 
                 if (!$deleted) {
                     rcube::raise_error(array(
-                      'code' => 600, 'type' => 'php',
-                      'file' => __FILE__, 'line' => __LINE__,
-                      'message' => "Error deleting a contact object $uid from the Kolab server"),
-                    true, false);
+                            'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                            'message' => "Error deleting a contact object $uid from the Kolab server"
+                        ),
+                        true, false
+                    );
                 }
                 else {
                     // remove from distribution lists
-                    foreach ((array)$this->groupmembers$id as $gid) {
-                        if (!$is_mailto || $gid == $this->gid)
+                    foreach ((array) $this->groupmembers$id as $gid) {
+                        if (!$is_mailto || $gid == $this->gid) {
                             $this->remove_from_group($gid, $id);
+                        }
                     }
 
                     // clear internal cache
@@ -761,19 +793,19 @@
         return $count;
     }
 
-
     /**
      * Undelete one or more contact records.
      * Only possible just after delete (see 2nd argument of delete() method).
      *
-     * @param array  Record identifiers
+     * @param array Record identifiers
      *
      * @return int Number of records restored
      */
     public function undelete($ids)
     {
-        if (!is_array($ids))
+        if (!is_array($ids)) {
             $ids = explode(',', $ids);
+        }
 
         $count = 0;
         foreach ($ids as $id) {
@@ -783,17 +815,17 @@
             }
             else {
                 rcube::raise_error(array(
-                  'code' => 600, 'type' => 'php',
-                  'file' => __FILE__, 'line' => __LINE__,
-                  'message' => "Error undeleting a contact object $uid from the Kolab server"),
-                true, false);
+                        'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                        'message' => "Error undeleting a contact object $uid from the Kolab server"
+                    ),
+                    true, false
+                );
             }
         }
 
         return $count;
     }
 
-
     /**
      * Remove all records from the database
      *
@@ -809,7 +841,6 @@
         }
     }
 
-
     /**
      * Close connection to source
      * Called on script shutdown
@@ -818,11 +849,11 @@
     {
     }
 
-
     /**
      * Create a contact group with the given name
      *
      * @param string The group name
+     *
      * @return mixed False on error, array with record props in success
      */
     function create_group($name)
@@ -838,10 +869,11 @@
 
         if (!$saved) {
             rcube::raise_error(array(
-                'code' => 600, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Error saving distribution-list object to Kolab server"),
-            true, false);
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Error saving distribution-list object to Kolab server"
+                ),
+                true, false
+            );
             return false;
         }
         else {
@@ -857,7 +889,8 @@
      * Delete the given group and all linked group members
      *
      * @param string Group identifier
-     * @return boolean True on success, false if no data was changed
+     *
+     * @return bool True on success, false if no data was changed
      */
     function delete_group($gid)
     {
@@ -870,10 +903,11 @@
 
         if (!$deleted) {
             rcube::raise_error(array(
-                'code' => 600, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Error deleting distribution-list object from the Kolab server"),
-            true, false);
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Error deleting distribution-list object from the Kolab server"
+                ),
+                true, false
+            );
         }
         else {
             $result = true;
@@ -889,7 +923,7 @@
      * @param string New name to set for this group
      * @param string New group identifier (if changed, otherwise don't set)
      *
-     * @return boolean New name on success, false if no data was changed
+     * @return bool New name on success, false if no data was changed
      */
     function rename_group($gid, $newname, &$newid)
     {
@@ -903,10 +937,11 @@
 
         if (!$saved) {
             rcube::raise_error(array(
-                'code' => 600, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Error saving distribution-list object to Kolab server"),
-            true, false);
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Error saving distribution-list object to Kolab server"
+                ),
+                true, false
+            );
             return false;
         }
 
@@ -916,9 +951,9 @@
     /**
      * Add the given contact records the a certain group
      *
-     * @param string  Group identifier
-     * @param array   List of contact identifiers to be added
-     * @return int    Number of contacts added
+     * @param string Group identifier
+     * @param array  List of contact identifiers to be added
+     * @return int   Number of contacts added
      */
     function add_to_group($gid, $ids)
     {
@@ -965,17 +1000,21 @@
             }
         }
 
-        if ($added)
+        if ($added) {
             $saved = $this->storagefolder->save($list, 'distribution-list', $list'uid');
-        else
+        }
+        else {
             $saved = true;
+        }
 
         if (!$saved) {
             rcube::raise_error(array(
-                'code' => 600, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Error saving distribution-list to Kolab server"),
-            true, false);
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Error saving distribution-list to Kolab server"
+                ),
+                true, false
+            );
+
             $added = false;
             $this->set_error(self::ERROR_SAVING, 'errorsaving');
         }
@@ -989,23 +1028,26 @@
     /**
      * Remove the given contact records from a certain group
      *
-     * @param string  Group identifier
-     * @param array   List of contact identifiers to be removed
-     * @return int    Number of deleted group members
+     * @param string Group identifier
+     * @param array  List of contact identifiers to be removed
+     * @return int   Number of deleted group members
      */
     function remove_from_group($gid, $ids)
     {
-        if (!is_array($ids))
+        if (!is_array($ids)) {
             $ids = explode(',', $ids);
+        }
 
         $this->_fetch_groups();
-        if (!($list = $this->distlists$gid))
+        if (!($list = $this->distlists$gid)) {
             return false;
+        }
 
         $new_member = array();
         foreach ((array)$list'member' as $member) {
-            if (!in_array($member'ID', $ids))
+            if (!in_array($member'ID', $ids)) {
                 $new_member = $member;
+            }
         }
 
         // write distribution list back to server
@@ -1014,10 +1056,11 @@
 
         if (!$saved) {
             rcube::raise_error(array(
-                'code' => 600, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Error saving distribution-list object to Kolab server"),
-            true, false);
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Error saving distribution-list object to Kolab server"
+                ),
+                true, false
+            );
         }
         else {
             // remove group assigments in local cache
@@ -1039,7 +1082,7 @@
      * @param array Associative array with contact data to save
      * @param bool  Attempt to fix/complete data automatically
      *
-     * @return boolean True if input is valid, False if not.
+     * @return bool True if input is valid, False if not.
      */
     public function validate(&$save_data, $autofix = false)
     {
@@ -1245,15 +1288,23 @@
         }
 
         // photo is stored as separate attachment
-        if ($record'photo' && strlen($record'photo') < 255 && ($att = $record'_attachments'$record'photo')) {
+        if ($record'photo' && strlen($record'photo') < 255 && !empty($record'_attachments'$record'photo')) {
+            $att = $record'_attachments'$record'photo';
             // only fetch photo content if requested
-            if ($this->action == 'photo')
-                $record'photo' = $att'content' ? $att'content' : $this->storagefolder->get_attachment($record'uid', $att'id');
+            if ($this->action == 'photo') {
+                if (!empty($att'content')) {
+                    $record'photo' = $att'content';
+                }
+                else {
+                    $record'photo' = $this->storagefolder->get_attachment($record'uid', $att'id');
+                }
+            }
         }
 
         // truncate publickey value for display
-        if ($record'pgppublickey' && $this->action == 'show')
+        if (!empty($record'pgppublickey') && $this->action == 'show') {
             $record'pgppublickey' = substr($record'pgppublickey', 0, 140) . '...';
+        }
 
         // remove empty fields
         $record = array_filter($record);
@@ -1269,10 +1320,12 @@
      */
     private function _from_rcube_contact($contact, $old = array())
     {
-        if (!$contact'uid' && $contact'ID')
+        if (!$contact'uid' && $contact'ID') {
             $contact'uid' = $this->id2uid($contact'ID');
-        else if (!$contact'uid' && $old'uid')
+        }
+        else if (!$contact'uid' && $old'uid') {
             $contact'uid' = $old'uid';
+        }
 
         $contact'im' = array_filter($this->get_col_values('im', $contact, true));
 
@@ -1295,8 +1348,9 @@
             foreach ((array)$values as $adr) {
                 // skip empty address
                 $adr = array_filter($adr);
-                if (empty($adr))
+                if (empty($adr)) {
                     continue;
+                }
 
                 $addresses = array(
                     'type' => $type,
@@ -1318,8 +1372,9 @@
 
         // copy meta data (starting with _) from old object
         foreach ((array)$old as $key => $val) {
-            if (!isset($contact$key) && $key0 == '_')
+            if (!isset($contact$key) && $key0 == '_') {
                 $contact$key = $val;
+            }
         }
 
         // convert one-item-array elements into string element
@@ -1334,7 +1389,12 @@
         unset($contact'vcard');
 
         // add empty values for some fields which can be removed in the UI
-        return array_filter($contact) + array('nickname' => '', 'birthday' => '', 'anniversary' => '', 'freebusyurl' => '', 'photo' => $contact'photo');
+        return array_filter($contact) + array(
+                'nickname' => '',
+                'birthday' => '',
+                'anniversary' => '',
+                'freebusyurl' => '',
+                'photo' => $contact'photo'
+            );
     }
-
 }

iRony-0.4.5.tar.gz/lib/plugins/kolab_addressbook/localization/de.inc -> iRony-0.4.6.tar.gz/lib/plugins/kolab_addressbook/localization/de.inc Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_addressbook/localization/ko_KR.inc -> iRony-0.4.6.tar.gz/lib/plugins/kolab_addressbook/localization/ko_KR.inc Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_auth/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/kolab_auth/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_auth/kolab_auth.php -> iRony-0.4.6.tar.gz/lib/plugins/kolab_auth/kolab_auth.php Changed

@@ -433,13 +433,20 @@
             return $args;
         }
 
+        // Don't add the extra field on 2FA form
+        if (strpos($args'content', 'plugin.kolab-2fa-login')) {
+            return $args;
+        }
+
         $input = new html_inputfield(array('name' => '_loginas', 'id' => 'rcmloginas',
             'type' => 'text', 'autocomplete' => 'off'));
         $row = html::tag('tr', null,
             html::tag('td', 'title', html::label('rcmloginas', rcube::Q($this->gettext('loginas'))))
             . html::tag('td', 'input', $input->show(trim(rcube_utils::get_input_value('_loginas', rcube_utils::INPUT_POST))))
         );
-        $args'content' = preg_replace('/<\/tbody>/i', $row . '</tbody>', $args'content');
+        // add icon style for Elastic
+        $style = html::tag('style', , '#login-form .input-group .icon.loginas::before { content: "\f508"; } ');
+        $args'content' = preg_replace('/<\/tbody>/i', $row . '</tbody>' . $style, $args'content');
 
         return $args;
     }

iRony-0.4.5.tar.gz/lib/plugins/kolab_delegation/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/kolab_delegation/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_delegation/kolab_delegation.php -> iRony-0.4.6.tar.gz/lib/plugins/kolab_delegation/kolab_delegation.php Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_files/localization/ko_KR.inc -> iRony-0.4.6.tar.gz/lib/plugins/kolab_files/localization/ko_KR.inc Changed

iRony-0.4.5.tar.gz/lib/plugins/kolab_notes/localization/ko_KR.inc -> iRony-0.4.6.tar.gz/lib/plugins/kolab_notes/localization/ko_KR.inc Changed

iRony-0.4.6.tar.gz/lib/plugins/kolab_sso/localization/de.inc Added

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/lib/Horde_Date.php -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/lib/Horde_Date.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_itip.php -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_itip.php Changed

@@ -118,14 +118,15 @@
         // compose a list of all event attendees
         $attendees_list = array();
         foreach ((array)$event'attendees' as $attendee) {
-            $attendees_list = ($attendee'name' && $attendee'email') ?
+            $attendees_list = (!empty($attendee'name') && !empty($attendee'email')) ?
                 $attendee'name' . ' <' . $attendee'email' . '>' :
-                ($attendee'name' ? $attendee'name' : $attendee'email');
+                (!empty($attendee'name') ? $attendee'name' : $attendee'email');
         }
 
         $recurrence_info = '';
         if (!empty($event'recurrence_id')) {
-            $recurrence_info = "\n\n** " . $this->gettext($event'thisandfuture' ? 'itipmessagefutureoccurrence' : 'itipmessagesingleoccurrence') . ' **';
+            $msg = $this->gettext(!empty($event'thisandfuture') ? 'itipmessagefutureoccurrence' : 'itipmessagesingleoccurrence');
+            $recurrence_info = "\n\n** $msg **";
         }
         else if (!empty($event'recurrence')) {
             $recurrence_info = sprintf("\n%s: %s", $this->gettext('recurring'), $this->lib->recurrence_text($event'recurrence'));
@@ -139,7 +140,7 @@
                 'attendees'   => join(",\n ", $attendees_list),
                 'sender'      => $this->sender'name',
                 'organizer'   => $this->sender'name',
-                'description' => $event'description',
+                'description' => isset($event'description') ? $event'description' : '',
             )
         ));
 
@@ -243,8 +244,14 @@
         // set RSVP for every attendee
         else if ($method == 'REQUEST') {
             foreach ($event'attendees' as $i => $attendee) {
-                if (($rsvp || !isset($attendee'rsvp')) && ($attendee'status' != 'DELEGATED' && $attendee'role' != 'NON-PARTICIPANT')) {
-                    $event'attendees'$i'rsvp'= (bool)$rsvp;
+                if (
+                    ($rsvp || !isset($attendee'rsvp'))
+                    && (
+                        (empty($attendee'status') || $attendee'status' != 'DELEGATED')
+                        && $attendee'role' != 'NON-PARTICIPANT'
+                    )
+                ) {
+                    $event'attendees'$i'rsvp'= (bool) $rsvp;
                 }
             }
         }
@@ -293,7 +300,7 @@
         // attach ics file for this event
         $ical = libcalendaring::get_ical();
         $ics = $ical->export(array($event), $method, false, $method == 'REQUEST' && $this->plugin->driver ? array($this->plugin->driver, 'get_attachment_body') : false);
-        $filename = $event'_type' == 'task' ? 'todo.ics' : 'event.ics';
+        $filename = !empty($event'_type') && $event'_type' == 'task' ? 'todo.ics' : 'event.ics';
         $message->addAttachment($ics, 'text/calendar', $filename, false, '8bit', '', RCUBE_CHARSET . "; method=" . $method);
 
         return $message;
@@ -521,7 +528,7 @@
 
     protected function get_itip_diff($event, $existing)
     {
-        if (empty($event) || empty($existing) || empty($event'message_uid')) {
+        if (empty($event) || empty($existing) || empty($event'message_uid') || empty($event'mime_id')) {
             return;
         }
 
@@ -556,14 +563,14 @@
                     $attendee'status' = 'ACCEPTED'; // sometimes is not set for exceptions
                     $existing'attendees'$idx = $attendee;
                 }
-                $existing_attendees = $attendee'email'.$attendee'name';
+                $existing_attendees = $attendee'email' . (isset($attendee'name') ? $attendee'name' : '');
             }
             foreach ((array) $itip'attendees' as $idx => $attendee) {
-                if ($attendee'email' && ($_status = $statusstrtolower($attendee'email'))) {
-                    $attendee'status' = $_status;
+                if (!empty($attendee'email') && !empty($statusstrtolower($attendee'email'))) {
+                    $attendee'status' = $statusstrtolower($attendee'email');
                     $itip'attendees'$idx = $attendee;
                 }
-                $itip_attendees = $attendee'email'.$attendee'name';
+                $itip_attendees = $attendee'email' . (isset($attendee'name') ? $attendee'name' : '');
             }
 
             if ($itip_attendees != $existing_attendees) {
@@ -597,14 +604,16 @@
     public function mail_itip_inline_ui($event, $method, $mime_id, $task, $message_date = null, $preview_url = null)
     {
         $buttons = array();
-        $dom_id = asciiwords($event'uid', true);
-        $rsvp_status = 'unknown';
+        $dom_id  = asciiwords($event'uid', true);
+
+        $rsvp_status  = 'unknown';
+        $rsvp_buttons = '';
 
         // pass some metadata about the event and trigger the asynchronous status check
         $changed = is_object($event'changed') ? $event'changed' : $message_date;
         $metadata = array(
             'uid'      => $event'uid',
-            '_instance' => $event'_instance',
+            '_instance' => isset($event'_instance') ? $event'_instance' : null,
             'changed'  => $changed ? $changed->format('U') : 0,
             'sequence' => intval($event'sequence'),
             'method'   => $method,
@@ -744,7 +753,7 @@
             }
 
             // add itip reply message controls
-            $rsvp_buttons .= html::div('itip-reply-controls', $this->itip_rsvp_options_ui($dom_id, $metadata'nosave'));
+            $rsvp_buttons .= html::div('itip-reply-controls', $this->itip_rsvp_options_ui($dom_id, !empty($metadata'nosave')));
 
             $buttons = html::div(array('id' => 'rsvp-'.$dom_id, 'class' => 'rsvp-buttons', 'style' => 'display:none'), $rsvp_buttons);
             $buttons = html::div(array('id' => 'update-'.$dom_id, 'style' => 'display:none'), $update_button);
@@ -759,8 +768,8 @@
             $title = $this->gettext('itipcancellation');
             $event_prop = array_filter(array(
                 'uid'       => $event'uid',
-                '_instance' => $event'_instance',
-                '_savemode' => $event'_savemode',
+                '_instance' => isset($event'_instance') ? $event'_instance' : null,
+                '_savemode' => isset($event'_savemode') ? $event'_savemode' : null,
             ));
 
             // 1. remove the event from our calendar
@@ -786,7 +795,7 @@
         }
 
         // append generic import button
-        if ($import_button) {
+        if (!empty($import_button)) {
             $buttons = html::div(array('id' => 'import-'.$dom_id, 'style' => 'display:none'), $import_button);
         }
 
@@ -815,13 +824,16 @@
     {
         $attrib += array('type' => 'button');
 
-        if (!$actions)
+        if (!$actions) {
             $actions = $this->rsvp_actions;
+        }
+
+        $buttons = '';
 
         foreach ($actions as $method) {
             $buttons .= html::tag('input', array(
                 'type'  => $attrib'type',
-                'name'  => $attrib'iname',
+                'name'  => !empty($attrib'iname') ? $attrib'iname' : null,
                 'class' => 'button',
                 'rel'   => $method,
                 'value' => $this->gettext('itip' . $method),
@@ -923,7 +935,7 @@
             $table->add('label', $this->gettext('recurring'));
             $table->add('recurrence', $this->lib->recurrence_text($event'recurrence'));
         }
-        if ($location = trim($event'location')) {
+        if (isset($event'location') && ($location = trim($event'location'))) {
             $table->add('label', $this->gettext('location'));
             $table->add('location', rcube::Q($location));
         }
@@ -931,11 +943,11 @@
             $table->add('label', $this->gettext('sensitivity'));
             $table->add('sensitivity', ucfirst($this->gettext($sensitivity)) . '!');
         }
-        if ($event'status' == 'COMPLETED' || $event'status' == 'CANCELLED') {
+        if (!empty($event'status') && ($event'status' == 'COMPLETED' || $event'status' == 'CANCELLED')) {
             $table->add('label', $this->gettext('status'));
             $table->add('status', $this->gettext('status-' . strtolower($event'status')));
         }
-        if ($comment = trim($event'comment')) {
+        if (isset($event'comment') && ($comment = trim($event'comment'))) {
             $table->add('label', $this->gettext('comment'));
             $table->add('location', rcube::Q($comment));
         }

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_recurrence.php -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_recurrence.php Changed

@@ -61,15 +61,15 @@
 
         $this->set_start($start);
 
-        if (is_array($recurrence'EXDATE')) {
-            foreach ($recurrence'EXDATE' as $exdate) {
+        if (!empty($recurrence'EXDATE')) {
+            foreach ((array) $recurrence'EXDATE' as $exdate) {
                 if (is_a($exdate, 'DateTime')) {
                     $this->engine->addException($exdate->format('Y'), $exdate->format('n'), $exdate->format('j'));
                 }
             }
         }
-        if (is_array($recurrence'RDATE')) {
-            foreach ($recurrence'RDATE' as $rdate) {
+        if (!empty($recurrence'RDATE')) {
+            foreach ((array) $recurrence'RDATE' as $rdate) {
                 if (is_a($rdate, 'DateTime')) {
                     $this->engine->addRDate($rdate->format('Y'), $rdate->format('n'), $rdate->format('j'));
                 }
@@ -160,9 +160,10 @@
         $start      = clone $this->start;
         $orig_start = clone $this->start;
         $r          = $this->recurrence;
-        $interval   = intval($r'INTERVAL' ?: 1);
+        $interval   = !empty($r'INTERVAL') ? intval($r'INTERVAL') : 1;
+        $frequency  = isset($this->recurrence'FREQ') ? $this->recurrence'FREQ' : null;
 
-        switch ($this->recurrence'FREQ') {
+        switch ($frequency) {
         case 'WEEKLY':
             if (empty($this->recurrence'BYDAY')) {
                 return $start;
@@ -193,7 +194,7 @@
 
         $r = $this->recurrence;
         $r'INTERVAL' = $interval;
-        if ($r'COUNT') {
+        if (!empty($r'COUNT')) {
             // Increase count so we do not stop the loop to early
             $r'COUNT' += 100;
         }

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/libcalendaring.js -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/libcalendaring.js Changed

@@ -371,7 +371,7 @@
      */
     this.text2html = function(str, maxlen, maxlines)
     {
-        var html = Q(String(str));
+        var html = Q($.trim(String(str)));
 
         // limit visible text length
         if (maxlen) {
@@ -411,21 +411,35 @@
 
         // simple link parser (similar to rcube_string_replacer class in PHP)
         var utf_domain = '^?&@"\'/\$\$\\s\\r\\t\\n+\\.(^\x00-\x2f\x3b-\x40\x5b-\x60\x7b-\x7f{2,}|xn--a-z0-9{2,})';
-        var url1 = '.:;,', url2 = 'a-z0-9%=#@+?&/_~\\\\-';
+        var url1 = '.;,', url2 = 'a-z0-9%=:#@+?&/_~\\\\-';
         var link_pattern = new RegExp('(hft+ps?://)('+utf_domain+'('+url1+'?'+url2+'+)*)', 'ig');
         var mailto_pattern = new RegExp('(^\\s\\n\$\$;+@'+utf_domain+')', 'ig');
         var link_replace = function(matches, p1, p2) {
-          var title = '', text = p2;
+          var title = '', suffix = '';
+          if (p2 && p2.substr(-3) == '&gt') {
+            suffix = '&gt';
+            p2 = p2.substr(0, p2.length - 3);
+          }
+          var href = p1 + p2;
           if (p2 && p2.length > 55) {
-            text = p2.substr(0, 45) + '...' + p2.substr(-8);
             title = p1 + p2;
+            p2 = p2.substr(0, 45) + '...' + p2.substr(-8);
           }
-          return '<a href="'+p1+p2+'" class="extlink" target="_blank" title="'+title+'">'+p1+text+'</a>'
+
+          return '<a href="'+href+'" class="extlink" target="_blank" title="'+title+'">' + p1 + p2 + '</a>' + suffix
+        };
+
+        var mailto_replace = function(matches, p1, p2) {
+          // ignore links (created in link_replace() above
+          if (matches.match(/^(title|href)=/))
+            return matches;
+          else
+            return '<a href="mailto:' + p1 + '">' + p1 + '</a>';
         };
 
         return html
             .replace(link_pattern, link_replace)
-            .replace(mailto_pattern, '<a href="mailto:$1">$1</a>')
+            .replace(mailto_pattern, mailto_replace)
             .replace(/(mailto:)(^"+)"/g, '$1$2" onclick="rcmail.command(\'compose\', \'$2\');return false"')
             .replace(/\n/g, "<br/>");
     };

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/libcalendaring.php -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/libcalendaring.php Changed

@@ -40,23 +40,23 @@
     public $ical_message;
 
     public $defaults = array(
-      'calendar_date_format'  => "Y-m-d",
-      'calendar_date_short'   => "M-j",
-      'calendar_date_long'    => "F j Y",
-      'calendar_date_agenda'  => "l M-d",
-      'calendar_time_format'  => "H:m",
-      'calendar_first_day'    => 1,
-      'calendar_first_hour'   => 6,
-      'calendar_date_format_sets' => array(
-        'Y-m-d' => array('d M Y',   'm-d',  'l m-d'),
-        'Y/m/d' => array('d M Y',   'm/d',  'l m/d'),
-        'Y.m.d' => array('d M Y',   'm.d',  'l m.d'),
-        'd-m-Y' => array('d M Y',   'd-m',  'l d-m'),
-        'd/m/Y' => array('d M Y',   'd/m',  'l d/m'),
-        'd.m.Y' => array('d M Y',  'd.m',  'l d.m'),
-        'j.n.Y' => array('d M Y',  'd.m',  'l d.m'),
-        'm/d/Y' => array('M d Y',   'm/d',  'l m/d'),
-      ),
+        'calendar_date_format'  => "Y-m-d",
+        'calendar_date_short'   => "M-j",
+        'calendar_date_long'    => "F j Y",
+        'calendar_date_agenda'  => "l M-d",
+        'calendar_time_format'  => "H:m",
+        'calendar_first_day'    => 1,
+        'calendar_first_hour'   => 6,
+        'calendar_date_format_sets' => array(
+            'Y-m-d' => array('d M Y',   'm-d',  'l m-d'),
+            'Y/m/d' => array('d M Y',   'm/d',  'l m/d'),
+            'Y.m.d' => array('d M Y',   'm.d',  'l m.d'),
+            'd-m-Y' => array('d M Y',   'd-m',  'l d-m'),
+            'd/m/Y' => array('d M Y',   'd/m',  'l d/m'),
+            'd.m.Y' => array('d M Y',  'd.m',  'l d.m'),
+            'j.n.Y' => array('d M Y',  'd.m',  'l d.m'),
+            'm/d/Y' => array('M d Y',   'm/d',  'l m/d'),
+        ),
     );
 
     private static $instance;
@@ -187,19 +187,20 @@
      */
     public function adjust_timezone($dt, $dateonly = false)
     {
-        if (is_numeric($dt))
+        if (is_numeric($dt)) {
             $dt = new DateTime('@'.$dt);
-        else if (is_string($dt))
+        }
+        else if (is_string($dt)) {
             $dt = rcube_utils::anytodatetime($dt);
+        }
 
-        if ($dt instanceof DateTime && !($dt->_dateonly || $dateonly)) {
+        if ($dt instanceof DateTime && empty($dt->_dateonly) && !$dateonly) {
             $dt->setTimezone($this->timezone);
         }
 
         return $dt;
     }
 
-
     /**
      *
      */
@@ -289,11 +290,12 @@
      */
     public function event_date_text($event, $tzinfo = false)
     {
-        $fromto = '--';
+        $fromto  = '--';
+        $is_task = !empty($event'_type') && $event'_type' == 'task';
 
         // handle task objects
-        if ($event'_type' == 'task' && is_object($event'due')) {
-            $date_format = $event'due'->_dateonly ? self::to_php_date_format($this->rc->config->get('calendar_date_format', $this->defaults'calendar_date_format')) : null;
+        if ($is_task && !empty($event'due') && is_object($event'due')) {
+            $date_format = !empty($event'due'->_dateonly) ? self::to_php_date_format($this->rc->config->get('calendar_date_format', $this->defaults'calendar_date_format')) : null;
             $fromto = $this->rc->format_date($event'due', $date_format, false);
 
             // add timezone information
@@ -351,18 +353,21 @@
         $select_type    = new html_select(array('name' => 'alarmtype', 'class' => 'edit-alarm-type form-control', 'id' => $attrib'id'));
         $select_offset  = new html_select(array('name' => 'alarmoffset', 'class' => 'edit-alarm-offset form-control'));
         $select_related = new html_select(array('name' => 'alarmrelated', 'class' => 'edit-alarm-related form-control'));
-        $object_type    = $attrib'_type' ?: 'event';
+        $object_type    = !empty($attrib'_type') ? $attrib'_type' : 'event';
 
         $select_type->add($this->gettext('none'), '');
-        foreach ($alarm_types as $type)
+        foreach ($alarm_types as $type) {
             $select_type->add($this->gettext(strtolower("alarm{$type}option")), $type);
+        }
 
-        foreach (array('-M','-H','-D','+M','+H','+D') as $trigger)
+        foreach (array('-M','-H','-D','+M','+H','+D') as $trigger) {
             $select_offset->add($this->gettext('trigger' . $trigger), $trigger);
+        }
 
         $select_offset->add($this->gettext('trigger0'), '0');
-        if ($absolute_time)
+        if ($absolute_time) {
             $select_offset->add($this->gettext('trigger@'), '@');
+        }
 
         $select_related->add($this->gettext('relatedstart'), 'start');
         $select_related->add($this->gettext('relatedend' . $object_type), 'end');
@@ -399,7 +404,7 @@
         }
 
         // return cached result
-        if (is_array($_emails$user)) {
+        if (isset($_emails$user)) {
             return $_emails$user;
         }
 
@@ -548,13 +553,18 @@
      */
     public static function alarm_text($alarm)
     {
+        $related = null;
+
         if (is_string($alarm)) {
             list($trigger, $action) = explode(':', $alarm);
         }
         else {
             $trigger = $alarm'trigger';
             $action  = $alarm'action';
-            $related = $alarm'related';
+
+            if (!empty($alarm'related')) {
+                $related = $alarm'related';
+            }
         }
 
         $text  = '';
@@ -610,33 +620,45 @@
      */
     public static function get_next_alarm($rec, $type = 'event')
     {
-        if (!($rec'valarms' || $rec'alarms') || $rec'cancelled' || $rec'status' == 'CANCELLED')
+        if (
+            (empty($rec'valarms') && empty($rec'alarms'))
+            || !empty($rec'cancelled')
+            || (!empty($rec'status') && $rec'status' == 'CANCELLED')
+        ) {
             return null;
+        }
 
         if ($type == 'task') {
             $timezone = self::get_instance()->timezone;
-            if ($rec'startdate')
-                $rec'start' = new DateTime($rec'startdate' . ' ' . ($rec'starttime' ?: '12:00'), $timezone);
-            if ($rec'date')
-                $rec($rec'start' ? 'end' : 'start') = new DateTime($rec'date' . ' ' . ($rec'time' ?: '12:00'), $timezone);
+            if (!empty($rec'startdate')) {
+                $time = !empty($rec'starttime') ? $rec'starttime' : '12:00';
+                $rec'start' = new DateTime($rec'startdate' . ' ' . $time, $timezone);
+            }
+            if (!empty($rec'date')) {
+                $time = !empty($rec'time') ? $rec'time' : '12:00';
+                $rec!empty($rec'start') ? 'end' : 'start' = new DateTime($rec'date' . ' ' . $time, $timezone);
+            }
         }
 
-        if (!$rec'end')
+        if (empty($rec'end')) {
             $rec'end' = $rec'start';
+        }
 
         // support legacy format
-        if (!$rec'valarms') {
+        if (empty($rec'valarms')) {
             list($trigger, $action) = explode(':', $rec'alarms', 2);
             if ($alarm = self::parse_alarm_value($trigger)) {
                 $rec'valarms' = array(array('action' => $action, 'trigger' => $alarm3 ?: $alarm0));
             }
         }
 
-        $expires  = new DateTime('now - 12 hours');
-        $alarm_id = $rec'id';  // alarm ID eq. record ID by default to keep backwards compatibility
+        // alarm ID eq. record ID by default to keep backwards compatibility
+        $alarm_id   = isset($rec'id') ? $rec'id' : null;
+        $alarm_prop = null;
+        $expires    = new DateTime('now - 12 hours');
+        $notify_at  = null;
 
         // handle multiple alarms
-        $notify_at = null;
         foreach ($rec'valarms' as $alarm) {
             $notify_time = null;
 
@@ -644,11 +666,12 @@
                 $notify_time = $alarm'trigger';
             }
             else if (is_string($alarm'trigger')) {
-                $refdate = $alarm'related' == 'END' ? $rec'end' : $rec'start';
+                $refdate = !empty($alarm'related') && $alarm'related' == 'END' ? $rec'end' : $rec'start';
 
                 // abort if no reference date is available to compute notification time
-                if (!is_a($refdate, 'DateTime'))
+                if (!is_a($refdate, 'DateTime')) {
                     continue;
+                }
 
                 // TODO: for all-day events, take start @ 00:00 as reference date ?
 
@@ -666,19 +689,20 @@
 
             if ($notify_time && (!$notify_at || ($notify_time > $notify_at && $notify_time > $expires))) {
                 $notify_at  = $notify_time;
-                $action     = $alarm'action';
+                $action     = isset($alarm'action') ? $alarm'action' : null;
                 $alarm_prop = $alarm;
 
                 // generate a unique alarm ID if multiple alarms are set
                 if (count($rec'valarms') > 1) {
-                    $alarm_id = substr(md5($rec'id'), 0, 16) . '-' . $notify_at->format('Ymd\THis');
+                    $rec_id = substr(md5(isset($rec'id') ? $rec'id' : 'none'), 0, 16);
+                    $alarm_id = $rec_id . '-' . $notify_at->format('Ymd\THis');
                 }
             }
         }
 
         return !$notify_at ? null : array(
             'time'   => $notify_at->format('U'),
-            'action' => $action ? strtoupper($action) : 'DISPLAY',
+            'action' => !empty($action) ? strtoupper($action) : 'DISPLAY',
             'id'     => $alarm_id,
             'prop'   => $alarm_prop,
         );
@@ -716,10 +740,12 @@
         $data'ids' = explode(',', $data'id');
         $plugin = $this->rc->plugins->exec_hook('dismiss_alarms', $data);
 
-        if ($plugin'success')
+        if (!empty($plugin'success')) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
-        else
+        }
+        else {
             $this->rc->output->show_message('calendar.errorsaving', 'error');
+        }
     }
 
     /**
@@ -731,9 +757,9 @@
         foreach ($alarms as $alarm) {
             $out = array(
                 'id'       => $alarm'id',
-                'start'    => $alarm'start' ? $this->adjust_timezone($alarm'start')->format('c') : '',
-                'end'      => $alarm'end'   ? $this->adjust_timezone($alarm'end')->format('c') : '',
-                'allDay'   => $alarm'allday' == 1,
+                'start'    => !empty($alarm'start') ? $this->adjust_timezone($alarm'start')->format('c') : '',
+                'end'      => !empty($alarm'end')? $this->adjust_timezone($alarm'end')->format('c') : '',
+                'allDay'   => !empty($alarm'allday'),
                 'action'   => $alarm'action',
                 'title'    => $alarm'title',
                 'location' => $alarm'location',
@@ -786,12 +812,13 @@
             return rcmail::get_instance()->format_date($dt, $format);
         };
 
-        if (is_array($rrule'EXDATE') && !empty($rrule'EXDATE')) {
+        if (!empty($rrule'EXDATE') && is_array($rrule'EXDATE')) {
             $exdates = array_map($format_fn, $rrule'EXDATE');
         }
 
         if (empty($rrule'FREQ') && !empty($rrule'RDATE')) {
             $rdates = array_map($format_fn, $rrule'RDATE');
+            $more   = false;
 
             if (!empty($exdates)) {
                 $rdates = array_diff($rdates, $exdates);
@@ -802,8 +829,7 @@
                 $more   = true;
             }
 
-            return $this->gettext('ondate') . ' ' . join(', ', $rdates)
-                . ($more ? '...' : '');
+            return $this->gettext('ondate') . ' ' . join(', ', $rdates) . ($more ? '...' : '');
         }
 
         $output  = sprintf('%s %d ', $this->gettext('every'), $rrule'INTERVAL' ?: 1);
@@ -823,10 +849,10 @@
             break;
         }
 
-        if ($rrule'COUNT') {
+        if (!empty($rrule'COUNT')) {
             $until = $this->gettext(array('name' => 'forntimes', 'vars' => array('nr' => $rrule'COUNT')));
         }
-        else if ($rrule'UNTIL') {
+        else if (!empty($rrule'UNTIL')) {
             $until = $this->gettext('recurrencend') . ' ' . $this->rc->format_date($rrule'UNTIL', $format);
         }
         else {
@@ -836,13 +862,13 @@
         $output .= ', ' . $until;
 
         if (!empty($exdates)) {
+            $more = false;
             if (count($exdates) > $limit) {
                 $exdates = array_slice($exdates, 0, $limit);
                 $more    = true;
             }
 
-            $output  .= '; ' . $this->gettext('except') . ' ' . join(', ', $exdates)
-                . ($more ? '...' : '');
+            $output  .= '; ' . $this->gettext('except') . ' ' . join(', ', $exdates) . ($more ? '...' : '');
         }
 
         return $output;
@@ -1040,16 +1066,16 @@
      */
     public function to_client_recurrence($recurrence, $allday = false)
     {
-        if ($recurrence'UNTIL') {
+        if (!empty($recurrence'UNTIL')) {
             $recurrence'UNTIL' = $this->adjust_timezone($recurrence'UNTIL', $allday)->format('c');
         }
 
         // format RDATE values
-        if (is_array($recurrence'RDATE')) {
+        if (!empty($recurrence'RDATE')) {
             $libcal = $this;
             $recurrence'RDATE' = array_map(function($rdate) use ($libcal) {
                 return $libcal->adjust_timezone($rdate, true)->format('c');
-            }, $recurrence'RDATE');
+            }, (array) $recurrence'RDATE');
         }
 
         unset($recurrence'EXCEPTIONS');
@@ -1066,7 +1092,7 @@
             $recurrence'UNTIL' = new DateTime($recurrence'UNTIL', $this->timezone);
         }
 
-        if (is_array($recurrence) && is_array($recurrence'RDATE')) {
+        if (is_array($recurrence) && !empty($recurrence'RDATE')) {
             $tz = $this->timezone;
             $recurrence'RDATE' = array_map(function($rdate) use ($tz, $start) {
                 try {
@@ -1098,10 +1124,12 @@
         // check all message parts for .ics files
         foreach ((array)$this->ical_message->mime_parts as $part) {
             if (self::part_is_vcalendar($part, $this->ical_message)) {
-                if ($part->ctype_parameters'method')
+                if (!empty($part->ctype_parameters'method')) {
                     $itip_part = $part->mime_id;
-                else
+                }
+                else {
                     $this->ical_parts = $part->mime_id;
+                }
             }
         }
 
@@ -1179,7 +1207,7 @@
             $headers = $imap->get_message_headers($uid);
             $parser  = $this->get_ical();
 
-            if ($part->ctype_parameters'charset') {
+            if (!empty($part->ctype_parameters'charset')) {
                 $charset = $part->ctype_parameters'charset';
             }
 
@@ -1222,8 +1250,9 @@
             $level = explode('.', $part->mime_id);
 
             while (array_pop($level) !== null) {
-                $parent = $message->mime_partsjoin('.', $level) ?: 0;
-                if ($parent->mimetype == 'multipart/report') {
+                $id     = join('.', $level) ?: 0;
+                $parent = !empty($message->mime_parts$id) ? $message->mime_parts$id : null;
+                if ($parent && $parent->mimetype == 'multipart/report') {
                     return false;
                 }
             }
@@ -1232,7 +1261,7 @@
         return (
             in_array($part->mimetype, array('text/calendar', 'text/x-vcalendar', 'application/ics')) ||
             // Apple sends files as application/x-any (!?)
-            ($part->mimetype == 'application/x-any' && $part->filename && preg_match('/\.ics$/i', $part->filename))
+            ($part->mimetype == 'application/x-any' && !empty($part->filename) && preg_match('/\.ics$/i', $part->filename))
         );
     }
 
@@ -1272,7 +1301,7 @@
      */
     public static function recurrence_id_format($event)
     {
-        return $event'allday' ? 'Ymd' : 'Ymd\THis';
+        return !empty($event'allday') ? 'Ymd' : 'Ymd\THis';
     }
 
     /**
@@ -1285,13 +1314,13 @@
      */
     public static function recurrence_instance_identifier($event, $allday = null)
     {
-        $instance_date = $event'recurrence_date' ?: $event'start';
+        $instance_date = !empty($event'recurrence_date') ? $event'recurrence_date' : $event'start';
 
-        if ($instance_date && is_a($instance_date, 'DateTime')) {
+        if ($instance_date instanceof DateTime) {
             // According to RFC5545 (3.8.4.4) RECURRENCE-ID format should
             // be date/date-time depending on the main event type, not the exception
             if ($allday === null) {
-                $allday = $event'allday';
+                $allday = !empty($event'allday');
             }
 
             return $instance_date->format($allday ? 'Ymd' : 'Ymd\THis');
@@ -1427,8 +1456,9 @@
      */
     public static function to_rrule($recurrence, $allday = false)
     {
-        if (is_string($recurrence))
+        if (is_string($recurrence)) {
             return $recurrence;
+        }
 
         $rrule = '';
         foreach ((array)$recurrence as $k => $val) {
@@ -1437,7 +1467,7 @@
             case 'UNTIL':
                 // convert to UTC according to RFC 5545
                 if (is_a($val, 'DateTime')) {
-                    if (!$allday && !$val->_dateonly) {
+                    if (!$allday && empty($val->_dateonly)) {
                         $until = clone $val;
                         $until->setTimezone(new DateTimeZone('UTC'));
                         $val = $until->format('Ymd\THis\Z');
@@ -1450,8 +1480,9 @@
             case 'RDATE':
             case 'EXDATE':
                 foreach ((array)$val as $i => $ex) {
-                    if (is_a($ex, 'DateTime'))
+                    if (is_a($ex, 'DateTime')) {
                         $val$i = $ex->format('Ymd\THis');
+                    }
                 }
                 $val = join(',', (array)$val);
                 break;
@@ -1459,8 +1490,9 @@
                 continue 2;
             }
 
-            if (strlen($val))
+            if (strlen($val)) {
                 $rrule .= $k . '=' . $val . ';';
+            }
         }
 
         return rtrim($rrule, ';');
@@ -1528,5 +1560,4 @@
             'c' => '',
         ));
     }
-
 }

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/libvcalendar.php -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/libvcalendar.php Changed

@@ -326,10 +326,11 @@
                     $object = $this->_to_array($ve);
 
                     // temporarily store this as exception
-                    if ($object'recurrence_date') {
+                    if (!empty($object'recurrence_date')) {
                         $exceptions = $object;
                     }
-                    else if (!$seen$object'uid'++) {
+                    else if (empty($seen$object'uid')) {
+                        $seen$object'uid' = true;
                         $this->objects = $object;
                     }
                 }
@@ -343,7 +344,8 @@
                 $uid = $exception'uid';
 
                 // make this exception the master
-                if (!$seen$uid++) {
+                if (empty($seen$uid)) {
+                    $seen$uid = true;
                     $this->objects = $exception;
                 }
                 else {
@@ -412,7 +414,7 @@
         // We can skip these fields, they aren't critical
         foreach (array('CREATED' => 'created', 'LAST-MODIFIED' => 'changed', 'DTSTAMP' => 'changed') as $attr => $field) {
             try {
-                if (!$event$field && $ve->{$attr}) {
+                if (empty($event$field) && !empty($ve->{$attr})) {
                     $event$field = $ve->{$attr}->getDateTime();
                 }
             } catch (Exception $e) {}
@@ -461,15 +463,17 @@
                 break;
 
             case 'RRULE':
-                $params = is_array($event'recurrence') ? $event'recurrence' : array();
+                $params = !empty($event'recurrence') && is_array($event'recurrence') ? $event'recurrence' : array();
                 // parse recurrence rule attributes
                 foreach ($prop->getParts() as $k => $v) {
                     $paramsstrtoupper($k) = is_array($v) ? implode(',', $v) : $v;
                 }
-                if ($params'UNTIL')
+                if (!empty($params'UNTIL')) {
                     $params'UNTIL' = date_create($params'UNTIL');
-                if (!$params'INTERVAL')
+                }
+                if (empty($params'INTERVAL')) {
                     $params'INTERVAL' = 1;
+                }
 
                 $event'recurrence' = array_filter($params);
                 break;
@@ -477,14 +481,24 @@
             case 'EXDATE':
                 if (!empty($value)) {
                     $exdates = array_map(function($_) { return is_array($_) ? $_0 : $_; }, self::convert_datetime($prop, true));
-                    $event'recurrence''EXDATE' = array_merge((array)$event'recurrence''EXDATE', $exdates);
+                    if (!empty($event'recurrence''EXDATE')) {
+                        $event'recurrence''EXDATE' = array_merge($event'recurrence''EXDATE', $exdates);
+                    }
+                    else {
+                        $event'recurrence''EXDATE' = $exdates;
+                    }
                 }
                 break;
 
             case 'RDATE':
                 if (!empty($value)) {
                     $rdates = array_map(function($_) { return is_array($_) ? $_0 : $_; }, self::convert_datetime($prop, true));
-                    $event'recurrence''RDATE' = array_merge((array)$event'recurrence''RDATE', $rdates);
+                    if (!empty($event'recurrence''RDATE')) {
+                        $event'recurrence''RDATE' = array_merge($event'recurrence''RDATE', $rdates);
+                    }
+                    else {
+                        $event'recurrence''RDATE' = $rdates;
+                    }
                 }
                 break;
 
@@ -519,7 +533,12 @@
 
             case 'CATEGORY':
             case 'CATEGORIES':
-                $event'categories' = array_merge((array)$event'categories', $prop->getParts());
+                if (!empty($event'categories')) {
+                    $event'categories' = array_merge((array) $event'categories', $prop->getParts());
+                }
+                else {
+                    $event'categories' = $prop->getParts();
+                }
                 break;
 
             case 'CLASS':
@@ -528,10 +547,12 @@
                 break;
 
             case 'X-MICROSOFT-CDO-BUSYSTATUS':
-                if ($value == 'OOF')
+                if ($value == 'OOF') {
                     $event'free_busy' = 'outofoffice';
-                else if (in_array($value, array('FREE', 'BUSY', 'TENTATIVE')))
+                }
+                else if (in_array($value, array('FREE', 'BUSY', 'TENTATIVE'))) {
                     $event'free_busy' = strtolower($value);
+                }
                 break;
 
             case 'ATTENDEE':
@@ -556,7 +577,7 @@
                         $schedule_agent = $attendee'schedule-agent';
                     }
                 }
-                else if ($attendee'email' != $event'organizer''email') {
+                else if (empty($event'organizer') || $attendee'email' != $event'organizer''email') {
                     $event'attendees' = $attendee;
                 }
                 break;
@@ -596,12 +617,7 @@
 
         // validate event dates
         if ($event'_type' == 'event') {
-            $event'allday' = false;
-
-            // check for all-day dates
-            if ($event'start'->_dateonly) {
-                $event'allday' = true;
-            }
+            $event'allday' = !empty($event'start'->_dateonly);
 
             // events may lack the DTEND property, set it to DTSTART (RFC5545 3.6.1)
             if (empty($event'end')) {
@@ -647,11 +663,12 @@
                         $trigger = $values2;
                     }
 
-                    if (!$alarm'trigger') {
+                    if (empty($alarm'trigger')) {
                         $alarm'trigger' = rtrim(preg_replace('/(A-Z)0WDHMS/', '\\1', $value), 'T');
                         // if all 0-values have been stripped, assume 'at time'
-                        if ($alarm'trigger' == 'P')
+                        if ($alarm'trigger' == 'P') {
                             $alarm'trigger' = 'PT0S';
+                        }
                     }
                     break;
 
@@ -684,23 +701,26 @@
             }
 
             if ($action != 'NONE') {
-                if ($trigger && !$event'alarms') // store first alarm in legacy property
+                // store first alarm in legacy property
+                if ($trigger && empty($event'alarms')) {
                     $event'alarms' = $trigger . ':' . $action;
+                }
 
-                if ($alarm'trigger')
+                if (!empty($alarm'trigger')) {
                     $event'valarms' = $alarm;
+                }
             }
         }
 
         // assign current timezone to event start/end
-        if ($event'start' instanceof DateTime) {
+        if (!empty($event'start') && $event'start' instanceof DateTime) {
             $this->_apply_timezone($event'start');
         }
         else {
             unset($event'start');
         }
 
-        if ($event'end' instanceof DateTime) {
+        if (!empty($event'end') && $event'end' instanceof DateTime) {
             $this->_apply_timezone($event'end');
         }
         else {
@@ -708,7 +728,7 @@
         }
 
         // some iTip CANCEL messages only contain the start date
-        if (!$event'end' && $event'start' && $this->method == 'CANCEL') {
+        if (empty($event'end') && !empty($event'start') && $this->method == 'CANCEL') {
             $event'end' = clone $event'start';
         }
 
@@ -736,7 +756,7 @@
         }
 
         // For date-only we'll keep the date and time intact
-        if ($date->_dateonly) {
+        if (!empty($date->_dateonly)) {
             $dt = new DateTime(null, $this->timezone);
             $dt->setDate($date->format('Y'), $date->format('n'), $date->format('j'));
             $dt->setTime($date->format('G'), $date->format('i'), 0);
@@ -767,7 +787,13 @@
             case 'DTSTAMP':
             case 'DTSTART':
             case 'DTEND':
-                $propmap = array('DTSTART' => 'start', 'DTEND' => 'end', 'CREATED' => 'created', 'LAST-MODIFIED' => 'changed', 'DTSTAMP' => 'changed');
+                $propmap = array(
+                    'DTSTART' => 'start',
+                    'DTEND' => 'end',
+                    'CREATED' => 'created',
+                    'LAST-MODIFIED' => 'changed',
+                    'DTSTAMP' => 'changed'
+                );
                 $this->freebusy$propmap$prop->name = self::convert_datetime($prop);
                 break;
 
@@ -781,8 +807,11 @@
                 $fbtype = strval($prop'FBTYPE') ?: 'BUSY';
 
                 // skip dupes
-                if ($seen$value.':'.$fbtype++)
+                if (!empty($seen$value.':'.$fbtype)) {
                     break;
+                }
+
+                $seen$value.':'.$fbtype = true;
 
                 foreach ($periods as $period) {
                     // Every period is formatted as start/end. The start is an
@@ -905,7 +934,7 @@
         else {
             $is_utc = ($tz = $dt->getTimezone()) && in_array($tz->getName(), array('UTC','GMT','Z'));
         }
-        $is_dateonly = $dateonly === null ? (bool)$dt->_dateonly : (bool)$dateonly;
+        $is_dateonly = $dateonly === null ? !empty($dt->_dateonly) : (bool) $dateonly;
         $vdt = $cal->createProperty($name, $dt, null, $is_dateonly ? 'DATE' : 'DATE-TIME');
 
         if ($is_dateonly) {
@@ -918,7 +947,7 @@
         // register timezone for VTIMEZONE block
         if (!$is_utc && !$dateonly && $tz && ($tzname = $tz->getName())) {
             $ts = $dt->format('U');
-            if (is_array($this->vtimezones$tzname)) {
+            if (!empty($this->vtimezones$tzname)) {
                 $this->vtimezones$tzname0 = min($this->vtimezones$tzname0, $ts);
                 $this->vtimezones$tzname1 = max($this->vtimezones$tzname1, $ts);
             }
@@ -1025,7 +1054,7 @@
      */
     private function _to_ical($event, $vcal, $get_attachment, $recurrence_id = null)
     {
-        $type = $event'_type' ?: 'event';
+        $type = !empty($event'_type') ? $event'_type' : 'event';
 
         $cal = $vcal ?: new VObject\Component\VCalendar();
         $ve = $cal->create($this->type_component_map$type);
@@ -1036,27 +1065,33 @@
         $ve->DTSTAMP = $this->datetime_prop($cal, 'DTSTAMP', $dtstamp, true);
 
         // all-day events end the next day
-        if ($event'allday' && !empty($event'end')) {
+        if (!empty($event'allday') && !empty($event'end')) {
             $event'end' = clone $event'end';
             $event'end'->add(new \DateInterval('P1D'));
             $event'end'->_dateonly = true;
         }
-        if (!empty($event'created'))
+        if (!empty($event'created')) {
             $ve->add($this->datetime_prop($cal, 'CREATED', $event'created', true));
-        if (!empty($event'changed'))
+        }
+        if (!empty($event'changed')) {
             $ve->add($this->datetime_prop($cal, 'LAST-MODIFIED', $event'changed', true));
-        if (!empty($event'start'))
-            $ve->add($this->datetime_prop($cal, 'DTSTART', $event'start', false, (bool)$event'allday'));
-        if (!empty($event'end'))
-            $ve->add($this->datetime_prop($cal, 'DTEND',   $event'end', false, (bool)$event'allday'));
-        if (!empty($event'due'))
-            $ve->add($this->datetime_prop($cal, 'DUE',   $event'due', false));
+        }
+        if (!empty($event'start')) {
+            $ve->add($this->datetime_prop($cal, 'DTSTART', $event'start', false, !empty($event'allday')));
+        }
+        if (!empty($event'end')) {
+            $ve->add($this->datetime_prop($cal, 'DTEND', $event'end', false, !empty($event'allday')));
+        }
+        if (!empty($event'due')) {
+            $ve->add($this->datetime_prop($cal, 'DUE', $event'due', false));
+        }
 
         // we're exporting a recurrence instance only
-        if (!$recurrence_id && $event'recurrence_date' && $event'recurrence_date' instanceof DateTime) {
-            $recurrence_id = $this->datetime_prop($cal, 'RECURRENCE-ID', $event'recurrence_date', false, (bool)$event'allday');
-            if ($event'thisandfuture')
+        if (!$recurrence_id && !empty($event'recurrence_date') && $event'recurrence_date' instanceof DateTime) {
+            $recurrence_id = $this->datetime_prop($cal, 'RECURRENCE-ID', $event'recurrence_date', false, !empty($event'allday'));
+            if (!empty($event'thisandfuture')) {
                 $recurrence_id->add('RANGE', 'THISANDFUTURE');
+            }
         }
 
         if ($recurrence_id) {
@@ -1065,15 +1100,18 @@
 
         $ve->add('SUMMARY', $event'title');
 
-        if ($event'location')
+        if (!empty($event'location')) {
             $ve->add($this->is_apple() ? new vobject_location_property($cal, 'LOCATION', $event'location') : $cal->create('LOCATION', $event'location'));
-        if ($event'description')
+        }
+        if (!empty($event'description')) {
             $ve->add('DESCRIPTION', strtr($event'description', array("\r\n" => "\n", "\r" => "\n"))); // normalize line endings
+        }
 
-        if (isset($event'sequence'))
+        if (isset($event'sequence')) {
             $ve->add('SEQUENCE', $event'sequence');
+        }
 
-        if ($event'recurrence' && !$recurrence_id) {
+        if (!empty($event'recurrence') && !$recurrence_id) {
             $exdates = $rdates = null;
             if (isset($event'recurrence''EXDATE')) {
                 $exdates = $event'recurrence''EXDATE';
@@ -1084,8 +1122,8 @@
                 unset($event'recurrence''RDATE');  // don't serialize RDATEs into RRULE value
             }
 
-            if ($event'recurrence''FREQ') {
-                $ve->add('RRULE', libcalendaring::to_rrule($event'recurrence', (bool)$event'allday'));
+            if (!empty($event'recurrence''FREQ')) {
+                $ve->add('RRULE', libcalendaring::to_rrule($event'recurrence', !empty($event'allday')));
             }
 
             // add EXDATEs each one per line (for Thunderbird Lightning)
@@ -1104,7 +1142,7 @@
             }
         }
 
-        if ($event'categories') {
+        if (!empty($event'categories')) {
             $cat = $cal->create('CATEGORIES');
             $cat->setParts((array)$event'categories');
             $ve->add($cat);
@@ -1119,17 +1157,22 @@
             }
         }
 
-        if ($event'priority')
-          $ve->add('PRIORITY', $event'priority');
+        if (!empty($event'priority')) {
+            $ve->add('PRIORITY', $event'priority');
+        }
 
-        if ($event'cancelled')
+        if (!empty($event'cancelled')) {
             $ve->add('STATUS', 'CANCELLED');
-        else if ($event'free_busy' == 'tentative')
+        }
+        else if (!empty($event'free_busy') && $event'free_busy' == 'tentative') {
             $ve->add('STATUS', 'TENTATIVE');
-        else if ($event'complete' == 100)
+        }
+        else if (!empty($event'complete') && $event'complete' == 100) {
             $ve->add('STATUS', 'COMPLETED');
-        else if (!empty($event'status'))
+        }
+        else if (!empty($event'status')) {
             $ve->add('STATUS', $event'status');
+        }
 
         if (!empty($event'sensitivity'))
             $ve->add('CLASS', strtoupper($event'sensitivity'));
@@ -1139,11 +1182,15 @@
         }
 
         // Apple iCal and BusyCal required the COMPLETED date to be set in order to consider a task complete
-        if ($event'status' == 'COMPLETED' || $event'complete' == 100) {
-            $ve->add($this->datetime_prop($cal, 'COMPLETED', $event'changed' ?: new DateTime('now - 1 hour'), true));
+        if (
+            (!empty($event'status') && $event'status' == 'COMPLETED')
+            || (!empty($event'complete') && $event'complete' == 100)
+        ) {
+            $completed = !empty($event'changed') ? $event'changed' : new DateTime('now - 1 hour');
+            $ve->add($this->datetime_prop($cal, 'COMPLETED', $completed, true));
         }
 
-        if ($event'valarms') {
+        if (!empty($event'valarms')) {
             foreach ($event'valarms' as $alarm) {
                 $va = $cal->createComponent('VALARM');
                 $va->action = $alarm'action';
@@ -1152,85 +1199,96 @@
                 }
                 else {
                     $alarm_props = array();
-                    if (strtoupper($alarm'related') == 'END') {
+                    if (!empty($alarm'related') && strtoupper($alarm'related') == 'END') {
                         $alarm_props'RELATED' = 'END';
                     }
                     $va->add('TRIGGER', $alarm'trigger', $alarm_props);
                 }
 
-                if ($alarm'action' == 'EMAIL') {
-                    foreach ((array)$alarm'attendees' as $attendee) {
-                        $va->add('ATTENDEE', 'mailto:' . $attendee);
+                if (!empty($alarm'action') && $alarm'action' == 'EMAIL') {
+                    if (!empty($alarm'attendees')) {
+                        foreach ((array) $alarm'attendees' as $attendee) {
+                            $va->add('ATTENDEE', 'mailto:' . $attendee);
+                        }
                     }
                 }
-                if ($alarm'description') {
-                    $va->add('DESCRIPTION', $alarm'description' ?: $event'title');
+                if (!empty($alarm'description')) {
+                    $va->add('DESCRIPTION', $alarm'description');
                 }
-                if ($alarm'summary') {
+                if (!empty($alarm'summary')) {
                     $va->add('SUMMARY', $alarm'summary');
                 }
-                if ($alarm'duration') {
+                if (!empty($alarm'duration')) {
                     $va->add('DURATION', $alarm'duration');
-                    $va->add('REPEAT', intval($alarm'repeat'));
+                    $va->add('REPEAT', !empty($alarm'repeat') ? intval($alarm'repeat') : 0);
                 }
-                if ($alarm'uri') {
+                if (!empty($alarm'uri')) {
                     $va->add('ATTACH', $alarm'uri', array('VALUE' => 'URI'));
                 }
                 $ve->add($va);
             }
         }
         // legacy support
-        else if ($event'alarms') {
+        else if (!empty($event'alarms')) {
             $va = $cal->createComponent('VALARM');
             list($trigger, $va->action) = explode(':', $event'alarms');
             $val = libcalendaring::parse_alarm_value($trigger);
-            if ($val3)
+            if (!empty($val3)) {
                 $va->add('TRIGGER', $val3);
-            else if ($val0 instanceof DateTime)
+            }
+            else if ($val0 instanceof DateTime) {
                 $va->add($this->datetime_prop($cal, 'TRIGGER', $val0, true, null, true));
+            }
             $ve->add($va);
         }
 
         // Find SCHEDULE-AGENT
-        foreach ((array)$event'x-custom' as $prop) {
-            if ($prop0 === 'SCHEDULE-AGENT') {
-                $schedule_agent = $prop1;
+        if (!empty($event'x-custom')) {
+            foreach ((array) $event'x-custom' as $prop) {
+                if ($prop0 === 'SCHEDULE-AGENT') {
+                    $schedule_agent = $prop1;
+                }
             }
         }
 
-        foreach ((array)$event'attendees' as $attendee) {
-            if ($attendee'role' == 'ORGANIZER') {
-                if (empty($event'organizer'))
-                    $event'organizer' = $attendee;
-            }
-            else if (!empty($attendee'email')) {
-                if (isset($attendee'rsvp'))
-                    $attendee'rsvp' = $attendee'rsvp' ? 'TRUE' : null;
+        if (!empty($event'attendees')) {
+            foreach ((array) $event'attendees' as $attendee) {
+                if ($attendee'role' == 'ORGANIZER') {
+                    if (empty($event'organizer'))
+                        $event'organizer' = $attendee;
+                }
+                else if (!empty($attendee'email')) {
+                    if (isset($attendee'rsvp')) {
+                        $attendee'rsvp' = $attendee'rsvp' ? 'TRUE' : null;
+                    }
 
-                $mailto   = $attendee'email';
-                $attendee = array_filter(self::map_keys($attendee, $this->attendee_keymap));
+                    $mailto   = $attendee'email';
+                    $attendee = array_filter(self::map_keys($attendee, $this->attendee_keymap));
 
-                if ($schedule_agent !== null && !isset($attendee'SCHEDULE-AGENT')) {
-                    $attendee'SCHEDULE-AGENT' = $schedule_agent;
-                }
+                    if (isset($schedule_agent) && !isset($attendee'SCHEDULE-AGENT')) {
+                        $attendee'SCHEDULE-AGENT' = $schedule_agent;
+                    }
 
-                $ve->add('ATTENDEE', 'mailto:' . $mailto, $attendee);
+                    $ve->add('ATTENDEE', 'mailto:' . $mailto, $attendee);
+                }
             }
         }
 
-        if ($event'organizer') {
+        if (!empty($event'organizer')) {
             $organizer = array_filter(self::map_keys($event'organizer', $this->organizer_keymap));
 
-            if ($schedule_agent !== null && !isset($organizer'SCHEDULE-AGENT')) {
+            if (isset($schedule_agent) && !isset($organizer'SCHEDULE-AGENT')) {
                 $organizer'SCHEDULE-AGENT' = $schedule_agent;
             }
 
             $ve->add('ORGANIZER', 'mailto:' . $event'organizer''email', $organizer);
         }
 
-        foreach ((array)$event'url' as $url) {
-            if (!empty($url)) {
-                $ve->add('URL', $url);
+        if (!empty($event'url')) {
+            foreach ((array) $event'url' as $url) {
+                if (!empty($url)) {
+                    $ve->add('URL', $url);
+                }
             }
         }
 
@@ -1238,8 +1296,9 @@
             $ve->add('RELATED-TO', $event'parent_id', array('RELTYPE' => 'PARENT'));
         }
 
-        if ($event'comment')
+        if (!empty($event'comment')) {
             $ve->add('COMMENT', $event'comment');
+        }
 
         $memory_limit = parse_bytes(ini_get('memory_limit'));
 
@@ -1273,13 +1332,17 @@
             }
         }
 
-        foreach ((array)$event'links' as $uri) {
-            $ve->add('ATTACH', $uri);
+        if (!empty($event'links')) {
+            foreach ((array) $event'links' as $uri) {
+                $ve->add('ATTACH', $uri);
+            }
         }
 
         // add custom properties
-        foreach ((array)$event'x-custom' as $prop) {
-            $ve->add($prop0, $prop1);
+        if (!empty($event'x-custom')) {
+            foreach ((array) $event'x-custom' as $prop) {
+                $ve->add($prop0, $prop1);
+            }
         }
 
         // append to vcalendar container
@@ -1291,12 +1354,13 @@
         }
 
         // append recurrence exceptions
-        if (is_array($event'recurrence') && $event'recurrence''EXCEPTIONS') {
+        if (!empty($event'recurrence') && !empty($event'recurrence''EXCEPTIONS')) {
             foreach ($event'recurrence''EXCEPTIONS' as $ex) {
-                $exdate = $ex'recurrence_date' ?: $ex'start';
-                $recurrence_id = $this->datetime_prop($cal, 'RECURRENCE-ID', $exdate, false, (bool)$event'allday');
-                if ($ex'thisandfuture')
+                $exdate = !empty($ex'recurrence_date') ? $ex'recurrence_date' : $ex'start';
+                $recurrence_id = $this->datetime_prop($cal, 'RECURRENCE-ID', $exdate, false, !empty($event'allday'));
+                if (!empty($ex'thisandfuture')) {
                     $recurrence_id->add('RANGE', 'THISANDFUTURE');
+                }
                 $this->_to_ical($ex, $vcal, $get_attachment, $recurrence_id);
             }
         }
@@ -1334,7 +1398,7 @@
             $tz = $tzid;
         }
 
-        if (!is_a($tz, '\\DateTimeZone')) {
+        if (empty($tz) || !is_a($tz, '\\DateTimeZone')) {
             return false;
         }
 
@@ -1409,33 +1473,38 @@
 
     /*** Implement PHP 5 Iterator interface to make foreach work ***/
 
+    #\ReturnTypeWillChange
     function current()
     {
         return $this->objects$this->iteratorkey;
     }
 
+    #\ReturnTypeWillChange
     function key()
     {
         return $this->iteratorkey;
     }
 
+    #\ReturnTypeWillChange
     function next()
     {
         $this->iteratorkey++;
 
         // read next chunk if we're reading from a file
-        if (!$this->objects$this->iteratorkey && $this->fp) {
+        if (empty($this->objects$this->iteratorkey) && $this->fp) {
             $this->_parse_next(true);
         }
 
         return $this->valid();
     }
 
+    #\ReturnTypeWillChange
     function rewind()
     {
         $this->iteratorkey = 0;
     }
 
+    #\ReturnTypeWillChange
     function valid()
     {
         return !empty($this->objects$this->iteratorkey);

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/tests/libcalendaring.php -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/tests/libcalendaring.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libcalendaring/tests/libvcalendar.php -> iRony-0.4.6.tar.gz/lib/plugins/libcalendaring/tests/libvcalendar.php Changed

@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-class libvcalendar_test extends PHPUnit_Framework_TestCase
+class libvcalendar_test extends PHPUnit\Framework\TestCase
 {
     function setUp()
     {
@@ -209,7 +209,7 @@
         $this->assertEquals('-PT30M', $alarm3, "Unified alarm string (stripped zero-values)");
 
         $this->assertEquals('DISPLAY', $event'valarms'0'action',  "First alarm action");
-        $this->assertEquals('', $event'valarms'0'related',  "First alarm related property");
+        $this->assertTrue(empty($event'valarms'0'related'),  "First alarm related property");
         $this->assertEquals('This is the first event reminder', $event'valarms'0'description',  "First alarm text");
 
         $this->assertEquals(3, count($event'valarms'), "List all VALARM blocks");
@@ -553,7 +553,7 @@
         $this->assertEquals('4', $vtz->{'X-MICROSOFT-CDO-TZID'});
 
         // check for transition to daylight saving time which is BEFORE the given date
-        $dst = reset($vtz->select('DAYLIGHT'));
+        $dst = array_first($vtz->select('DAYLIGHT'));
         $this->assertEquals('DAYLIGHT', $dst->name);
         $this->assertEquals('20140330T010000', $dst->DTSTART);
         $this->assertEquals('+0100', $dst->TZOFFSETFROM);
@@ -561,7 +561,8 @@
         $this->assertEquals('CEST', $dst->TZNAME);
 
         // check (last) transition to standard time which is AFTER the given date
-        $std = end($vtz->select('STANDARD'));
+        $std = $vtz->select('STANDARD');
+        $std = end($std);
         $this->assertEquals('STANDARD', $std->name);
         $this->assertEquals('20141026T010000', $std->DTSTART);
         $this->assertEquals('+0200', $std->TZOFFSETFROM);

iRony-0.4.5.tar.gz/lib/plugins/libkolab/README -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/README Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/SQL/mysql.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/SQL/mysql.initial.sql Changed

@@ -1,12 +1,11 @@
 /**
  * libkolab database schema
  *
- * @version 1.2
  * @author Thomas Bruederli
  * @licence GNU AGPL
- **/
+ */
 
-/*!40014  SET FOREIGN_KEY_CHECKS=0 */;
+SET FOREIGN_KEY_CHECKS=0;
 
 DROP TABLE IF EXISTS `kolab_folders`;
 
@@ -20,7 +19,7 @@
   `objectcount` BIGINT DEFAULT NULL,
   PRIMARY KEY(`folder_id`),
   INDEX `resource_type` (`resource`, `type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache`;
 
@@ -45,7 +44,7 @@
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `contact_type` (`folder_id`,`type`),
   INDEX `contact_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_event`;
 
@@ -64,7 +63,7 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `event_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_task`;
 
@@ -83,7 +82,7 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `task_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_journal`;
 
@@ -102,7 +101,7 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `journal_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_note`;
 
@@ -119,7 +118,7 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `note_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_file`;
 
@@ -138,7 +137,7 @@
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `folder_filename` (`folder_id`, `filename`),
   INDEX `file_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_configuration`;
 
@@ -157,7 +156,7 @@
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `configuration_type` (`folder_id`,`type`),
   INDEX `configuration_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_freebusy`;
 
@@ -176,8 +175,8 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `freebusy_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-/*!40014  SET FOREIGN_KEY_CHECKS=1 */;
+SET FOREIGN_KEY_CHECKS=1;
 
-REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2019092900');
+REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2021101100');

iRony-0.4.6.tar.gz/lib/plugins/libkolab/SQL/mysql/2021101100.sql Added

@@ -0,0 +1,46 @@
+-- changing table format and dropping foreign keys is needed for some versions of MySQL
+ALTER TABLE `kolab_cache_contact` DROP FOREIGN KEY `fk_kolab_cache_contact_folder`;
+ALTER TABLE `kolab_cache_event` DROP FOREIGN KEY`fk_kolab_cache_event_folder`;
+ALTER TABLE `kolab_cache_task` DROP FOREIGN KEY`fk_kolab_cache_task_folder`;
+ALTER TABLE `kolab_cache_journal` DROP FOREIGN KEY`fk_kolab_cache_journal_folder`;
+ALTER TABLE `kolab_cache_note` DROP FOREIGN KEY`fk_kolab_cache_note_folder`;
+ALTER TABLE `kolab_cache_file` DROP FOREIGN KEY`fk_kolab_cache_file_folder`;
+ALTER TABLE `kolab_cache_configuration` DROP FOREIGN KEY`fk_kolab_cache_configuration_folder`;
+ALTER TABLE `kolab_cache_freebusy` DROP FOREIGN KEY`fk_kolab_cache_freebusy_folder`;
+
+ALTER TABLE `kolab_folders` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `kolab_cache_contact` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `kolab_cache_event` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `kolab_cache_task` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `kolab_cache_journal` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `kolab_cache_note` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `kolab_cache_file` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `kolab_cache_configuration` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `kolab_cache_freebusy` ROW_FORMAT=DYNAMIC;
+
+ALTER TABLE `kolab_folders` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `kolab_cache_contact` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `kolab_cache_event` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `kolab_cache_task` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `kolab_cache_journal` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `kolab_cache_note` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `kolab_cache_file` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `kolab_cache_configuration` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `kolab_cache_freebusy` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+ALTER TABLE `kolab_cache_contact` ADD CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `kolab_cache_event` ADD CONSTRAINT `fk_kolab_cache_event_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `kolab_cache_task` ADD CONSTRAINT `fk_kolab_cache_task_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `kolab_cache_journal` ADD CONSTRAINT `fk_kolab_cache_journal_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `kolab_cache_note` ADD CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `kolab_cache_file` ADD CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `kolab_cache_configuration` ADD CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `kolab_cache_freebusy` ADD CONSTRAINT `fk_kolab_cache_freebusy_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE;

iRony-0.4.5.tar.gz/lib/plugins/libkolab/SQL/oracle.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/SQL/oracle.initial.sql Changed

iRony-0.4.6.tar.gz/lib/plugins/libkolab/SQL/oracle/2021101100.sql Added

iRony-0.4.5.tar.gz/lib/plugins/libkolab/SQL/sqlite.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/SQL/sqlite.initial.sql Changed

iRony-0.4.6.tar.gz/lib/plugins/libkolab/SQL/sqlite/2021101100.sql Added

iRony-0.4.5.tar.gz/lib/plugins/libkolab/bin/modcache.sh -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/bin/modcache.sh Changed

@@ -201,7 +201,7 @@
 
     // prompt for password
     if (empty($opts'password') && ($opts'username' || $opts'user')) {
-        $opts'password' = prompt_silent("Password: ");
+        $opts'password' = rcube_utils::prompt_silent("Password: ");
     }
 
     // simulate "login as" feature
@@ -210,9 +210,22 @@
     else if (empty($opts'user'))
         $opts'user' = $opts'username';
 
+    // parse $host URL
+    $url = parse_url(trim($opts'host'));
+    if (!empty($url'host')) {
+        $imap_host = $url'host';
+        $imap_ssl  = isset($url'scheme') && in_array($url'scheme', array('ssl','imaps','tls')) ? $url'scheme' : false;
+        $imap_port = isset($url'port') ? $url'port' : ($imap_ssl && $imap_ssl != 'tls' ? 993 : 143);
+    }
+    else {
+        $imap_host = trim($opts'host');
+        $imap_port = 143;
+        $imap_ssl  = false;
+    }
+
     // let the kolab_auth plugin do its magic
     $auth = $rcmail->plugins->exec_hook('authenticate', array(
-        'host' => trim($opts'host'),
+        'host' => $imap_host,
         'user' => trim($opts'user'),
         'pass' => $opts'password',
         'cookiecheck' => false,
@@ -221,7 +234,7 @@
 
     if ($auth'valid') {
         $storage = $rcmail->get_storage();
-        if ($storage->connect($auth'host', $auth'user', $auth'pass', 143, false)) {
+        if ($storage->connect($imap_host, $auth'user', $auth'pass', $imap_port, $imap_ssl)) {
             if ($opts'verbose')
                 echo "IMAP login succeeded.\n";
             if (($user = rcube_user::query($opts'username', $auth'host')) && $user->ID)

iRony-0.4.5.tar.gz/lib/plugins/libkolab/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/config.inc.php.dist -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/config.inc.php.dist Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/lib/kolab_attachments_handler.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/lib/kolab_attachments_handler.php Changed

@@ -48,7 +48,7 @@
      */
     public function files_list($attrib = array())
     {
-        if (!$attrib'id') {
+        if (empty($attrib'id')) {
             $attrib'id' = 'kolabattachmentlist';
         }
 
@@ -67,7 +67,7 @@
     public function files_form($attrib = array())
     {
         // add ID if not given
-        if (!$attrib'id') {
+        if (empty($attrib'id')) {
             $attrib'id' = 'kolabuploadform';
         }
 
@@ -80,7 +80,7 @@
     public function files_drop_area($attrib = array())
     {
         // add ID if not given
-        if (!$attrib'id') {
+        if (empty($attrib'id')) {
             $attrib'id' = 'kolabfiledroparea';
         }
 
@@ -117,7 +117,7 @@
         $recid    = $id_prefix . rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $uploadid = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GPC);
 
-        if (!is_array($_SESSION$session_key) || $_SESSION$session_key'id' != $recid) {
+        if (empty($_SESSION$session_key) || $_SESSION$session_key'id' != $recid) {
             $_SESSION$session_key = array();
             $_SESSION$session_key'id' = $recid;
             $_SESSION$session_key'attachments' = array();
@@ -151,13 +151,16 @@
                     unset($attachment'status', $attachment'abort');
                     $this->rc->session->append($session_key . '.attachments', $id, $attachment);
 
-                    if (($icon = $_SESSION$session_key . '_deleteicon') && is_file($icon)) {
+                    if (!empty($_SESSION$session_key . '_deleteicon')
+                        && ($icon = $_SESSION$session_key . '_deleteicon')
+                        && is_file($icon)
+                    ) {
                         $button = html::img(array(
                             'src' => $icon,
                             'alt' => $this->rc->gettext('delete')
                         ));
                     }
-                    else if ($_SESSION$session_key . '_textbuttons') {
+                    else if (!empty($_SESSION$session_key . '_textbuttons')) {
                         $button = rcube::Q($this->rc->gettext('delete'));
                     }
                     else {
@@ -181,7 +184,8 @@
                             'onclick' => 'return false', // sprintf("return %s.command('load-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
                          ), $link_content);
 
-                    $content .= $_SESSION$session_key . '_icon_pos' == 'left' ? $delete_link.$content_link : $content_link.$delete_link;
+                    $left = !empty($_SESSION$session_key . '_icon_pos') && $_SESSION$session_key . '_icon_pos' == 'left';
+                    $content = $left ? $delete_link.$content_link : $content_link.$delete_link;
 
                     $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
                             'html'      => $content,
@@ -196,7 +200,7 @@
                         $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
                             'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
                     }
-                    else if ($attachment'error') {
+                    else if (!empty($attachment'error')) {
                         $msg = $attachment'error';
                     }
                     else {
@@ -211,11 +215,13 @@
         else if ($_SERVER'REQUEST_METHOD' == 'POST') {
             // if filesize exceeds post_max_size then $_FILES array is empty,
             // show filesizeerror instead of fileuploaderror
-            if ($maxsize = ini_get('post_max_size'))
+            if ($maxsize = ini_get('post_max_size')) {
                 $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
                     'size' => $this->rc->show_bytes(parse_bytes($maxsize)))));
-            else
+            }
+            else {
                 $msg = $this->rc->gettext('fileuploaderror');
+            }
 
             $this->rc->output->command('display_message', $msg, 'error');
             $this->rc->output->command('remove_from_attachment_list', $uploadid);
@@ -233,7 +239,7 @@
     {
         ob_end_clean();
 
-        if ($attachment && $attachment'body') {
+        if ($attachment && !empty($attachment'body')) {
             // allow post-processing of the attachment body
             $part = new rcube_message_part;
             $part->filename  = $attachment'name';

iRony-0.4.5.tar.gz/lib/plugins/libkolab/lib/kolab_bonnie_api.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/lib/kolab_bonnie_api.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/lib/kolab_bonnie_api_client.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/lib/kolab_bonnie_api_client.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/lib/kolab_format_task.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/lib/kolab_format_task.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/lib/kolab_storage.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/lib/kolab_storage.php Changed

@@ -47,7 +47,6 @@
     private static $with_tempsubs = true;
     private static $subscriptions;
     private static $ldapcache = array();
-    private static $typedata = array();
     private static $ldap = array();
     private static $states;
     private static $config;
@@ -869,7 +868,8 @@
             return array();
         }
 
-        // In some conditions we can skip LIST command (?)
+        // If we only want groupware folders and don't care about the subscription state,
+        // then the metadata will already contain all folder names and we can avoid the LIST below.
         if (!$subscribed && $filter != 'mail' && $prefix == '*') {
             foreach ($folderdata as $folder => $type) {
                 if (!preg_match($regexp, $type)) {
@@ -1106,11 +1106,6 @@
             return false;
         }
 
-        // return cached result
-        if (is_array(self::$typedata$prefix)) {
-            return self::$typedata$prefix;
-        }
-
         $type_keys = array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE);
 
         // fetch metadata from *some* folders only
@@ -1153,10 +1148,7 @@
             return false;
         }
 
-        // keep list in memory
-        self::$typedata$prefix = array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
-
-        return self::$typedata$prefix;
+        return array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
     }
 
     /**
@@ -1185,13 +1177,6 @@
     {
         self::setup();
 
-        // return in-memory cached result
-        foreach (self::$typedata as $typedata) {
-            if (array_key_exists($folder, $typedata)) {
-                return $typedata$folder;
-            }
-        }
-
         $metadata = self::$imap->get_metadata($folder, array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE));
 
         if (!is_array($metadata)) {

iRony-0.4.5.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache.php Changed

@@ -27,8 +27,6 @@
     const DB_DATE_FORMAT = 'Y-m-d H:i:s';
     const MAX_RECORDS    = 500;
 
-    public $sync_complete = false;
-
     protected $db;
     protected $imap;
     protected $folder;
@@ -42,7 +40,6 @@
     protected $synclock = false;
     protected $ready = false;
     protected $cache_table;
-    protected $cache_refresh = 3600;
     protected $folders_table;
     protected $max_sql_packet;
     protected $max_sync_lock_time = 600;
@@ -85,7 +82,6 @@
         $this->imap = $rcmail->get_storage();
         $this->enabled = $rcmail->config->get('kolab_cache', false);
         $this->folders_table = $this->db->table_name('kolab_folders');
-        $this->cache_refresh = get_offset_sec($rcmail->config->get('kolab_cache_refresh', '12h'));
         $this->server_timezone = new DateTimeZone(date_default_timezone_get());
 
         if ($this->enabled) {
@@ -174,16 +170,6 @@
         if ($this->synched)
             return;
 
-        // increase time limit
-        @set_time_limit($this->max_sync_lock_time - 60);
-
-        // get effective time limit we have for synchronization (~70% of the execution time)
-        $time_limit = ini_get('max_execution_time') * 0.7;
-        $sync_start = time();
-
-        // assume sync will be completed
-        $this->sync_complete = true;
-
         if (!$this->ready) {
             // kolab cache is disabled, synchronize IMAP mailbox cache only
             $this->imap_mode(true);
@@ -191,124 +177,312 @@
             $this->imap_mode(false);
         }
         else {
+            $this->sync_start = time();
+
             // read cached folder metadata
             $this->_read_folder_data();
 
+            // Read folder data from IMAP
+            $ctag = $this->folder->get_ctag();
+
+            // Validate current ctag
+            list($uidvalidity, $highestmodseq, $uidnext) = explode('-', $ctag);
+
+            if (empty($uidvalidity) || empty($highestmodseq)) {
+                rcube::raise_error(array(
+                    'code' => 900,
+                    'message' => "Failed to sync the kolab cache (Invalid ctag)"
+                ), true);
+            }
             // check cache status ($this->metadata is set in _read_folder_data())
-            if (  empty($this->metadata'ctag') ||
-                  empty($this->metadata'changed') ||
-                  $this->metadata'objectcount' === null ||
-                  $this->metadata'changed' < date(self::DB_DATE_FORMAT, time() - $this->cache_refresh) ||
-                  $this->metadata'ctag' != $this->folder->get_ctag() ||
-                  intval($this->metadata'objectcount') !== $this->count()
+            else if (
+                empty($this->metadata'ctag')
+                || empty($this->metadata'changed')
+                || $this->metadata'ctag' !== $ctag
             ) {
                 // lock synchronization for this folder or wait if locked
                 $this->_sync_lock();
 
-                // disable messages cache if configured to do so
-                $this->imap_mode(true);
+                // Run a full-sync (initial sync or continue the aborted sync)
+                if (empty($this->metadata'changed') || empty($this->metadata'ctag')) {
+                    $result = $this->synchronize_full();
+                }
+                // Synchronize only the changes since last sync
+                else {
+                    $result = $this->synchronize_update($ctag);
+                }
+
+                // update ctag value (will be written to database in _sync_unlock())
+                if ($result) {
+                    $this->metadata'ctag'    = $ctag;
+                    $this->metadata'changed' = date(self::DB_DATE_FORMAT, time());
+                }
+
+                // remove lock
+                $this->_sync_unlock();
+            }
+        }
 
-                // synchronize IMAP mailbox cache
-                $this->imap->folder_sync($this->folder->name);
+        $this->check_error();
+        $this->synched = time();
+    }
 
-                // compare IMAP index with object cache index
-                $imap_index = $this->imap->index($this->folder->name, null, null, true, true);
+    /**
+     * Perform full cache synchronization
+     */
+    protected function synchronize_full()
+    {
+        // get effective time limit we have for synchronization (~70% of the execution time)
+        $time_limit = $this->_max_sync_lock_time() * 0.7;
 
-                $this->imap_mode(false);
+        if (time() - $this->sync_start > $time_limit) {
+            return false;
+        }
 
-                // determine objects to fetch or to invalidate
-                if (!$imap_index->is_error()) {
-                    $imap_index = $imap_index->get();
-                    $old_index  = array();
-                    $del_index  = array();
+        // disable messages cache if configured to do so
+        $this->imap_mode(true);
 
-                    // read cache index
-                    $sql_result = $this->db->query(
-                        "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?"
-                            . " ORDER BY `msguid` DESC", $this->folder_id
-                    );
+        // synchronize IMAP mailbox cache, does nothing if messages cache is disabled
+        $this->imap->folder_sync($this->folder->name);
 
-                    while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                        // Mark all duplicates for removal (note sorting order above)
-                        // Duplicates here should not happen, but they do sometimes
-                        if (isset($old_index$sql_arr'uid')) {
-                            $del_index = $sql_arr'msguid';
-                        }
-                        else {
-                            $old_index$sql_arr'uid' = $sql_arr'msguid';
-                        }
-                    }
+        // compare IMAP index with object cache index
+        $imap_index = $this->imap->index($this->folder->name, null, null, true, true);
 
-                    // fetch new objects from imap
-                    $i = 0;
-                    foreach (array_diff($imap_index, $old_index) as $msguid) {
-                        // Note: We'll store only objects matching the folder type
-                        // anything else will be silently ignored
-                        if ($object = $this->folder->read_object($msguid)) {
-                            // Deduplication: remove older objects with the same UID
-                            // Here we do not resolve conflicts, we just make sure
-                            // the most recent version of the object will be used
-                            if ($old_msguid = $old_index$object'uid') {
-                                if ($old_msguid < $msguid) {
-                                    $del_index = $old_msguid;
-                                }
-                                else {
-                                    $del_index = $msguid;
-                                    continue;
-                                }
-                            }
-
-                            $old_index$object'uid' = $msguid;
-
-                            $this->_extended_insert($msguid, $object);
-
-                            // check time limit and abort sync if running too long
-                            if (++$i % 50 == 0 && time() - $sync_start > $time_limit) {
-                                $this->sync_complete = false;
-                                break;
-                            }
-                        }
-                    }
-                    $this->_extended_insert(0, null);
+        $this->imap_mode(false);
 
-                    $del_index = array_unique($del_index);
+        if ($imap_index->is_error()) {
+            rcube::raise_error(array(
+                    'code' => 900,
+                    'message' => "Failed to sync the kolab cache (SEARCH failed)"
+                ), true);
+            return false;
+        }
 
-                    // delete duplicate entries from IMAP
-                    $rem_index = array_intersect($del_index, $imap_index);
-                    if (!empty($rem_index)) {
-                        $this->imap_mode(true);
-                        $this->imap->delete_message($rem_index, $this->folder->name);
-                        $this->imap_mode(false);
-                    }
+        // determine objects to fetch or to invalidate
+        $imap_index = $imap_index->get();
+        $del_index  = array();
+        $old_index  = $this->current_index($del_index);
 
-                    // delete old/invalid entries from the cache
-                    $del_index += array_diff($old_index, $imap_index);
-                    if (!empty($del_index)) {
-                        $quoted_ids = join(',', array_map(array($this->db, 'quote'), $del_index));
-                        $this->db->query(
-                            "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` IN ($quoted_ids)",
-                            $this->folder_id
-                        );
-                    }
+        // Fetch objects and store in DB
+        $result = $this->synchronize_fetch($imap_index, $old_index, $del_index);
 
-                    // update ctag value (will be written to database in _sync_unlock())
-                    if ($this->sync_complete) {
-                        $this->metadata'ctag' = $this->folder->get_ctag();
-                        $this->metadata'changed' = date(self::DB_DATE_FORMAT, time());
-                        // remember the number of cache entries linked to this folder
-                        $this->metadata'objectcount' = $this->count();
+        if ($result) {
+            // Remove redundant entries from IMAP and cache
+            $rem_index = array_intersect($del_index, $imap_index);
+            $del_index = array_merge(array_unique($del_index), array_diff($old_index, $imap_index));
+
+            $this->synchronize_delete($rem_index, $del_index);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Perform partial cache synchronization, based on QRESYNC
+     */
+    protected function synchronize_update()
+    {
+        if (!$this->imap->get_capability('QRESYNC')) {
+            rcube::raise_error(array(
+                    'code' => 900,
+                    'message' => "Failed to sync the kolab cache (no QRESYNC capability)"
+                ), true);
+
+            return $this->synchronize_full();
+        }
+
+        // Handle the previous ctag
+        list($uidvalidity, $highestmodseq, $uidnext) = explode('-', $this->metadata'ctag');
+
+        if (empty($uidvalidity) || empty($highestmodseq)) {
+            rcube::raise_error(array(
+                    'code' => 900,
+                    'message' => "Failed to sync the kolab cache (Invalid old ctag)"
+                ), true);
+            return false;
+        }
+
+        // Enable QRESYNC
+        $res = $this->imap->conn->enable('QRESYNC');
+        if ($res === false) {
+            rcube::raise_error(array(
+                    'code' => 900,
+                    'message' => "Failed to sync the kolab cache (failed to enable QRESYNC/CONDSTORE)"
+                ), true);
+
+            return false;
+        }
+
+        $mbox_data = $this->imap->folder_data($this->folder->name);
+        if (empty($mbox_data)) {
+            rcube::raise_error(array(
+                    'code' => 900,
+                    'message' => "Failed to sync the kolab cache (failed to get folder state)"
+                ), true);
+
+             return false;
+        }
+
+        // Check UIDVALIDITY
+        if ($uidvalidity != $mbox_data'UIDVALIDITY') {
+            return $this->synchronize_full();
+        }
+
+        // QRESYNC not supported on specified mailbox
+        if (!empty($mbox_data'NOMODSEQ') || empty($mbox_data'HIGHESTMODSEQ')) {
+            rcube::raise_error(array(
+                    'code' => 900,
+                    'message' => "Failed to sync the kolab cache (QRESYNC not supported on the folder)"
+                ), true);
+
+             return $this->synchronize_full();
+        }
+
+        // Get modified flags and vanished messages
+        // UID FETCH 1:* (FLAGS) (CHANGEDSINCE 0123456789 VANISHED)
+        $result = $this->imap->conn->fetch(
+            $this->folder->name, '1:*', true, array('FLAGS'), $highestmodseq, true
+        );
+
+        $removed  = array();
+        $modified = array();
+        $existing = $this->current_index($removed);
+
+        if (!empty($result)) {
+            foreach ($result as $msg) {
+                $uid = $msg->uid;
+
+                // Message marked as deleted
+                if (!empty($msg->flags'DELETED')) {
+                    $removed = $uid;
+                    continue;
+                }
+
+                // Flags changed or new
+                $modified = $uid;
+            }
+        }
+
+        $new    = array_diff($modified, $existing, $removed);
+        $result = true;
+
+        if (!empty($new)) {
+            $result = $this->synchronize_fetch($new, $existing, $removed);
+
+            if (!$result) {
+                return false;
+            }
+        }
+
+        // VANISHED found?
+        $mbox_data = $this->imap->folder_data($this->folder->name);
+
+        // Removed vanished messages from the database
+        $vanished = (array) rcube_imap_generic::uncompressMessageSet($mbox_data'VANISHED');
+
+        // Remove redundant entries from IMAP and DB
+        $vanished = array_merge($removed, array_intersect($vanished, $existing));
+        $this->synchronize_delete($removed, $vanished);
+
+        return $result;
+    }
+
+    /**
+     * Fetch objects from IMAP and save into the database
+     */
+    protected function synchronize_fetch($new_index, &$old_index, &$del_index)
+    {
+        // get effective time limit we have for synchronization (~70% of the execution time)
+        $time_limit = $this->_max_sync_lock_time() * 0.7;
+
+        if (time() - $this->sync_start > $time_limit) {
+            return false;
+        }
+
+        $i = 0;
+        $aborted = false;
+
+        // fetch new objects from imap
+        foreach (array_diff($new_index, $old_index) as $msguid) {
+            // Note: We'll store only objects matching the folder type
+            // anything else will be silently ignored
+            if ($object = $this->folder->read_object($msguid)) {
+                // Deduplication: remove older objects with the same UID
+                // Here we do not resolve conflicts, we just make sure
+                // the most recent version of the object will be used
+                if ($old_msguid = $old_index$object'uid') {
+                    if ($old_msguid < $msguid) {
+                        $del_index = $old_msguid;
+                    }
+                    else {
+                        $del_index = $msguid;
+                        continue;
                     }
                 }
 
-                // remove lock
-                $this->_sync_unlock();
+                $old_index$object'uid' = $msguid;
+
+                $this->_extended_insert($msguid, $object);
+
+                // check time limit and abort sync if running too long
+                if (++$i % 50 == 0 && time() - $this->sync_start > $time_limit) {
+                    $aborted = true;
+                    break;
+                }
             }
         }
 
-        $this->check_error();
-        $this->synched = time();
+        $this->_extended_insert(0, null);
+
+        return $aborted === false;
     }
 
+    /**
+     * Remove specified objects from the database and IMAP
+     */
+    protected function synchronize_delete($imap_delete, $db_delete)
+    {
+        if (!empty($imap_delete)) {
+            $this->imap_mode(true);
+            $this->imap->delete_message($imap_delete, $this->folder->name);
+            $this->imap_mode(false);
+        }
+
+        if (!empty($db_delete)) {
+            $quoted_ids = join(',', array_map(array($this->db, 'quote'), $db_delete));
+            $this->db->query(
+                "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` IN ($quoted_ids)",
+                $this->folder_id
+            );
+        }
+    }
+
+    /**
+     * Return current use->msguid index
+     */
+    protected function current_index(&$duplicates = array())
+    {
+        // read cache index
+        $sql_result = $this->db->query(
+            "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?"
+                . " ORDER BY `msguid` DESC", $this->folder_id
+        );
+
+        $index = $del_index = array();
+
+        while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+            // Mark all duplicates for removal (note sorting order above)
+            // Duplicates here should not happen, but they do sometimes
+            if (isset($index$sql_arr'uid')) {
+                $duplicates = $sql_arr'msguid';
+            }
+            else {
+                $index$sql_arr'uid' = $sql_arr'msguid';
+            }
+        }
+
+        return $index;
+    }
 
     /**
      * Read a single entry from cache or from IMAP directly
@@ -1044,7 +1218,7 @@
             return;
 
         $sql_arr = $this->db->fetch_assoc($this->db->query(
-                "SELECT `folder_id`, `synclock`, `ctag`, `changed`, `objectcount`"
+                "SELECT `folder_id`, `synclock`, `ctag`, `changed`"
                 . " FROM `{$this->folders_table}` WHERE `resource` = ?",
                 $this->resource_uri
         ));
@@ -1082,10 +1256,12 @@
         $read_query  = "SELECT `synclock`, `ctag` FROM `{$this->folders_table}` WHERE `folder_id` = ?";
         $write_query = "UPDATE `{$this->folders_table}` SET `synclock` = ? WHERE `folder_id` = ? AND `synclock` = ?";
 
+        $max_lock_time = $this->_max_sync_lock_time();
+
         // wait if locked (expire locks after 10 minutes) ...
         // ... or if setting lock fails (another process meanwhile set it)
         while (
-            (intval($this->metadata'synclock') + $this->max_sync_lock_time > time()) ||
+            (intval($this->metadata'synclock') + $max_lock_time > time()) ||
             (($res = $this->db->query($write_query, time(), $this->folder_id, intval($this->metadata'synclock'))) &&
                 !($affected = $this->db->affected_rows($res)))
         ) {
@@ -1105,16 +1281,26 @@
             return;
 
         $this->db->query(
-            "UPDATE `{$this->folders_table}` SET `synclock` = 0, `ctag` = ?, `changed` = ?, `objectcount` = ? WHERE `folder_id` = ?",
+            "UPDATE `{$this->folders_table}` SET `synclock` = 0, `ctag` = ?, `changed` = ? WHERE `folder_id` = ?",
             $this->metadata'ctag',
             $this->metadata'changed',
-            $this->metadata'objectcount',
             $this->folder_id
         );
 
         $this->synclock = false;
     }
 
+    protected function _max_sync_lock_time()
+    {
+        $limit = get_offset_sec(ini_get('max_execution_time'));
+
+        if ($limit <= 0 || $limit > $this->max_sync_lock_time) {
+            $limit = $this->max_sync_lock_time;
+        }
+
+        return $limit;
+    }
+
     /**
      * Check IMAP connection error state
      */

iRony-0.4.5.tar.gz/lib/plugins/libkolab/lib/kolab_storage_dataset.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/lib/kolab_storage_dataset.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/libkolab.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/libkolab.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/localization/ko_KR.inc -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/localization/ko_KR.inc Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/skins/elastic/include/calendar.less -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/include/calendar.less Changed

@@ -137,7 +137,7 @@
 
     .event-row {
         white-space: nowrap;
-        .overflow-ellipsis;
+        .overflow-ellipsis();
 
         &.current {
             color: #333;
@@ -166,7 +166,8 @@
 }
 
 #calendar.content {
-    overflow: hidden !important; // fullcalendar widget implements scrolling on its own
+    // fullcalendar widget implements scrolling on its own
+    overflow: hidden !important;
     position: relative;
 }
 
@@ -567,7 +568,7 @@
 
     @media screen and (min-width: (@screen-width-small + 1px)) and (max-width: 920px) {
         .fc-center {
-            .overflow-ellipsis;
+            .overflow-ellipsis();
             flex: 1;
 
             h2 {
@@ -715,7 +716,7 @@
 
         span {
             display: block;
-            .overflow-ellipsis;
+            .overflow-ellipsis();
         }
     }
 }
@@ -729,7 +730,7 @@
     }
 
     .event-location {
-        .overflow-ellipsis;
+        .overflow-ellipsis();
         white-space: nowrap;
     }
 
@@ -819,7 +820,7 @@
         }
 
         &.loading:before {
-            .animated-icon-class;
+            .animated-icon-class();
             content: @fa-var-circle-notch;
             display: block;
             line-height: 1;
@@ -967,7 +968,7 @@
             }
 
             &.loading:before {
-                .animated-icon-class;
+                .animated-icon-class();
                 .font-icon-solid(@fa-var-circle-notch);
             }

iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/include/darkmode.less Added

@@ -0,0 +1,168 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin dark mode styles for all Kolab plugins
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, 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/>.
+ */
+
+html.dark-mode {
+    // Use icons-only on taskmenu with small screen height
+    @media screen and (max-height: 750px) and (min-width: (@screen-width-small + 1px)) {
+        #taskmenu a {
+            width: @layout-menu-width-sm - 1px;
+        }
+    }
+
+    .watermark {
+        background-color: @color-dark-background;
+        background-blend-mode: soft-light;
+
+        &:before {
+            background: none;
+        }
+    }
+
+    #filelistcontainer,
+    .fc-scroller {
+        scrollbar-width: thin;
+    }
+
+    .fc {
+        .fc-header-toolbar {
+            background-color: @color-dark-list-selected-background;
+        }
+
+        #timezone-display,
+        .fc-center h2 {
+            color: @color-dark-font;
+        }
+    }
+
+    .filelist tr.session.owner > td.name::after,
+    .rsvp-status:not(.accepted):not(.tentative):not(.declined)::before,
+    .resources-dialog .listing li.resource > a {
+        color: @color-dark-font;
+    }
+
+    .fc-unthemed th,
+    .fc-unthemed td,
+    .fc-unthemed .fc-divider,
+    .fc-unthemed .fc-row,
+    .fc-unthemed .fc-content,
+    .fc-unthemed .fc-popover,
+    .fc-unthemed .fc-list-view,
+    .fc-unthemed .fc-list-heading td,
+    #tasklist li.taskitem > div,
+    #tasklist li.taskitem > span {
+        border-color: @color-dark-list-border;
+    }
+
+    .files-dialog .selection-content,
+    .calendar-scheduler .schedule-table td.times td,
+    .calendar-scheduler .attendees-list div.attendee,
+    .calendar-scheduler .schedule-table .timesheader,
+    .calendar-scheduler .schedule-table td.attendees .attendees-list,
+    .fc-unthemed th,
+    .fc-unthemed td {
+        border-color: @color-dark-border;
+    }
+
+    #resource-availability .fc,
+    #resource-availability .fc-view {
+        border-color: @color-dark-border;
+    }
+
+    .selection-dialog .form-addon,
+    .selection-dialog .header,
+    .selection-dialog .selection-list,
+    .edit-attendees-table th {
+        border-color: @color-dark-border !important;
+    }
+
+    .selection-dialog .listing ul,
+    .selection-dialog .form-addon,
+    .selection-dialog .header {
+        background-color: transparent;
+    }
+
+    .fc-unthemed .fc-divider,
+    .fc-unthemed .fc-popover .fc-header,
+    .fc-unthemed .fc-list-heading td,
+    body.task-calendar .ui-datepicker-inline .ui-datepicker-activerange,
+    .listing li.selected > div > *,
+    #tasklist li.taskitem div.taskhead.selected {
+        color: @color-dark-list-selected;
+        background-color: @color-dark-list-selected-background;
+    }
+
+    #folder-mount-form td.source.selected {
+        background-color: @color-dark-list-selected-background;
+    }
+
+    #tagsform option,
+    .tagedit-list li.tagedit-listelement-new input {
+        color: @color-dark-input;
+    }
+
+    .fc .fc-axis,
+    .fc .fc-day-number,
+    .fc .fc-week-number,
+    .fc .fc-day-header,
+    .fc .fc-week-header,
+    .formcontent.text-only .faded *,
+    .availability span,
+    .invitebox td.label,
+    .invitebox .rsvp-status.hint,
+    .calendar-agenda-preview .event-row.current,
+    #tasklist span.date,
+    #kolabnoteslist td.date,
+    #notedetailstitle .dates {
+        color: @color-dark-hint;
+    }
+
+    .invitebox .folder-select select {
+        background-color: @color-dark-input-background;
+    }
+
+    .tagedit-listtabindex="-1" {
+        border-color: @color-dark-input-border-focus;
+        box-shadow: 0 0 0 .2rem @color-input-border-focus-shadow;
+        background: @color-dark-input-background-focus;
+    }
+
+    #tasklist .progressbar .progressvalue {
+        border-color: @color-dark-warning;
+    }
+
+    .listing {
+        li > div.readonly a:first-child,
+        li.readonly:not(.virtual) > div a:first-child {
+            &:after {
+                color: @color-dark-font;
+                background-color: @color-dark-background;
+            }
+        }
+    }
+
+    .dialog-message {
+        opacity: 1;
+        color: @color-dark-font;
+        background-color: @color-dark-warning;
+    }
+}

iRony-0.4.5.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_activesync.less -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_activesync.less Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_files.less -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_files.less Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_notes.less -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_notes.less Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_tags.less -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_tags.less Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/skins/elastic/include/libcalendaring.less -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/include/libcalendaring.less Changed

@@ -129,7 +129,7 @@
 
     &.loading:before {
         &:extend(.font-icon-class);
-        .animated-icon-class;
+        .animated-icon-class();
         content: @fa-var-circle-notch;
         line-height: 1;
     }
@@ -279,7 +279,7 @@
             display: flex;
 
             & > :first-child {
-                .overflow-ellipsis;
+                .overflow-ellipsis();
                 // width and flex is required to make overflow working
                 flex: 1;
                 width: 1px;
@@ -357,7 +357,7 @@
 
     inputtype=button {
         margin-left: .5em;
-        .overflow-ellipsis;
+        .overflow-ellipsis();
     }
 }
 
@@ -611,7 +611,7 @@
         font-size: .9rem;
         color: @color-black-shade-text;
         white-space: nowrap;
-        .overflow-ellipsis;
+        .overflow-ellipsis();
     }
 
     .alarm-actions {
@@ -695,7 +695,7 @@
         padding: .5rem .5rem .5rem .65rem;
 
         &:before {
-            .font-icon-class;
+            .font-icon-class();
             margin: 0 1rem 0 0;
             width: 1em;
             line-height: 1.2;

iRony-0.4.5.tar.gz/lib/plugins/libkolab/skins/elastic/include/tasklist.less -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/include/tasklist.less Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/skins/elastic/libkolab.less -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/skins/elastic/libkolab.less Changed

@@ -24,6 +24,10 @@
 @skin: "elastic";
 @skin-path: "../../../../skins/@{skin}";
 
+// Disable dark mode support for compatibility with Roundcube 1.4.
+// The variable has been added to variables.less in Roundcube 1.5.
+@dark-mode-enabled: false;
+
 @import (reference) "@{skin-path}/styles/variables";
 @import (reference) "@{skin-path}/styles/mixins";
 
@@ -47,7 +51,7 @@
             display: flex;
 
             & > a:first-child {
-                .overflow-ellipsis;
+                .overflow-ellipsis();
                 position: relative;
                 flex-grow: 1;
 
@@ -155,7 +159,7 @@
                 content: @fa-var-lock;
                 position: absolute;
                 left: 2.25rem;
-                top: @listing-line-height / 2;
+                top: (@listing-line-height / 2);
                 font-size: .9em !important;
                 width: .9em;
                 line-height: 1;
@@ -166,7 +170,7 @@
                 opacity: .9;
 
                 html.touch & {
-                    top: @listing-touch-line-height / 2;
+                    top: (@listing-touch-line-height / 2);
                     left: 2.7rem;
                 }
             }
@@ -219,7 +223,7 @@
         right: 0;
         min-width: 2em;
         line-height: 1.4rem;
-        margin: (@listing-line-height - 1.4 * @page-font-size)/2;
+        margin: ((@listing-line-height - 1.4 * @page-font-size) / 2);
         padding: 0 .3em;
         border-radius: .4em;
         background: @color-list-secondary;
@@ -229,7 +233,7 @@
 
         html.touch & {
             line-height: 2rem;
-            margin: (@listing-touch-line-height - 2 * @page-font-size)/2;
+            margin: ((@listing-touch-line-height - 2 * @page-font-size) / 2);
         }
     }
 }
@@ -429,7 +433,7 @@
         }
 
         a.messagelink {
-            .overflow-ellipsis;
+            .overflow-ellipsis();
         }
 
         a.delete .inner {
@@ -589,7 +593,7 @@
 }
 
 // Use icons-only on taskmenu with small screen height
-@media screen and (max-height: 640px) and (min-width: (@screen-width-small + 1px)) {
+@media screen and (max-height: 750px) and (min-width: (@screen-width-small + 1px)) {
     #layout-menu .popover-header img,
     #layout-menu {
         width: @layout-menu-width-sm;
@@ -598,7 +602,7 @@
     #taskmenu {
         a {
             height: @layout-menu-width-sm;
-            width: 100%;
+            width: @layout-menu-width-sm;
             font-size: 1.2rem !important;
         }
 
@@ -620,3 +624,7 @@
 @import "include/kolab_tags";
 @import "include/libcalendaring";
 @import "include/tasklist";
+
+& when (@dark-mode-enabled = true) {
+    @import "include/darkmode";
+}

iRony-0.4.5.tar.gz/lib/plugins/libkolab/tests/kolab_date_recurrence.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/tests/kolab_date_recurrence.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/tests/kolab_storage_config.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/tests/kolab_storage_config.php Changed

iRony-0.4.5.tar.gz/lib/plugins/libkolab/tests/kolab_storage_folder.php -> iRony-0.4.6.tar.gz/lib/plugins/libkolab/tests/kolab_storage_folder.php Changed

iRony-0.4.5.tar.gz/lib/plugins/tasklist/composer.json -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/composer.json Changed

iRony-0.4.5.tar.gz/lib/plugins/tasklist/drivers/database/SQL/mysql.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/drivers/database/SQL/mysql.initial.sql Changed

@@ -1,7 +1,6 @@
 /**
  * Roundcube Tasklist plugin database
  *
- * @version @package_version@
  * @author Thomas Bruederli
  * @licence GNU AGPL
  * @copyright (C) 2012, Kolab Systems AG
@@ -17,7 +16,7 @@
   KEY `user_id` (`user_id`),
   CONSTRAINT `fk_tasklist_user_id` FOREIGN KEY (`user_id`)
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `tasks` (
   `task_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -47,6 +46,6 @@
   KEY `uid` (`uid`),
   CONSTRAINT `fk_tasks_tasklist_id` FOREIGN KEY (`tasklist_id`)
     REFERENCES `tasklists`(`tasklist_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-REPLACE INTO `system` (`name`, `value`) VALUES ('tasklist-database-version', '2014051900');
+REPLACE INTO `system` (`name`, `value`) VALUES ('tasklist-database-version', '2021102600');

iRony-0.4.6.tar.gz/lib/plugins/tasklist/drivers/database/SQL/mysql/2021102600.sql Added

iRony-0.4.5.tar.gz/lib/plugins/tasklist/drivers/database/SQL/postgres.initial.sql -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/drivers/database/SQL/postgres.initial.sql Changed

iRony-0.4.5.tar.gz/lib/plugins/tasklist/drivers/database/tasklist_database_driver.php -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/drivers/database/tasklist_database_driver.php Changed

@@ -118,8 +118,8 @@
              . " VALUES (?, ?, ?, ?)",
             $this->rc->user->ID,
             strval($prop'name'),
-            strval($prop'color'),
-            $prop'showalarms' ? 1 : 0
+            isset($prop'color') ? strval($prop'color') : '',
+            !empty($prop'showalarms') ? 1 : 0
         );
 
         if ($result) {
@@ -143,8 +143,8 @@
             "UPDATE " . $this->db_lists . " SET `name` = ?, `color` = ?, `showalarms` = ?"
              . " WHERE `tasklist_id` = ? AND `user_id` = ?",
             strval($prop'name'),
-            strval($prop'color'),
-            $prop'showalarms' ? 1 : 0,
+            isset($prop'color') ? strval($prop'color') : '',
+            !empty($prop'showalarms') ? 1 : 0,
             $prop'id',
             $this->rc->user->ID
         );
@@ -163,7 +163,7 @@
     {
         $hidden = array_flip(explode(',', $this->rc->config->get('hidden_tasklists', '')));
 
-        if ($prop'active') {
+        if (!empty($prop'active')) {
             unset($hidden$prop'id');
         }
         else {
@@ -291,56 +291,53 @@
         $sql_add  = '';
 
         // add filter criteria
-        if ($filter'from' || ($filter'mask' & tasklist::FILTER_MASK_TODAY)) {
-            $sql_add .= " AND (`date` IS NULL OR `date` >= ?)";
-            $datefrom = $filter'from';
-        }
-        if ($filter'to') {
-            if ($filter'mask' & tasklist::FILTER_MASK_OVERDUE) {
-                $sql_add .= " AND (`date` IS NOT NULL AND `date` <= " . $this->rc->db->quote($filter'to') . ")";
-            }
-            else {
-                $sql_add .= " AND (`date` IS NULL OR `date` <= " . $this->rc->db->quote($filter'to') . ")";
+        if ($filter) {
+            if (!empty($filter'from') || ($filter'mask' & tasklist::FILTER_MASK_TODAY)) {
+                $sql_add .= " AND (`date` IS NULL OR `date` >= " . $this->rc->db->quote($filter'from') . ")";
             }
-        }
 
-        // special case 'today': also show all events with date before today
-        if ($filter'mask' & tasklist::FILTER_MASK_TODAY) {
-            $datefrom = date('Y-m-d', 0);
-        }
+            if (!empty($filter'to')) {
+                if ($filter'mask' & tasklist::FILTER_MASK_OVERDUE) {
+                    $sql_add .= " AND (`date` IS NOT NULL AND `date` <= " . $this->rc->db->quote($filter'to') . ")";
+                }
+                else {
+                    $sql_add .= " AND (`date` IS NULL OR `date` <= " . $this->rc->db->quote($filter'to') . ")";
+                }
+            }
 
-        if ($filter'mask' & tasklist::FILTER_MASK_NODATE) {
-            $sql_add = " AND `date` IS NULL";
-        }
+            if ($filter'mask' & tasklist::FILTER_MASK_NODATE) {
+                $sql_add = " AND `date` IS NULL";
+            }
 
-        if ($filter'mask' & tasklist::FILTER_MASK_COMPLETE) {
-            $sql_add .= " AND " . self::IS_COMPLETE_SQL;
-        }
-        else if (empty($filter'since')) {
-            // don't show complete tasks by default
-            $sql_add .= " AND NOT " . self::IS_COMPLETE_SQL;
-        }
+            if ($filter'mask' & tasklist::FILTER_MASK_COMPLETE) {
+                $sql_add .= " AND " . self::IS_COMPLETE_SQL;
+            }
+            else if (empty($filter'since')) {
+                // don't show complete tasks by default
+                $sql_add .= " AND NOT " . self::IS_COMPLETE_SQL;
+            }
 
-        if ($filter'mask' & tasklist::FILTER_MASK_FLAGGED) {
-            $sql_add .= " AND `flagged` = 1";
-        }
+            if ($filter'mask' & tasklist::FILTER_MASK_FLAGGED) {
+                $sql_add .= " AND `flagged` = 1";
+            }
 
-        // compose (slow) SQL query for searching
-        // FIXME: improve searching using a dedicated col and normalized values
-        if ($filter'search') {
-            $sql_query = array();
-            foreach (array('title', 'description', 'organizer', 'attendees') as $col) {
-                $sql_query = $this->rc->db->ilike($col, '%' . $filter'search' . '%');
+            // compose (slow) SQL query for searching
+            // FIXME: improve searching using a dedicated col and normalized values
+            if ($filter'search') {
+                $sql_query = array();
+                foreach (array('title', 'description', 'organizer', 'attendees') as $col) {
+                    $sql_query = $this->rc->db->ilike($col, '%' . $filter'search' . '%');
+                }
+                $sql_add = " AND (" . join(" OR ", $sql_query) . ")";
             }
-            $sql_add = " AND (" . join(" OR ", $sql_query) . ")";
-        }
 
-        if ($filter'since' && is_numeric($filter'since')) {
-            $sql_add .= " AND `changed` >= " . $this->rc->db->quote(date('Y-m-d H:i:s', $filter'since'));
-        }
+            if (!empty($filter'since') && is_numeric($filter'since')) {
+                $sql_add .= " AND `changed` >= " . $this->rc->db->quote(date('Y-m-d H:i:s', $filter'since'));
+            }
 
-        if ($filter'uid') {
-            $sql_add .= " AND `uid` IN (" . implode(',', array_map(array($this->rc->db, 'quote'), $filter'uid')) . ")";
+            if (!empty($filter'uid')) {
+                $sql_add .= " AND `uid` IN (" . implode(',', array_map(array($this->rc->db, 'quote'), $filter'uid')) . ")";
+            }
         }
 
         $tasks = array();
@@ -348,8 +345,7 @@
             $result = $this->rc->db->query("SELECT * FROM " . $this->db_tasks
                 . " WHERE `tasklist_id` IN (" . join(',', $list_ids) . ")"
                     . " AND `del` = 0" . $sql_add
-                . " ORDER BY `parent_id`, `task_id` ASC",
-                $datefrom
+                . " ORDER BY `parent_id`, `task_id` ASC"
             );
 
             while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
@@ -375,12 +371,12 @@
             $prop'uid' = $prop;
         }
 
-        $query_col = $prop'id' ? 'task_id' : 'uid';
+        $query_col = !empty($prop'id') ? 'task_id' : 'uid';
 
         $result = $this->rc->db->query("SELECT * FROM " . $this->db_tasks
             . " WHERE `tasklist_id` IN (" . $this->list_ids . ")"
             . " AND `$query_col` = ? AND `del` = 0",
-            $prop'id' ? $prop'id' : $prop'uid'
+            !empty($prop'id') ? $prop'id' : $prop'uid'
         );
 
         if ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
@@ -557,22 +553,24 @@
     public function create_task($prop)
     {
         // check list permissions
-        $list_id = $prop'list' ? $prop'list' : reset(array_keys($this->lists));
-        if (!$this->lists$list_id || $this->lists$list_id'readonly') {
+        $list_id = !empty($prop'list') ? $prop'list' : reset(array_keys($this->lists));
+        if (empty($this->lists$list_id) || !empty($this->lists$list_id'readonly')) {
             return false;
         }
 
-        if (is_array($prop'valarms')) {
+        if (!empty($prop'valarms')) {
             $prop'alarms' = $this->serialize_alarms($prop'valarms');
         }
-        if (is_array($prop'recurrence')) {
+
+        if (!empty($prop'recurrence')) {
             $prop'recurrence' = $this->serialize_recurrence($prop'recurrence');
         }
-        if (array_key_exists('complete', $prop)) {
+
+        if (array_key_exists('complete', $prop) && !empty($prop'complete')) {
             $prop'complete' = number_format($prop'complete', 2, '.', '');
         }
 
-        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status') as $col) {
+        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status', 'complete') as $col) {
             if (empty($prop$col)) {
                 $prop$col = null;
             }
@@ -594,13 +592,13 @@
             $prop'time',
             $prop'startdate',
             $prop'starttime',
-            strval($prop'description'),
-            join(',', (array)$prop'tags'),
-            $prop'flagged' ? 1 : 0,
+            isset($prop'description') ? strval($prop'description') : '',
+            !empty($prop'tags') ? join(',', (array)$prop'tags') : '',
+            !empty($prop'flagged') ? 1 : 0,
             $prop'complete' ?: 0,
             strval($prop'status'),
-            $prop'alarms',
-            $prop'recurrence',
+            isset($prop'alarms') ? $prop'alarms' : '',
+            isset($prop'recurrence') ? $prop'recurrence' : '',
             $notify_at
         );
 
@@ -621,10 +619,10 @@
      */
     public function edit_task($prop)
     {
-        if (is_array($prop'valarms')) {
+        if (isset($prop'valarms')) {
             $prop'alarms' = $this->serialize_alarms($prop'valarms');
         }
-        if (is_array($prop'recurrence')) {
+        if (isset($prop'recurrence')) {
             $prop'recurrence' = $this->serialize_recurrence($prop'recurrence');
         }
         if (array_key_exists('complete', $prop)) {
@@ -655,7 +653,7 @@
         }
 
         // moved from another list
-        if ($prop'_fromlist' && ($newlist = $prop'list')) {
+        if (!empty($prop'_fromlist') && ($newlist = $prop'list')) {
             $sql_set = $this->rc->db->quote_identifier('tasklist_id') . '=' . $this->rc->db->quote($newlist);
         }
 
@@ -735,10 +733,10 @@
      */
     private function _get_notification($task)
     {
-        if ($task'valarms' && !$this->is_complete($task)) {
+        if (!empty($task'valarms') && !$this->is_complete($task)) {
             $alarm = libcalendaring::get_next_alarm($task, 'task');
 
-            if ($alarm'time' && in_array($alarm'action', $this->alarm_types)) {
+            if (!empty($alarm'time') && in_array($alarm'action', $this->alarm_types)) {
                 return date('Y-m-d H:i:s', $alarm'time');
             }
         }

iRony-0.4.5.tar.gz/lib/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

iRony-0.4.5.tar.gz/lib/plugins/tasklist/localization/ko_KR.inc -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/localization/ko_KR.inc Changed

iRony-0.4.5.tar.gz/lib/plugins/tasklist/tasklist.js -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/tasklist.js Changed

iRony-0.4.5.tar.gz/lib/plugins/tasklist/tasklist.php -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/tasklist.php Changed

@@ -66,6 +66,7 @@
 
     private $collapsed_tasks = array();
     private $message_tasks   = array();
+    private $task_titles     = array();
 
 
     /**
@@ -139,7 +140,7 @@
             }
 
             // add 'Create event' item to message menu
-            if ($this->api->output->type == 'html' && $_GET'_rel' != 'task') {
+            if ($this->api->output->type == 'html' && (empty($_GET'_rel') || $_GET'_rel' != 'task')) {
                 $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
                     $this->api->output->button(array(
                         'command'  => 'tasklist-create-from-mail',
@@ -155,7 +156,7 @@
             }
         }
 
-        if (!$this->rc->output->ajax_call && !$this->rc->output->env'framed') {
+        if (!$this->rc->output->ajax_call && empty($this->rc->output->env'framed')) {
             $this->load_ui();
             $this->ui->init();
         }
@@ -181,7 +182,7 @@
      */
     private function load_driver()
     {
-        if (is_object($this->driver)) {
+        if (!empty($this->driver)) {
             return;
         }
 
@@ -209,15 +210,16 @@
 
         // force notify if hidden + active
         $itip_send_option = (int)$this->rc->config->get('calendar_itip_send_option', 3);
-        if ($itip_send_option === 1 && empty($rec'_reportpartstat'))
+        if ($itip_send_option === 1 && empty($rec'_reportpartstat')) {
             $rec'_notify' = 1;
+        }
 
         switch ($action) {
         case 'new':
             $oldrec = null;
             $rec = $this->prepare_task($rec);
             $rec'uid' = $this->generate_uid();
-            $temp_id = $rec'tempid';
+            $temp_id = !empty($rec'tempid') ? $rec'tempid' : null;
             if ($success = $this->driver->create_task($rec)) {
                 $refresh = $this->driver->get_task($rec);
                 if ($temp_id) $refresh'tempid' = $temp_id;
@@ -514,7 +516,7 @@
         }
 
         // send out notifications
-        if ($success && $rec'_notify' && ($rec'attendees' || $oldrec'attendees')) {
+        if ($success && !empty($rec'_notify') && ($rec'attendees' || $oldrec'attendees')) {
             // make sure we have the complete record
             $task = $action == 'delete' ? $oldrec : $this->driver->get_task($rec);
 
@@ -528,7 +530,7 @@
             }
         }
 
-        if ($success && $rec'_reportpartstat' && $rec'_reportpartstat' != 'NEEDS-ACTION') {
+        if ($success && !empty($rec'_reportpartstat') && $rec'_reportpartstat' != 'NEEDS-ACTION') {
             // get the full record after update
             if (!$task) {
                 $task = $this->driver->get_task($rec);
@@ -556,7 +558,7 @@
         $this->rc->output->command('plugin.unlock_saving', $success);
 
         if ($refresh) {
-            if ($refresh'id') {
+            if (!empty($refresh'id')) {
                 $this->encode_task($refresh);
             }
             else if (is_array($refresh)) {
@@ -575,8 +577,8 @@
      */
     private function load_itip()
     {
-        if (!$this->itip) {
-            require_once realpath(__DIR__ . '/../libcalendaring/lib/libcalendaring_itip.php');
+        if (empty($this->itip)) {
+            require_once __DIR__ . '/../libcalendaring/lib/libcalendaring_itip.php';
             $this->itip = new libcalendaring_itip($this, 'tasklist');
             $this->itip->set_rsvp_actions(array('accepted','declined','delegated'));
             $this->itip->set_rsvp_status(array('accepted','tentative','declined','delegated','in-process','completed'));
@@ -591,7 +593,7 @@
     private function prepare_task($rec)
     {
         // try to be smart and extract date from raw input
-        if ($rec'raw') {
+        if (!empty($rec'raw')) {
             foreach (array('today','tomorrow','sunday','monday','tuesday','wednesday','thursday','friday','saturday','sun','mon','tue','wed','thu','fri','sat') as $word) {
                 $locwords = '/^' . preg_quote(mb_strtolower($this->gettext($word))) . '\b/i';
                 $normwords = $word;
@@ -675,7 +677,7 @@
         }
 
         // convert the submitted alarm values
-        if ($rec'valarms') {
+        if (!empty($rec'valarms')) {
             $valarms = array();
             foreach (libcalendaring::from_client_alarms($rec'valarms') as $alarm) {
                 // alarms can only work with a date (either task start, due or absolute alarm date)
@@ -701,7 +703,7 @@
                 // translate count into an absolute end date.
                 // why? because when shifting completed tasks to the next recurrence,
                 // the initial start date to count from gets lost.
-                if ($rec'recurrence''COUNT') {
+                if (!empty($rec'recurrence''COUNT')) {
                     $engine = libcalendaring::get_recurrence();
                     $engine->init($rec'recurrence', $refdate);
                     if ($until = $engine->end()) {
@@ -717,7 +719,7 @@
 
         $attachments = array();
         $taskid = $rec'id';
-        if (is_array($_SESSIONself::SESSION_KEY) && $_SESSIONself::SESSION_KEY'id' == $taskid) {
+        if (!empty($_SESSIONself::SESSION_KEY) && $_SESSIONself::SESSION_KEY'id' == $taskid) {
             if (!empty($_SESSIONself::SESSION_KEY'attachments')) {
                 foreach ($_SESSIONself::SESSION_KEY'attachments' as $id => $attachment) {
                     if (is_array($rec'attachments') && in_array($id, $rec'attachments')) {
@@ -736,12 +738,15 @@
         }
 
         // convert invalid data
-        if (isset($rec'attendees') && !is_array($rec'attendees'))
+        if (isset($rec'attendees') && !is_array($rec'attendees')) {
             $rec'attendees' = array();
+        }
 
-        foreach ((array)$rec'attendees' as $i => $attendee) {
-            if (is_string($attendee'rsvp')) {
-                $rec'attendees'$i'rsvp' = $attendee'rsvp' == 'true' || $attendee'rsvp' == '1';
+        if (!empty($rec'attendees')) {
+            foreach ((array) $rec'attendees' as $i => $attendee) {
+                if (is_string($attendee'rsvp')) {
+                    $rec'attendees'$i'rsvp' = $attendee'rsvp' == 'true' || $attendee'rsvp' == '1';
+                }
             }
         }
 
@@ -1000,7 +1005,7 @@
             $list += array('showalarms' => true, 'active' => true, 'editable' => true);
             if ($insert_id = $this->driver->create_list($list)) {
                 $list'id' = $insert_id;
-                if (!$list'_reload') {
+                if (empty($list'_reload')) {
                     $this->load_ui();
                     $list'html' = $this->ui->tasklist_list_item($insert_id, $list, $jsenv);
                     $list += (array)$jsenv$insert_id;
@@ -1048,7 +1053,7 @@
                 $results = $prop;
             }
             // report more results available
-            if ($this->driver->search_more_results) {
+            if (!empty($this->driver->search_more_results)) {
                 $this->rc->output->show_message('autocompletemore', 'notice');
             }
 
@@ -1056,10 +1061,12 @@
             return;
         }
 
-        if ($success)
+        if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
-        else
+        }
+        else {
             $this->rc->output->show_message('tasklist.errorsaving', 'error');
+        }
 
         $this->rc->output->command('plugin.unlock_saving');
     }
@@ -1074,8 +1081,9 @@
         }
         else {
             foreach ($this->driver->get_lists() as $list) {
-                if ($list'active')
+                if (!empty($list'active')) {
                     $lists = $list'id';
+                }
             }
         }
         $counts = $this->driver->count_tasks($lists);
@@ -1161,7 +1169,7 @@
         $data = $this->task_tree = $this->task_titles = array();
 
         foreach ($records as $rec) {
-            if ($rec'parent_id') {
+            if (!empty($rec'parent_id')) {
                 $this->task_tree$rec'id' = $rec'parent_id';
             }
 
@@ -1224,18 +1232,20 @@
             }
         }
 
-        if ($rec'valarms') {
+        if (!empty($rec'valarms')) {
             $rec'alarms_text' = libcalendaring::alarms_text($rec'valarms');
             $rec'valarms' = libcalendaring::to_client_alarms($rec'valarms');
         }
 
-        if ($rec'recurrence') {
+        if (!empty($rec'recurrence')) {
             $rec'recurrence_text' = $this->lib->recurrence_text($rec'recurrence');
             $rec'recurrence' = $this->lib->to_client_recurrence($rec'recurrence', $rec'time' || $rec'starttime');
         }
 
-        foreach ((array)$rec'attachments' as $k => $attachment) {
-            $rec'attachments'$k'classname' = rcube_utils::file2class($attachment'mimetype', $attachment'name');
+        if (!empty($rec'attachments')) {
+            foreach ((array) $rec'attachments' as $k => $attachment) {
+                $rec'attachments'$k'classname' = rcube_utils::file2class($attachment'mimetype', $attachment'name');
+            }
         }
 
         // convert link URIs references into structs
@@ -1283,11 +1293,13 @@
     {
         $rec'_depth' = 0;
         $parent_titles = array();
-        $parent_id = $this->task_tree$rec'id';
+        $parent_id = isset($this->task_tree$rec'id') ? $this->task_tree$rec'id' : null;
         while ($parent_id) {
             $rec'_depth'++;
-            array_unshift($parent_titles, $this->task_titles$parent_id);
-            $parent_id = $this->task_tree$parent_id;
+            if (isset($this->task_titles$parent_id)) {
+                array_unshift($parent_titles, $this->task_titles$parent_id);
+            }
+            $parent_id = isset($this->task_tree$parent_id) ? $this->task_tree$parent_id : null;
         }
 
         if (count($parent_titles)) {
@@ -1702,7 +1714,7 @@
         header("Content-Disposition: inline; filename=\"". $plugin'filename' ."\"");
 
         $this->get_ical()->export($plugin'result', '', true,
-            $plugins'attachments' ? array($this->driver, 'get_attachment_body') : null);
+            !empty($plugin'attachments') ? array($this->driver, 'get_attachment_body') : null);
         exit;
     }
 
@@ -1927,7 +1939,7 @@
      */
     public function mail_message_load($p)
     {
-        if (!$p'object'->headers->others'x-kolab-type') {
+        if (empty($p'object'->headers->others'x-kolab-type')) {
             $this->load_driver();
             $this->message_tasks = $this->driver->get_message_related_tasks($p'object'->headers, $p'object'->folder);
 
@@ -1950,7 +1962,7 @@
      */
     public function get_ical()
     {
-        if (!$this->ical) {
+        if (empty($this->ical)) {
             $this->ical = libcalendaring::get_ical();
         }
 
@@ -2442,7 +2454,7 @@
         if ($task'flagged') {
             $object'priority' = 1;
         }
-        else if (!$task'priority') {
+        else if (empty($task'priority')) {
             $object'priority' = 0;
         }

iRony-0.4.5.tar.gz/lib/plugins/tasklist/tasklist_ui.php -> iRony-0.4.6.tar.gz/lib/plugins/tasklist/tasklist_ui.php Changed

@@ -83,8 +83,9 @@
 
         // get user identity to create default attendee
         foreach ($this->rc->user->list_emails() as $rec) {
-            if (!$identity)
+            if (empty($identity)) {
                 $identity = $rec;
+            }
 
             $identity'emails' = $rec'email';
             $settings'identities'$rec'identity_id' = $rec'email';
@@ -184,14 +185,15 @@
 
             $html = '';
             foreach ((array)$lists as $id => $prop) {
-                if ($attrib'activeonly' && !$prop'active')
-                  continue;
+                if (!empty($attrib'activeonly') && empty($prop'active')) {
+                    continue;
+                }
 
                 $html .= html::tag('li', array(
                         'id' => 'rcmlitasklist' . rcube_utils::html_identifier($id),
-                        'class' => $prop'group',
+                        'class' => isset($prop'group') ? $prop'group' : null,
                     ),
-                    $this->tasklist_list_item($id, $prop, $jsenv, $attrib'activeonly')
+                    $this->tasklist_list_item($id, $prop, $jsenv, !empty($attrib'activeonly'))
                 );
             }
         }
@@ -241,7 +243,7 @@
     public function tasklist_list_item($id, $prop, &$jsenv, $activeonly = false)
     {
         // enrich list properties with settings from the driver
-        if (!$prop'virtual') {
+        if (empty($prop'virtual')) {
             unset($prop'user_id');
             $prop'alarms'      = $this->plugin->driver->alarms;
             $prop'undelete'    = $this->plugin->driver->undelete;
@@ -253,17 +255,27 @@
         }
 
         $classes = array('tasklist');
-        $title   = $prop'title' ?: ($prop'name' != $prop'listname' || strlen($prop'name') > 25 ?
-            html_entity_decode($prop'name', ENT_COMPAT, RCUBE_CHARSET) : '');
+        $title   = '';
 
-        if ($prop'virtual')
+        if (!empty($prop'title')) {
+            $title = $prop'title';
+        }
+        else if (empty($prop'listname') || $prop'name' != $prop'listname' || strlen($prop'name') > 25) {
+            html_entity_decode($prop'name', ENT_COMPAT, RCUBE_CHARSET);
+        }
+
+        if (!empty($prop'virtual')) {
             $classes = 'virtual';
-        else if (!$prop'editable')
+        }
+        else if (empty($prop'editable')) {
             $classes = 'readonly';
-        if ($prop'subscribed')
+        }
+        if (!empty($prop'subscribed')) {
             $classes = 'subscribed';
-        if ($prop'class')
+        }
+        if (!empty($prop'class')) {
             $classes = $prop'class';
+        }
 
         if (!$activeonly || $prop'active') {
             $label_id = 'tl:' . $id;
@@ -277,9 +289,10 @@
             ));
 
             return html::div(join(' ', $classes),
-                html::a(array('class' => 'listname', 'title' => $title, 'href' => '#', 'id' => $label_id), $prop'listname' ?: $prop'name') .
-                    ($prop'virtual' ? '' : $chbox . html::span('actions',
-                          ($prop'removable' ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') : '')
+                html::a(array('class' => 'listname', 'title' => $title, 'href' => '#', 'id' => $label_id),
+                    !empty($prop'listname') ? $prop'listname' : $prop'name') .
+                    (!empty($prop'virtual') ? '' : $chbox . html::span('actions',
+                          (!empty($prop'removable') ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') : '')
                           . html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false'), ' ')
                           . (isset($prop'subscribed') ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop'subscribed' ? 'true' : 'false'), ' ') : '')
                     )
@@ -319,15 +332,18 @@
         $select = new html_select($attrib);
         $default = null;
 
-        foreach ((array) $attrib'extra' as $id => $name) {
-            $select->add($name, $id);
+        if (!empty($attrib'extra')) {
+            foreach ((array) $attrib'extra' as $id => $name) {
+                $select->add($name, $id);
+            }
         }
 
-        foreach ((array)$this->plugin->driver->get_lists() as $id => $prop) {
-            if ($prop'editable' || strpos($prop'rights', 'i') !== false) {
+        foreach ((array) $this->plugin->driver->get_lists() as $id => $prop) {
+            if (!empty($prop'editable') || strpos($prop'rights', 'i') !== false) {
                 $select->add($prop'name', $id);
-                if (!$default || $prop'default')
+                if (!$default || !empty($prop'default')) {
                     $default = $id;
+                }
             }
         }
 
@@ -421,7 +437,12 @@
         $attrib += array('id' => 'rcmtasktagsedit');
         $this->register_gui_object('edittagline', $attrib'id');
 
-        $input = new html_inputfield(array('name' => 'tags', 'class' => 'tag', 'size' => $attrib'size', 'tabindex' => $attrib'tabindex'));
+        $input = new html_inputfield(array(
+                'name' => 'tags',
+                'class' => 'tag',
+                'size' => !empty($attrib'size') ? $attrib'size' : null,
+                'tabindex' => isset($attrib'tabindex') ? $attrib'tabindex' : null,
+        ));
         unset($attrib'tabindex');
         return html::div($attrib, $input->show(''));
     }
@@ -461,9 +482,21 @@
      */
     function attendees_form($attrib = array())
     {
-        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => $attrib'size', 'class' => 'form-control'));
-        $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment',
-            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('itipcommenttitle'), 'class' => 'form-control'));
+        $input = new html_inputfield(array(
+                'name' => 'participant',
+                'id' => 'edit-attendee-name',
+                'size' => !empty($attrib'size') ? $attrib'size' : null,
+                'class' => 'form-control'
+        ));
+
+        $textarea = new html_textarea(array(
+                'name' => 'comment',
+                'id' => 'edit-attendees-comment',
+                'rows' => 4,
+                'cols' => 55,
+                'title' => $this->plugin->gettext('itipcommenttitle'),
+                'class' => 'form-control'
+        ));
 
         return html::div($attrib,
             html::div('form-searchbar', $input->show() . " " .
@@ -488,7 +521,7 @@
      */
     function tasks_import_form($attrib = array())
     {
-        if (!$attrib'id') {
+        if (empty($attrib'id')) {
             $attrib'id' = 'rcmImportForm';
         }
 
@@ -503,7 +536,7 @@
                 'id'     => 'importfile',
                 'type'   => 'file',
                 'name'   => '_data',
-                'size'   => $attrib'uploadfieldsize',
+                'size'   => !empty($attrib'uploadfieldsize') ? $attrib'uploadfieldsize' : null,
                 'accept' => $accept
         ));
 
@@ -537,11 +570,11 @@
      */
     function tasks_export_form($attrib = array())
     {
-        if (!$attrib'id') {
+        if (empty($attrib'id')) {
             $attrib'id' = 'rcmTaskExportForm';
         }
 
-        $html .= html::div('form-section form-group row',
+        $html = html::div('form-section form-group row',
             html::label(array('for' => 'task-export-list', 'class' => 'col-sm-4 col-form-label'), $this->plugin->gettext('list'))
             . html::div('col-sm-8', $this->tasklist_select(array(
                         'name'  => 'source',

iRony-0.4.5.tar.gz/vendor/autoload.php -> iRony-0.4.6.tar.gz/vendor/autoload.php Changed

iRony-0.4.5.tar.gz/vendor/bin/generate_vcards -> iRony-0.4.6.tar.gz/vendor/bin/generate_vcards Changed

-(symlink to ../sabre/vobject/bin/generate_vcards)
@@ -0,0 +1,107 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Proxy PHP file generated by Composer
+ *
+ * This file includes the referenced bin path (../sabre/vobject/bin/generate_vcards)
+ * using a stream wrapper to prevent the shebang from being output on PHP<8
+ *
+ * @generated
+ */
+
+namespace Composer;
+
+$GLOBALS'_composer_bin_dir' = __DIR__;
+$GLOBALS'_composer_autoload_path' = __DIR__ . '/..'.'/autoload.php';
+
+if (PHP_VERSION_ID < 80000) {
+    if (!class_exists('Composer\BinProxyWrapper')) {
+        /**
+         * @internal
+         */
+        final class BinProxyWrapper
+        {
+            private $handle;
+            private $position;
+            private $realpath;
+
+            public function stream_open($path, $mode, $options, &$opened_path)
+            {
+                // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
+                $opened_path = substr($path, 17);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = $this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
+                $this->position = 0;
+
+                return (bool) $this->handle;
+            }
+
+            public function stream_read($count)
+            {
+                $data = fread($this->handle, $count);
+
+                if ($this->position === 0) {
+                    $data = preg_replace('{^#!.*\r?\n}', '', $data);
+                }
+
+                $this->position += strlen($data);
+
+                return $data;
+            }
+
+            public function stream_cast($castAs)
+            {
+                return $this->handle;
+            }
+
+            public function stream_close()
+            {
+                fclose($this->handle);
+            }
+
+            public function stream_lock($operation)
+            {
+                return $operation ? flock($this->handle, $operation) : true;
+            }
+
+            public function stream_tell()
+            {
+                return $this->position;
+            }
+
+            public function stream_eof()
+            {
+                return feof($this->handle);
+            }
+
+            public function stream_stat()
+            {
+                return array();
+            }
+
+            public function stream_set_option($option, $arg1, $arg2)
+            {
+                return true;
+            }
+
+            public function url_stat($path, $flags)
+            {
+                $path = substr($path, 17);
+                if (file_exists($path)) {
+                    return stat($path);
+                }
+
+                return false;
+            }
+        }
+    }
+
+    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+        include("phpvfscomposer://" . __DIR__ . '/..'.'/sabre/vobject/bin/generate_vcards');
+        exit(0);
+    }
+}
+
+include __DIR__ . '/..'.'/sabre/vobject/bin/generate_vcards';

iRony-0.4.5.tar.gz/vendor/bin/naturalselection -> iRony-0.4.6.tar.gz/vendor/bin/naturalselection Changed

-(symlink to ../sabre/dav/bin/naturalselection)
@@ -0,0 +1,37 @@
+#!/usr/bin/env sh
+
+# Support bash to support `source` with fallback on $0 if this does not run with bash
+# https://stackoverflow.com/a/35006505/6512
+selfArg="$BASH_SOURCE"
+if  -z "$selfArg" ; then
+    selfArg="$0"
+fi
+
+self=$(realpath $selfArg 2> /dev/null)
+if  -z "$self" ; then
+    self="$selfArg"
+fi
+
+dir=$(cd "${self%/\\*}" > /dev/null; cd '../sabre/dav/bin' && pwd)
+
+if  -d /proc/cygdrive ; then
+    case $(which php) in
+        $(readlink -n /proc/cygdrive)/*)
+            # We are in Cygwin using Windows php, so the path must be translated
+            dir=$(cygpath -m "$dir");
+            ;;
+    esac
+fi
+
+export COMPOSER_BIN_DIR=$(cd "${self%/\\*}" > /dev/null; pwd)
+
+# If bash is sourcing this file, we have to source the target as well
+bashSource="$BASH_SOURCE"
+if  -n "$bashSource" ; then
+    if  "$bashSource" != "$0" ; then
+        source "${dir}/naturalselection" "$@"
+        return
+    fi
+fi
+
+"${dir}/naturalselection" "$@"

iRony-0.4.5.tar.gz/vendor/bin/sabredav -> iRony-0.4.6.tar.gz/vendor/bin/sabredav Changed

-(symlink to ../sabre/dav/bin/sabredav)
@@ -0,0 +1,37 @@
+#!/usr/bin/env sh
+
+# Support bash to support `source` with fallback on $0 if this does not run with bash
+# https://stackoverflow.com/a/35006505/6512
+selfArg="$BASH_SOURCE"
+if  -z "$selfArg" ; then
+    selfArg="$0"
+fi
+
+self=$(realpath $selfArg 2> /dev/null)
+if  -z "$self" ; then
+    self="$selfArg"
+fi
+
+dir=$(cd "${self%/\\*}" > /dev/null; cd '../sabre/dav/bin' && pwd)
+
+if  -d /proc/cygdrive ; then
+    case $(which php) in
+        $(readlink -n /proc/cygdrive)/*)
+            # We are in Cygwin using Windows php, so the path must be translated
+            dir=$(cygpath -m "$dir");
+            ;;
+    esac
+fi
+
+export COMPOSER_BIN_DIR=$(cd "${self%/\\*}" > /dev/null; pwd)
+
+# If bash is sourcing this file, we have to source the target as well
+bashSource="$BASH_SOURCE"
+if  -n "$bashSource" ; then
+    if  "$bashSource" != "$0" ; then
+        source "${dir}/sabredav" "$@"
+        return
+    fi
+fi
+
+"${dir}/sabredav" "$@"

iRony-0.4.5.tar.gz/vendor/bin/vobject -> iRony-0.4.6.tar.gz/vendor/bin/vobject Changed

-(symlink to ../sabre/vobject/bin/vobject)
@@ -0,0 +1,107 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Proxy PHP file generated by Composer
+ *
+ * This file includes the referenced bin path (../sabre/vobject/bin/vobject)
+ * using a stream wrapper to prevent the shebang from being output on PHP<8
+ *
+ * @generated
+ */
+
+namespace Composer;
+
+$GLOBALS'_composer_bin_dir' = __DIR__;
+$GLOBALS'_composer_autoload_path' = __DIR__ . '/..'.'/autoload.php';
+
+if (PHP_VERSION_ID < 80000) {
+    if (!class_exists('Composer\BinProxyWrapper')) {
+        /**
+         * @internal
+         */
+        final class BinProxyWrapper
+        {
+            private $handle;
+            private $position;
+            private $realpath;
+
+            public function stream_open($path, $mode, $options, &$opened_path)
+            {
+                // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
+                $opened_path = substr($path, 17);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = $this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
+                $this->position = 0;
+
+                return (bool) $this->handle;
+            }
+
+            public function stream_read($count)
+            {
+                $data = fread($this->handle, $count);
+
+                if ($this->position === 0) {
+                    $data = preg_replace('{^#!.*\r?\n}', '', $data);
+                }
+
+                $this->position += strlen($data);
+
+                return $data;
+            }
+
+            public function stream_cast($castAs)
+            {
+                return $this->handle;
+            }
+
+            public function stream_close()
+            {
+                fclose($this->handle);
+            }
+
+            public function stream_lock($operation)
+            {
+                return $operation ? flock($this->handle, $operation) : true;
+            }
+
+            public function stream_tell()
+            {
+                return $this->position;
+            }
+
+            public function stream_eof()
+            {
+                return feof($this->handle);
+            }
+
+            public function stream_stat()
+            {
+                return array();
+            }
+
+            public function stream_set_option($option, $arg1, $arg2)
+            {
+                return true;
+            }
+
+            public function url_stat($path, $flags)
+            {
+                $path = substr($path, 17);
+                if (file_exists($path)) {
+                    return stat($path);
+                }
+
+                return false;
+            }
+        }
+    }
+
+    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+        include("phpvfscomposer://" . __DIR__ . '/..'.'/sabre/vobject/bin/vobject');
+        exit(0);
+    }
+}
+
+include __DIR__ . '/..'.'/sabre/vobject/bin/vobject';

iRony-0.4.5.tar.gz/vendor/composer/ClassLoader.php -> iRony-0.4.6.tar.gz/vendor/composer/ClassLoader.php Changed

@@ -37,26 +37,80 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+    /** @var ?string */
+    private $vendorDir;
+
     // PSR-4
+    /**
+     * @var array
+     * @psalm-var array<string, array<string, int>>
+     */
     private $prefixLengthsPsr4 = array();
+    /**
+     * @var array
+     * @psalm-var array<string, array<int, string>>
+     */
     private $prefixDirsPsr4 = array();
+    /**
+     * @var array
+     * @psalm-var array<string, string>
+     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
+    /**
+     * @var array
+     * @psalm-var array<string, array<string, string>>
+     */
     private $prefixesPsr0 = array();
+    /**
+     * @var array
+     * @psalm-var array<string, string>
+     */
     private $fallbackDirsPsr0 = array();
 
+    /** @var bool */
     private $useIncludePath = false;
+
+    /**
+     * @var string
+     * @psalm-var array<string, string>
+     */
     private $classMap = array();
+
+    /** @var bool */
     private $classMapAuthoritative = false;
+
+    /**
+     * @var bool
+     * @psalm-var array<string, bool>
+     */
     private $missingClasses = array();
+
+    /** @var ?string */
     private $apcuPrefix;
 
+    /**
+     * @var self
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param ?string $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
+    /**
+     * @return string
+     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -66,28 +120,47 @@
         return array();
     }
 
+    /**
+     * @return array
+     * @psalm-return array<string, array<int, string>>
+     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
+    /**
+     * @return array
+     * @psalm-return array<string, string>
+     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
+    /**
+     * @return array
+     * @psalm-return array<string, string>
+     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
+    /**
+     * @return string Array of classname => path
+     * @psalm-return array<string, string>
+     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array $classMap Class to filename map
+     * @param string $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -102,9 +175,11 @@
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix
+     * @param string|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
+     *
+     * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
@@ -147,11 +222,13 @@
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
@@ -195,8 +272,10 @@
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
+     * @param string          $prefix The prefix
+     * @param string|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -211,10 +290,12 @@
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -234,6 +315,8 @@
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -256,6 +339,8 @@
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -276,6 +361,8 @@
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
+     *
+     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -296,25 +383,44 @@
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
      */
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders$this->vendorDir);
+            self::$registeredLoaders$this->vendorDir = $this;
+        }
     }
 
     /**
      * Unregisters this instance as an autoloader.
+     *
+     * @return void
      */
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders$this->vendorDir);
+        }
     }
 
     /**
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
@@ -323,6 +429,8 @@
 
             return true;
         }
+
+        return null;
     }
 
     /**
@@ -367,6 +475,21 @@
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -438,6 +561,10 @@
  * Scope isolated include.
  *
  * Prevents access to $this/self from included files.
+ *
+ * @param  string $file
+ * @return void
+ * @private
  */
 function includeFile($file)
 {

iRony-0.4.6.tar.gz/vendor/composer/InstalledVersions.php Added

@@ -0,0 +1,350 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer;
+
+use Composer\Autoload\ClassLoader;
+use Composer\Semver\VersionParser;
+
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ */
+class InstalledVersions
+{
+    /**
+     * @var mixed|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string, dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string, reference?: string, replaced?: string, provided?: string, install_path?: string, type?: string}>}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array
+     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string, dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string, reference?: string, replaced?: string, provided?: string, install_path?: string, type?: string}>}>
+     */
+    private static $installedByVendor = array();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages = array_keys($installed'versions');
+        }
+
+        if (1 === \count($packages)) {
+            return $packages0;
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed'versions' as $name => $package) {
+                if (isset($package'type') && $package'type' === $type) {
+                    $packagesByType = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed'versions'$packageName)) {
+                return $includeDevRequirements || empty($installed'versions'$packageName'dev_requirement');
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param  string        $packageName
+     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints($constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed'versions'$packageName)) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed'versions'$packageName'pretty_version')) {
+                $ranges = $installed'versions'$packageName'pretty_version';
+            }
+            if (array_key_exists('aliases', $installed'versions'$packageName)) {
+                $ranges = array_merge($ranges, $installed'versions'$packageName'aliases');
+            }
+            if (array_key_exists('replaced', $installed'versions'$packageName)) {
+                $ranges = array_merge($ranges, $installed'versions'$packageName'replaced');
+            }
+            if (array_key_exists('provided', $installed'versions'$packageName)) {
+                $ranges = array_merge($ranges, $installed'versions'$packageName'provided');
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed'versions'$packageName)) {
+                continue;
+            }
+
+            if (!isset($installed'versions'$packageName'version')) {
+                return null;
+            }
+
+            return $installed'versions'$packageName'version';
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed'versions'$packageName)) {
+                continue;
+            }
+
+            if (!isset($installed'versions'$packageName'pretty_version')) {
+                return null;
+            }
+
+            return $installed'versions'$packageName'pretty_version';
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed'versions'$packageName)) {
+                continue;
+            }
+
+            if (!isset($installed'versions'$packageName'reference')) {
+                return null;
+            }
+
+            return $installed'versions'$packageName'reference';
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed'versions'$packageName)) {
+                continue;
+            }
+
+            return isset($installed'versions'$packageName'install_path') ? $installed'versions'$packageName'install_path' : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string, dev: bool, install_path: string, type: string}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed0'root';
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string, dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string, reference?: string, replaced?: string, provided?: string, install_path?: string, type?: string}>}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string, dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string, reference?: string, replaced?: string, provided?: string, install_path?: string, type?: string}>}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string, dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string, reference?: string, replaced?: string, provided?: string, install_path?: string, type?: string}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string, dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string, reference?: string, replaced?: string, provided?: string, install_path?: string, type?: string}>}>
+     */
+    private static function getInstalled()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor$vendorDir)) {
+                    $installed = self::$installedByVendor$vendorDir;
+                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                    $installed = self::$installedByVendor$vendorDir = require $vendorDir.'/composer/installed.php';
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installedcount($installed) - 1;
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = require __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+        $installed = self::$installed;
+
+        return $installed;
+    }
+}

iRony-0.4.5.tar.gz/vendor/composer/autoload_classmap.php -> iRony-0.4.6.tar.gz/vendor/composer/autoload_classmap.php Changed

iRony-0.4.5.tar.gz/vendor/composer/autoload_real.php -> iRony-0.4.6.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitef3ffbf0545085bdea11201abb358b1d
+class ComposerAutoloaderInitc5e5a57e810b5438e3f904fba572f99b
 {
     private static $loader;
 
@@ -22,15 +22,17 @@
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitef3ffbf0545085bdea11201abb358b1d', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitef3ffbf0545085bdea11201abb358b1d', 'loadClassLoader'));
+        require __DIR__ . '/platform_check.php';
+
+        spl_autoload_register(array('ComposerAutoloaderInitc5e5a57e810b5438e3f904fba572f99b', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        spl_autoload_unregister(array('ComposerAutoloaderInitc5e5a57e810b5438e3f904fba572f99b', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitef3ffbf0545085bdea11201abb358b1d::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitc5e5a57e810b5438e3f904fba572f99b::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

iRony-0.4.5.tar.gz/vendor/composer/autoload_static.php -> iRony-0.4.6.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitef3ffbf0545085bdea11201abb358b1d
+class ComposerStaticInitc5e5a57e810b5438e3f904fba572f99b
 {
     public static $prefixLengthsPsr4 = array (
         'S' => 
@@ -50,11 +50,16 @@
         ),
     );
 
+    public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+    );
+
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitef3ffbf0545085bdea11201abb358b1d::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitef3ffbf0545085bdea11201abb358b1d::$prefixDirsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitc5e5a57e810b5438e3f904fba572f99b::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitc5e5a57e810b5438e3f904fba572f99b::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitc5e5a57e810b5438e3f904fba572f99b::$classMap;
 
         }, null, ClassLoader::class);
     }

iRony-0.4.5.tar.gz/vendor/composer/installed.json -> iRony-0.4.6.tar.gz/vendor/composer/installed.json Changed

@@ -1,252 +1,280 @@
-
-    {
-        "name": "sabre/dav",
-        "version": "2.1.11",
-        "version_normalized": "2.1.11.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sabre-io/dav.git",
-            "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sabre-io/dav/zipball/fa10928802aea9b3136519640aa3c3c59e9e1084",
-            "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084",
-            "shasum": ""
-        },
-        "require": {
-            "ext-ctype": "*",
-            "ext-date": "*",
-            "ext-dom": "*",
-            "ext-iconv": "*",
-            "ext-libxml": "*",
-            "ext-mbstring": "*",
-            "ext-pcre": "*",
-            "ext-simplexml": "*",
-            "ext-spl": "*",
-            "php": ">=5.4.1",
-            "sabre/event": "^2.0.0",
-            "sabre/http": "^3.0.0",
-            "sabre/vobject": "^3.3.4"
-        },
-        "require-dev": {
-            "evert/phpdoc-md": "~0.1.0",
-            "phpunit/phpunit": "~4.2",
-            "squizlabs/php_codesniffer": "~1.5.3"
-        },
-        "suggest": {
-            "ext-curl": "*",
-            "ext-pdo": "*"
-        },
-        "time": "2016-10-07T03:29:06+00:00",
-        "bin": 
-            "bin/sabredav",
-            "bin/naturalselection"
-        ,
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Sabre\\DAV\\": "lib/DAV/",
-                "Sabre\\DAVACL\\": "lib/DAVACL/",
-                "Sabre\\CalDAV\\": "lib/CalDAV/",
-                "Sabre\\CardDAV\\": "lib/CardDAV/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": 
-            "BSD-3-Clause"
-        ,
-        "authors": 
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ,
-        "description": "WebDAV Framework for PHP",
-        "homepage": "http://sabre.io/",
-        "keywords": 
-            "CalDAV",
-            "CardDAV",
-            "WebDAV",
-            "framework",
-            "iCalendar"
-        
-    },
-    {
-        "name": "sabre/event",
-        "version": "2.0.2",
-        "version_normalized": "2.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sabre-io/event.git",
-            "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sabre-io/event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
-            "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.1"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "*",
-            "sabre/cs": "~0.0.1"
-        },
-        "time": "2015-05-19T10:24:22+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Sabre\\Event\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": 
-            "BSD-3-Clause"
-        ,
-        "authors": 
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ,
-        "description": "sabre/event is a library for lightweight event-based programming",
-        "homepage": "http://sabre.io/event/",
-        "keywords": 
-            "EventEmitter",
-            "events",
-            "hooks",
-            "plugin",
-            "promise",
-            "signal"
-        
-    },
-    {
-        "name": "sabre/http",
-        "version": "3.0.5",
-        "version_normalized": "3.0.5.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sabre-io/http.git",
-            "reference": "6b06c03376219b3d608e1f878514ec105ed1b577"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sabre-io/http/zipball/6b06c03376219b3d608e1f878514ec105ed1b577",
-            "reference": "6b06c03376219b3d608e1f878514ec105ed1b577",
-            "shasum": ""
-        },
-        "require": {
-            "ext-mbstring": "*",
-            "php": ">=5.4",
-            "sabre/event": ">=1.0.0,<3.0.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.3",
-            "squizlabs/php_codesniffer": "~1.5.3"
-        },
-        "suggest": {
-            "ext-curl": " to make http requests with the Client class"
-        },
-        "time": "2015-05-11T15:25:57+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Sabre\\HTTP\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": 
-            "BSD-3-Clause"
-        ,
-        "authors": 
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ,
-        "description": "The sabre/http library provides utilities for dealing with http requests and responses. ",
-        "homepage": "https://github.com/fruux/sabre-http",
-        "keywords": 
-            "http"
-        
-    },
-    {
-        "name": "sabre/vobject",
-        "version": "3.5.3",
-        "version_normalized": "3.5.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sabre-io/vobject.git",
-            "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sabre-io/vobject/zipball/129d80533a9ec0d9cacfb50b51180c34edb6874c",
-            "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c",
-            "shasum": ""
-        },
-        "require": {
-            "ext-mbstring": "*",
-            "php": ">=5.3.1"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "*",
-            "squizlabs/php_codesniffer": "*"
+{
+    "packages": 
+        {
+            "name": "sabre/dav",
+            "version": "2.1.11",
+            "version_normalized": "2.1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabre-io/dav.git",
+                "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabre-io/dav/zipball/fa10928802aea9b3136519640aa3c3c59e9e1084",
+                "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-date": "*",
+                "ext-dom": "*",
+                "ext-iconv": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-pcre": "*",
+                "ext-simplexml": "*",
+                "ext-spl": "*",
+                "php": ">=5.4.1",
+                "sabre/event": "^2.0.0",
+                "sabre/http": "^3.0.0",
+                "sabre/vobject": "^3.3.4"
+            },
+            "require-dev": {
+                "evert/phpdoc-md": "~0.1.0",
+                "phpunit/phpunit": "~4.2",
+                "squizlabs/php_codesniffer": "~1.5.3"
+            },
+            "suggest": {
+                "ext-curl": "*",
+                "ext-pdo": "*"
+            },
+            "time": "2016-10-07T03:29:06+00:00",
+            "bin": 
+                "bin/sabredav",
+                "bin/naturalselection"
+            ,
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\DAV\\": "lib/DAV/",
+                    "Sabre\\DAVACL\\": "lib/DAVACL/",
+                    "Sabre\\CalDAV\\": "lib/CalDAV/",
+                    "Sabre\\CardDAV\\": "lib/CardDAV/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "BSD-3-Clause"
+            ,
+            "authors": 
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ,
+            "description": "WebDAV Framework for PHP",
+            "homepage": "http://sabre.io/",
+            "keywords": 
+                "CalDAV",
+                "CardDAV",
+                "WebDAV",
+                "framework",
+                "iCalendar"
+            ,
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/dav/issues",
+                "source": "https://github.com/fruux/sabre-dav"
+            },
+            "install-path": "../sabre/dav"
         },
-        "time": "2016-10-07T03:20:40+00:00",
-        "bin": 
-            "bin/vobject",
-            "bin/generate_vcards"
-        ,
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.2.x-dev"
-            }
+        {
+            "name": "sabre/event",
+            "version": "2.0.2",
+            "version_normalized": "2.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabre-io/event.git",
+                "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabre-io/event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
+                "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*",
+                "sabre/cs": "~0.0.1"
+            },
+            "time": "2015-05-19T10:24:22+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\Event\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "BSD-3-Clause"
+            ,
+            "authors": 
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ,
+            "description": "sabre/event is a library for lightweight event-based programming",
+            "homepage": "http://sabre.io/event/",
+            "keywords": 
+                "EventEmitter",
+                "events",
+                "hooks",
+                "plugin",
+                "promise",
+                "signal"
+            ,
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/event/issues",
+                "source": "https://github.com/fruux/sabre-event"
+            },
+            "install-path": "../sabre/event"
         },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Sabre\\VObject\\": "lib/"
-            }
+        {
+            "name": "sabre/http",
+            "version": "3.0.5",
+            "version_normalized": "3.0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabre-io/http.git",
+                "reference": "6b06c03376219b3d608e1f878514ec105ed1b577"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabre-io/http/zipball/6b06c03376219b3d608e1f878514ec105ed1b577",
+                "reference": "6b06c03376219b3d608e1f878514ec105ed1b577",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=5.4",
+                "sabre/event": ">=1.0.0,<3.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.3",
+                "squizlabs/php_codesniffer": "~1.5.3"
+            },
+            "suggest": {
+                "ext-curl": " to make http requests with the Client class"
+            },
+            "time": "2015-05-11T15:25:57+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\HTTP\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "BSD-3-Clause"
+            ,
+            "authors": 
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ,
+            "description": "The sabre/http library provides utilities for dealing with http requests and responses. ",
+            "homepage": "https://github.com/fruux/sabre-http",
+            "keywords": 
+                "http"
+            ,
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/http/issues",
+                "source": "https://github.com/fruux/sabre-http"
+            },
+            "install-path": "../sabre/http"
         },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": 
-            "BSD-3-Clause"
-        ,
-        "authors": 
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            },
-            {
-                "name": "Dominik Tobschall",
-                "email": "dominik@fruux.com",
-                "homepage": "http://tobschall.de/",
-                "role": "Developer"
-            }
-        ,
-        "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
-        "homepage": "http://sabre.io/vobject/",
-        "keywords": 
-            "VObject",
-            "iCalendar",
-            "jCal",
-            "jCard",
-            "vCard"
-        
-    }
-
+        {
+            "name": "sabre/vobject",
+            "version": "3.5.3",
+            "version_normalized": "3.5.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabre-io/vobject.git",
+                "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabre-io/vobject/zipball/129d80533a9ec0d9cacfb50b51180c34edb6874c",
+                "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*",
+                "squizlabs/php_codesniffer": "*"
+            },
+            "time": "2016-10-07T03:20:40+00:00",
+            "bin": 
+                "bin/vobject",
+                "bin/generate_vcards"
+            ,
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\VObject\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "BSD-3-Clause"
+            ,
+            "authors": 
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Dominik Tobschall",
+                    "email": "dominik@fruux.com",
+                    "homepage": "http://tobschall.de/",
+                    "role": "Developer"
+                }
+            ,
+            "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
+            "homepage": "http://sabre.io/vobject/",
+            "keywords": 
+                "VObject",
+                "iCalendar",
+                "jCal",
+                "jCard",
+                "vCard"
+            ,
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/vobject/issues",
+                "source": "https://github.com/fruux/sabre-vobject"
+            },
+            "install-path": "../sabre/vobject"
+        }
+    ,
+    "dev": false,
+    "dev-package-names": 
+}

iRony-0.4.6.tar.gz/vendor/composer/installed.php Added

@@ -0,0 +1,59 @@
+<?php return array(
+    'root' => array(
+        'pretty_version' => '0.4-dev',
+        'version' => '0.4.0.0-dev',
+        'type' => 'library',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'reference' => NULL,
+        'name' => 'kolab/irony',
+        'dev' => false,
+    ),
+    'versions' => array(
+        'kolab/irony' => array(
+            'pretty_version' => '0.4-dev',
+            'version' => '0.4.0.0-dev',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'reference' => NULL,
+            'dev_requirement' => false,
+        ),
+        'sabre/dav' => array(
+            'pretty_version' => '2.1.11',
+            'version' => '2.1.11.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../sabre/dav',
+            'aliases' => array(),
+            'reference' => 'fa10928802aea9b3136519640aa3c3c59e9e1084',
+            'dev_requirement' => false,
+        ),
+        'sabre/event' => array(
+            'pretty_version' => '2.0.2',
+            'version' => '2.0.2.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../sabre/event',
+            'aliases' => array(),
+            'reference' => '337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff',
+            'dev_requirement' => false,
+        ),
+        'sabre/http' => array(
+            'pretty_version' => '3.0.5',
+            'version' => '3.0.5.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../sabre/http',
+            'aliases' => array(),
+            'reference' => '6b06c03376219b3d608e1f878514ec105ed1b577',
+            'dev_requirement' => false,
+        ),
+        'sabre/vobject' => array(
+            'pretty_version' => '3.5.3',
+            'version' => '3.5.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../sabre/vobject',
+            'aliases' => array(),
+            'reference' => '129d80533a9ec0d9cacfb50b51180c34edb6874c',
+            'dev_requirement' => false,
+        ),
+    ),
+);

iRony-0.4.6.tar.gz/vendor/composer/platform_check.php Added

iRony.dsc Changed